diff options
author | Tom Rini <trini@konsulko.com> | 2019-04-17 09:19:13 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-04-17 09:19:13 -0400 |
commit | 14b8c420b88a90e7ca0c979a2ee413bf459941e8 (patch) | |
tree | 89805507eebb3a6b14c94fe62c95546bacbe7f5a /arch/arm/dts | |
parent | 88d5ab3d67c7507160792991e99bda9fff34d106 (diff) | |
parent | 350cfe79a8fb288e9066d5668af7c5ab6857edea (diff) |
Merge tag 'xilinx-for-v2019.07' of git://git.denx.de/u-boot-microblaze
Xilinx/FPGA changes for v2019.07
fpga:
- Add support for external data in FIT
- Extend testing for external data case
- Inform user about a need to run post config on Zynq
arm:
- Tune zynq command functions
- Fix internal variable setting
arm64:
- Add support for zc39dr decoding
- Disable WDT for zcu100
- Small changes in reset_reason()
- Some DT changes (spi)
- Tune qspi-mini configuration
- Remove useless eeprom setting
- Fix two sdhci boot case
spi:
- Fix tap delay programming
clk:
- Enable i2c in SPL
net:
- Fix gem phydev handling
- Remove phy detection code from gem driver
general:
- Correct EXT_DTB usage for MULTI_DTB_FIT configuration
Diffstat (limited to 'arch/arm/dts')
-rw-r--r-- | arch/arm/dts/zynqmp-mini-qspi.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/dts/zynqmp-mini-qspi.dts b/arch/arm/dts/zynqmp-mini-qspi.dts index c235a5f731d..1716d5179dd 100644 --- a/arch/arm/dts/zynqmp-mini-qspi.dts +++ b/arch/arm/dts/zynqmp-mini-qspi.dts @@ -63,8 +63,8 @@ &qspi { status = "okay"; - flash@0 { - compatible = "n25q512a11"; + flash0: flash@0 { + compatible = "n25q512a11", "spi-flash"; #address-cells = <1>; #size-cells = <1>; reg = <0x0>; |