diff options
author | Tom Rini | 2023-10-13 08:45:55 -0400 |
---|---|---|
committer | Tom Rini | 2023-10-13 08:45:55 -0400 |
commit | 6961ca0a46310da782668d8bfbf4f45b04758c55 (patch) | |
tree | 17434f00e66b9c7fa40fdfc41717c44ab816d067 /arch/arm/dts/zynqmp-zcu111-revA.dts | |
parent | 5895d5c7ab9e501205fd4b9a2b4544680ae7e72a (diff) | |
parent | 7a82bfff5ea7089905dff14e65436d23c1e5adc4 (diff) |
Merge tag 'xilinx-for-v2024.01-rc1-v3' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2024.01-rc1 v3
clk:
- remove additional compatible strings for Versal NET
net:
- zynq_gem: Fix clock calculation for MDC for higher frequencies
pinctrl:
- core: Extend pinmux status buffere size
- zynqmp driver: Show also tristate configuration
test:
- add test case for pxe get
Xilinx:
- describe SelectMAP boot mode
Zynq:
- Fix nand description in DT
ZynqMP:
- DTS sync patches with kernel and also W=1 related fixes
- Add support for KD240, zcu670, e-a2197 with x-prc cards, SC revB/C with i2c
description for other SC based boards
- k24 psu_init cleanup
Diffstat (limited to 'arch/arm/dts/zynqmp-zcu111-revA.dts')
-rw-r--r-- | arch/arm/dts/zynqmp-zcu111-revA.dts | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts index c9ff99f8a83..ba9e4891fcc 100644 --- a/arch/arm/dts/zynqmp-zcu111-revA.dts +++ b/arch/arm/dts/zynqmp-zcu111-revA.dts @@ -2,7 +2,8 @@ /* * dts file for Xilinx ZynqMP ZCU111 * - * (C) Copyright 2017 - 2021, Xilinx, Inc. + * (C) Copyright 2017 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek <michal.simek@amd.com> */ @@ -788,12 +789,13 @@ &qspi { status = "okay"; - is-dual = <1>; + num-cs = <2>; flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; #size-cells = <1>; - reg = <0x0>; + reg = <0>, <1>; + parallel-memories = /bits/ 64 <0x10000000 0x10000000>; /* 256MB */ spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ |