aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini2023-08-30 09:32:10 -0400
committerTom Rini2023-08-30 09:32:10 -0400
commitc37be6a39a338187cfb140a6a1a8d1f9550c909d (patch)
tree13fefe63777c3b1b1446981a5fc0d6aa9a2d826b /drivers
parentda3cb125b0e8f0625b6bba5cb3f05b70174bb5e9 (diff)
parent6e8c9d29e3a72f93e4d5125079eaaa1b5a52a951 (diff)
Merge tag 'u-boot-at91-2023.10-a' of https://source.denx.de/u-boot/custodians/u-boot-at91 into next
First set of u-boot-at91 features for the 2023.10 cycle: This feature set includes a new board sama5d29 Curiosity, and various fixes and alignments for sam9x60 and sam9x60 curiosity board.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/raw/atmel/nand-controller.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
index 9873d112544..2b29c8def6d 100644
--- a/drivers/mtd/nand/raw/atmel/nand-controller.c
+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
@@ -1474,7 +1474,6 @@ static void atmel_nand_init(struct atmel_nand_controller *nc,
mtd->dev->parent = nc->dev;
nand->controller = &nc->base;
- nand->controller = &nc->base;
chip->cmd_ctrl = atmel_nand_cmd_ctrl;
chip->read_byte = atmel_nand_read_byte;