diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-16 12:52:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-16 12:52:02 -0400 |
| commit | 297e6eb8dcf9d90aaf9b0d146cdd502403003d04 (patch) | |
| tree | a08774cdaa4a72af892d4c7a57b3e1307734ad89 /drivers/mtd | |
| parent | c24b4e4fb8810b496e5f303ffd2641293f4c4b50 (diff) | |
| parent | 0ac03fbab51c72fa978569a831c001c4ddad8e2a (diff) | |
| download | u-boot-297e6eb8dcf9d90aaf9b0d146cdd502403003d04.zip u-boot-297e6eb8dcf9d90aaf9b0d146cdd502403003d04.tar.gz u-boot-297e6eb8dcf9d90aaf9b0d146cdd502403003d04.tar.bz2 | |
Merge tag 'xilinx-for-v2022.07-rc1' of https://source.denx.de/u-boot/custodians/u-boot-microblaze into nextWIP/16Mar2022-next
Xilinx changes for v2022.07-rc1
microblaze:
- Add support for reserved memory
xilinx:
- Update FRU code with MAC reading
zynqmp:
- Remove double AMS setting
- DT updates (mostly for SOMs)
- Add support for zcu106 rev 1.0
zynq:
- Update nand binding
nand:
- Aligned zynq_nand to upstream DT binding
net:
- Add support for ethernet-phy-id
mmc:
- Workaround CD in zynq_sdhci driver also for ZynqMP
- Add support for dynamic/run-time SD config for SOMs
gpio:
- Add driver for slg7xl45106
firmware:
- Add support for dynamic SD config
power-domain:
- Update zynqmp driver with the latest firmware
video:
- Add skeleton driver for DP and DPDMA
i2c:
- Fix i2c to work with QEMU
pinctrl:
- Add driver for zynqmp pinctrl driver
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/raw/zynq_nand.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c index d792528..10e9cd1 100644 --- a/drivers/mtd/nand/raw/zynq_nand.c +++ b/drivers/mtd/nand/raw/zynq_nand.c @@ -1086,10 +1086,13 @@ static int zynq_nand_probe(struct udevice *dev) int is_16bit_bw; smc->reg = (struct zynq_nand_smc_regs *)dev_read_addr(dev); - of_nand = dev_read_subnode(dev, "flash@e1000000"); + of_nand = dev_read_subnode(dev, "nand-controller@0,0"); if (!ofnode_valid(of_nand)) { - printf("Failed to find nand node in dt\n"); - return -ENODEV; + of_nand = dev_read_subnode(dev, "flash@e1000000"); + if (!ofnode_valid(of_nand)) { + printf("Failed to find nand node in dt\n"); + return -ENODEV; + } } if (!ofnode_is_available(of_nand)) { |