xilinx: DT sync up
Subsystems (2)
cover xilinx: DT sync up
Hi,
I am sending these patches based on Xilinx SoC vendor tree. There are also fixes found based on Linux yaml parser. Patches with link to Linux mainline patches should be marked properly.
Thanks,
Michal
Amit Kumar Mahapatra (1):
arm64: zynqmp: Do not duplicate flash partition label property
Ashok Reddy Soma (1):
arm64: dts: zynqmp: Add clk cells for sdhci
Manish Narani (1):
arm64: zynqmp: Add 'no-1-8-v' property for ZynqMP Boards
Michal Simek (10):
arm64: zynqmp: Replace gpio-key,wakeup with wakeup source
arm64: zynqmp: Update Copyright years to 2020
ARM: zynq: Fix spi name node
arm64: zynqmp: Remove unused zynqmp-clk.dtsi
arm64: zynqmp: Remove second copy of reset-controller
arm64: zynqmp: Sync DP subsystem
arm64: zynqmp: Fix addresses in partition definitions
arm64: zynqmp: Fix GIC compatible property
arm64: zynqmp: Change bus naming to axi
arm64: zynqmp: Move pinctrl node under firmware node
Nava kishore Manne (1):
arm64: zynqmp: Sync zynqmp fpga manager with mainline
Quanyang Wang (1):
ARM: dts: zc702: Fix I2C bus warnings
Sudeep Holla (1):
ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property
arch/arm/dts/avnet-ultra96-rev1.dts | 2 +- arch/arm/dts/zynq-zc702.dts | 12 +- arch/arm/dts/zynq-zc770-xm010.dts | 2 +- arch/arm/dts/zynq-zc770-xm013.dts | 2 +- arch/arm/dts/zynq-zturn.dts | 2 +- arch/arm/dts/zynqmp-clk-ccf.dtsi | 12 +- arch/arm/dts/zynqmp-clk.dtsi | 244 ----------------------- arch/arm/dts/zynqmp-mini-qspi.dts | 2 +- arch/arm/dts/zynqmp-zc1232-revA.dts | 10 +- arch/arm/dts/zynqmp-zc1254-revA.dts | 10 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 34 ++-- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 6 +- arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 12 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu102-rev1.0.dts | 6 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 36 ++-- arch/arm/dts/zynqmp-zcu102-revB.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 10 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 10 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 14 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 14 +- arch/arm/dts/zynqmp-zcu1275-revA.dts | 10 +- arch/arm/dts/zynqmp-zcu1275-revB.dts | 10 +- arch/arm/dts/zynqmp-zcu1285-revA.dts | 6 +- arch/arm/dts/zynqmp-zcu208-revA.dts | 8 +- arch/arm/dts/zynqmp-zcu216-revA.dts | 8 +- arch/arm/dts/zynqmp.dtsi | 176 +++++++--------- 29 files changed, 206 insertions(+), 460 deletions(-) delete mode 100644 arch/arm/dts/zynqmp-clk.dtsi
Signature · 1 line
2.25.0
PATCH 1/16 ARM: dts: zc702: Fix I2C bus warnings
From: Quanyang Wang <[email protected]>
The dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses.
Warning from Linux kernel:
arch/arm/boot/dts/zynq-zc702.dts:187.13-190.6: Warning (i2c_bus_reg): /amba/i2c at e0004000/i2c-mux at 74/i2c at 7/hwmon at 52: I2C bus unit address format error, expected "34" arch/arm/boot/dts/zynq-zc702.dts:191.13-194.6: Warning (i2c_bus_reg): /amba/i2c at e0004000/i2c-mux at 74/i2c at 7/hwmon at 53: I2C bus unit address format error, expected "35" arch/arm/boot/dts/zynq-zc702.dts:195.13-198.6: Warning (i2c_bus_reg): /amba/i2c at e0004000/i2c-mux at 74/i2c at 7/hwmon at 54: I2C bus unit address format error, expected "36"
---
arch/arm/dts/zynq-zc702.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/dts/zynq-zc702.dts +6 -6
@@ -181,17 +181,17 @@ #address-cells = <1>; #size-cells = <0>; reg = <7>; - hwmon at 52 { + hwmon at 34 { compatible = "ti,ucd9248"; - reg = <52>; + reg = <0x34>; }; - hwmon at 53 { + hwmon at 35 { compatible = "ti,ucd9248"; - reg = <53>; + reg = <0x35>; }; - hwmon at 54 { + hwmon at 36 { compatible = "ti,ucd9248"; - reg = <54>; + reg = <0x36>; }; }; };
Signature · 1 line
2.25.0
PATCH 2/16 ARM: dts: zynq: replace gpio-key, wakeup with wakeup-source property
In reply to Michal SimekFrom: Sudeep Holla <[email protected]>
Most of the legacy "gpio-key,wakeup" boolean property is already replaced with "wakeup-source". However few occurrences of old property has popped up again, probably from the remnants in downstream trees.
Replace the legacy properties with the unified "wakeup-source" property introduced in the Linux kernel commit 700a38b27eef ("Input: gpio_keys - switch to using generic device properties")
---
arch/arm/dts/zynq-zturn.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/zynq-zturn.dts +1 -1
@@ -54,7 +54,7 @@ label = "K1"; gpios = <&gpio0 0x32 0x1>; linux,code = <0x66>; - gpio-key,wakeup; + wakeup-source; autorepeat; }; };
Signature · 1 line
2.25.0
PATCH 3/16 arm64: zynqmp: Replace gpio-key, wakeup with wakeup source
In reply to Michal SimekThe same change has been done for Zynq by commit 1241c72b6db1 ("ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property") in mainline Linux kernel.
---
arch/arm/dts/zynqmp-zcu208-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu216-revA.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/zynqmp-zcu208-revA.dts +1 -1
@@ -50,7 +50,7 @@ label = "sw19"; gpios = <&gpio 22 GPIO_ACTIVE_HIGH>; linux,code = <KEY_DOWN>; - gpio-key,wakeup; + wakeup-source; autorepeat; }; };
arch/arm/dts/zynqmp-zcu216-revA.dts +1 -1
@@ -50,7 +50,7 @@ label = "sw19"; gpios = <&gpio 22 GPIO_ACTIVE_HIGH>; linux,code = <KEY_DOWN>; - gpio-key,wakeup; + wakeup-source; autorepeat; }; };
Signature · 1 line
2.25.0
PATCH 4/16 arm64: zynqmp: Update Copyright years to 2020
In reply to Michal SimekTrivial change.
---
arch/arm/dts/avnet-ultra96-rev1.dts | 2 +- arch/arm/dts/zynqmp-clk-ccf.dtsi | 2 +- arch/arm/dts/zynqmp-clk.dtsi | 2 +- arch/arm/dts/zynqmp-mini-qspi.dts | 2 +- arch/arm/dts/zynqmp-zc1232-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1254-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu102-rev1.0.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revB.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu1275-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu1275-revB.dts | 2 +- arch/arm/dts/zynqmp-zcu1285-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu208-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu216-revA.dts | 2 +- arch/arm/dts/zynqmp.dtsi | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-)
arch/arm/dts/avnet-ultra96-rev1.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Avnet Ultra96 rev1 * - * (C) Copyright 2018, Xilinx, Inc. + * (C) Copyright 2018 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-clk-ccf.dtsi +1 -1
@@ -2,7 +2,7 @@ /* * Clock specification for Xilinx ZynqMP * - * (C) Copyright 2017 - 2019, Xilinx, Inc. + * (C) Copyright 2017 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-clk.dtsi +1 -1
@@ -2,7 +2,7 @@ /* * Clock specification for Xilinx ZynqMP * - * (C) Copyright 2015 - 2018, Xilinx, Inc. + * (C) Copyright 2015 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-mini-qspi.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP Mini Configuration * - * (C) Copyright 2015 - 2018, Xilinx, Inc. + * (C) Copyright 2015 - 2020, Xilinx, Inc. * * Siva Durga Prasad <[email protected]> * Michal Simek <[email protected]>
arch/arm/dts/zynqmp-zc1232-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZC1232 * - * (C) Copyright 2017 - 2018, Xilinx, Inc. + * (C) Copyright 2017 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zc1254-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZC1254 * - * (C) Copyright 2015 - 2018, Xilinx, Inc. + * (C) Copyright 2015 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> * Siva Durga Prasad Paladugu <[email protected]>
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm015-dc1 * - * (C) Copyright 2015 - 2018, Xilinx, Inc. + * (C) Copyright 2015 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm016-dc2 * - * (C) Copyright 2015 - 2018, Xilinx, Inc. + * (C) Copyright 2015 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm017-dc3 * - * (C) Copyright 2016 - 2018, Xilinx, Inc. + * (C) Copyright 2016 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm018-dc4 * - * (C) Copyright 2015 - 2018, Xilinx, Inc. + * (C) Copyright 2015 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP zc1751-xm019-dc5 * - * (C) Copyright 2015 - 2018, Xilinx, Inc. + * (C) Copyright 2015 - 2020, Xilinx, Inc. * * Siva Durga Prasad <[email protected]> * Michal Simek <[email protected]>
arch/arm/dts/zynqmp-zcu100-revC.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU100 revC * - * (C) Copyright 2016 - 2018, Xilinx, Inc. + * (C) Copyright 2016 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> * Nathalie Chan King Choy
arch/arm/dts/zynqmp-zcu102-rev1.0.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU102 Rev1.0 * - * (C) Copyright 2016 - 2018, Xilinx, Inc. + * (C) Copyright 2016 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zcu102-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU102 RevA * - * (C) Copyright 2015 - 2018, Xilinx, Inc. + * (C) Copyright 2015 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zcu102-revB.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU102 RevB * - * (C) Copyright 2016 - 2018, Xilinx, Inc. + * (C) Copyright 2016 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zcu104-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU104 * - * (C) Copyright 2017 - 2018, Xilinx, Inc. + * (C) Copyright 2017 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zcu104-revC.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU104 * - * (C) Copyright 2017 - 2018, Xilinx, Inc. + * (C) Copyright 2017 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zcu106-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU106 * - * (C) Copyright 2016, Xilinx, Inc. + * (C) Copyright 2016 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zcu111-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU111 * - * (C) Copyright 2017 - 2018, Xilinx, Inc. + * (C) Copyright 2017 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zcu1275-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU1275 * - * (C) Copyright 2017 - 2018, Xilinx, Inc. + * (C) Copyright 2017 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> * Siva Durga Prasad Paladugu <[email protected]>
arch/arm/dts/zynqmp-zcu1275-revB.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU1275 RevB * - * (C) Copyright 2018, Xilinx, Inc. + * (C) Copyright 2018 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> * Siva Durga Prasad Paladugu <[email protected]>
arch/arm/dts/zynqmp-zcu1285-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU1285 RevA * - * (C) Copyright 2018 - 2019, Xilinx, Inc. + * (C) Copyright 2018 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> * Siva Durga Prasad Paladugu <[email protected]>
arch/arm/dts/zynqmp-zcu208-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU208 * - * (C) Copyright 2017 - 2019, Xilinx, Inc. + * (C) Copyright 2017 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp-zcu216-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU216 * - * (C) Copyright 2017 - 2019, Xilinx, Inc. + * (C) Copyright 2017 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> */
arch/arm/dts/zynqmp.dtsi +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP * - * (C) Copyright 2014 - 2015, Xilinx, Inc. + * (C) Copyright 2014 - 2020, Xilinx, Inc. * * Michal Simek <[email protected]> *
Signature · 1 line
2.25.0
PATCH 5/16 ARM: zynq: Fix spi name node
In reply to Michal SimekNone name address should be aligned with address. DTC 1.5.1 is reporting issues related to that.
arch/arm/boot/dts/zynq-zc770-xm010.dts:106.10-119.4: Warning
(spi_bus_reg): /amba/spi at e0007000/flash at 0: SPI bus unit address format error, expected "1"
arch/arm/boot/dts/zynq-zc770-xm013.dts:101.19-109.4: Warning (spi_bus_reg): /amba/spi at e0006000/eeprom at 0: SPI bus unit address format
error, expected "2"
---
arch/arm/dts/zynq-zc770-xm010.dts | 2 +- arch/arm/dts/zynq-zc770-xm013.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/zynq-zc770-xm010.dts +1 -1
@@ -72,7 +72,7 @@ status = "okay"; num-cs = <4>; is-decoded-cs = <0>; - flash at 0 { + flash at 1 { compatible = "sst25wf080", "jedec,spi-nor"; reg = <1>; spi-max-frequency = <1000000>;
arch/arm/dts/zynq-zc770-xm013.dts +1 -1
@@ -67,7 +67,7 @@ status = "okay"; num-cs = <4>; is-decoded-cs = <0>; - eeprom: eeprom at 0 { + eeprom: eeprom at 2 { at25,byte-len = <8192>; at25,addr-mode = <2>; at25,page-size = <32>;
Signature · 1 line
2.25.0
PATCH 6/16 arm64: zynqmp: Remove unused zynqmp-clk.dtsi
In reply to Michal SimekAll boards have been converted to firmware based driver that's why we can remove this file now.
---
arch/arm/dts/zynqmp-clk.dtsi | 244 ----------------------------------- 1 file changed, 244 deletions(-) delete mode 100644 arch/arm/dts/zynqmp-clk.dtsi
arch/arm/dts/zynqmp-clk.dtsi deleted +0 -244
@@ -1,244 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Clock specification for Xilinx ZynqMP - * - * (C) Copyright 2015 - 2020, Xilinx, Inc. - * - * Michal Simek <[email protected]> - */ - -/ { - clk100: clk100 { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <100000000>; - u-boot,dm-pre-reloc; - }; - - clk125: clk125 { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <125000000>; - }; - - clk200: clk200 { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <200000000>; - u-boot,dm-pre-reloc; - }; - - clk250: clk250 { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <250000000>; - }; - - clk300: clk300 { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <300000000>; - u-boot,dm-pre-reloc; - }; - - clk600: clk600 { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <600000000>; - }; - - dp_aclk: clock0 { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <100000000>; - clock-accuracy = <100>; - }; - - dp_aud_clk: clock1 { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <24576000>; - clock-accuracy = <100>; - }; - - dpdma_clk: dpdma-clk { - compatible = "fixed-clock"; - #clock-cells = <0x0>; - clock-frequency = <533000000>; - }; - - drm_clock: drm-clock { - compatible = "fixed-clock"; - #clock-cells = <0x0>; - clock-frequency = <262750000>; - clock-accuracy = <0x64>; - }; -}; - -&can0 { - clocks = <&clk100 &clk100>; -}; - -&can1 { - clocks = <&clk100 &clk100>; -}; - -&fpd_dma_chan1 { - clocks = <&clk600>, <&clk100>; -}; - -&fpd_dma_chan2 { - clocks = <&clk600>, <&clk100>; -}; - -&fpd_dma_chan3 { - clocks = <&clk600>, <&clk100>; -}; - -&fpd_dma_chan4 { - clocks = <&clk600>, <&clk100>; -}; - -&fpd_dma_chan5 { - clocks = <&clk600>, <&clk100>; -}; - -&fpd_dma_chan6 { - clocks = <&clk600>, <&clk100>; -}; - -&fpd_dma_chan7 { - clocks = <&clk600>, <&clk100>; -}; - -&fpd_dma_chan8 { - clocks = <&clk600>, <&clk100>; -}; - -&lpd_dma_chan1 { - clocks = <&clk600>, <&clk100>; -}; - -&lpd_dma_chan2 { - clocks = <&clk600>, <&clk100>; -}; - -&lpd_dma_chan3 { - clocks = <&clk600>, <&clk100>; -}; - -&lpd_dma_chan4 { - clocks = <&clk600>, <&clk100>; -}; - -&lpd_dma_chan5 { - clocks = <&clk600>, <&clk100>; -}; - -&lpd_dma_chan6 { - clocks = <&clk600>, <&clk100>; -}; - -&lpd_dma_chan7 { - clocks = <&clk600>, <&clk100>; -}; - -&lpd_dma_chan8 { - clocks = <&clk600>, <&clk100>; -}; - -&nand0 { - clocks = <&clk100 &clk100>; -}; - -&gem0 { - clocks = <&clk125>, <&clk125>, <&clk125>; -}; - -&gem1 { - clocks = <&clk125>, <&clk125>, <&clk125>; -}; - -&gem2 { - clocks = <&clk125>, <&clk125>, <&clk125>; -}; - -&gem3 { - clocks = <&clk125>, <&clk125>, <&clk125>; -}; - -&gpio { - clocks = <&clk100>; -}; - -&i2c0 { - clocks = <&clk100>; -}; - -&i2c1 { - clocks = <&clk100>; -}; - -&qspi { - clocks = <&clk300 &clk300>; -}; - -&sata { - clocks = <&clk250>; -}; - -&sdhci0 { - clocks = <&clk200 &clk200>; -}; - -&sdhci1 { - clocks = <&clk200 &clk200>; -}; - -&spi0 { - clocks = <&clk200 &clk200>; -}; - -&spi1 { - clocks = <&clk200 &clk200>; -}; - -&uart0 { - clocks = <&clk100 &clk100>; -}; - -&uart1 { - clocks = <&clk100 &clk100>; -}; - -&usb0 { - clocks = <&clk250>, <&clk250>; -}; - -&usb1 { - clocks = <&clk250>, <&clk250>; -}; - -&watchdog0 { - clocks = <&clk100>; -}; - -&lpd_watchdog { - clocks = <&clk250>; -}; - -&xilinx_drm { - clocks = <&drm_clock>; -}; - -&xlnx_dp { - clocks = <&dp_aclk>, <&dp_aud_clk>; -}; - -&xlnx_dpdma { - clocks = <&dpdma_clk>; -}; - -&xlnx_dp_snd_codec0 { - clocks = <&dp_aud_clk>; -};
Signature · 1 line
2.25.0
PATCH 7/16 arm64: zynqmp: Sync zynqmp fpga manager with mainline
In reply to Michal SimekFrom: Nava kishore Manne <[email protected]>
Sync zynqmp fpga manager with mainline.
---
arch/arm/dts/zynqmp-clk-ccf.dtsi | 4 ++++ arch/arm/dts/zynqmp.dtsi | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-)
arch/arm/dts/zynqmp-clk-ccf.dtsi +4 -0
@@ -291,3 +291,7 @@ &xlnx_dp_snd_codec0 { clocks = <&zynqmp_clk DP_AUDIO_REF>; }; + +&zynqmp_pcap { + clocks = <&zynqmp_clk PCAP>; +};
arch/arm/dts/zynqmp.dtsi +7 -5
@@ -149,6 +149,11 @@ #power-domain-cells = <0x1>; u-boot,dm-pre-reloc; + zynqmp_pcap: pcap { + compatible = "xlnx,zynqmp-pcap-fpga"; + clock-names = "ref_clk"; + }; + zynqmp_power: zynqmp-power { u-boot,dm-pre-reloc; compatible = "xlnx,zynqmp-power";
@@ -180,9 +185,10 @@ fpga_full: fpga-full { compatible = "fpga-region"; - fpga-mgr = <&pcap>; + fpga-mgr = <&zynqmp_pcap>; #address-cells = <2>; #size-cells = <2>; + ranges; }; nvmem_firmware {
@@ -195,10 +201,6 @@ }; }; - pcap: pcap { - compatible = "xlnx,zynqmp-pcap-fpga"; - }; - rst: reset-controller { compatible = "xlnx,zynqmp-reset"; #reset-cells = <1>;
Signature · 1 line
2.25.0
PATCH 8/16 arm64: zynqmp: Add 'no-1-8-v' property for ZynqMP Boards
In reply to Michal SimekFrom: Manish Narani <[email protected]>
Modify dts files to add 'no-1-8-v' property for all the ZynqMP boards. User can remove this property to enable the UHS mode. This is to keep the same speed (HS) modes across all the stages of the Linux Boot. Due to power cycling limitation of some of the ZynqMP boards, some SD cards don't get power cycled and are failing in Linux.
---
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 5 ++++- arch/arm/dts/zynqmp-zcu102-rev1.0.dts | 4 ---- arch/arm/dts/zynqmp-zcu102-revA.dts | 6 +++++- arch/arm/dts/zynqmp-zcu106-revA.dts | 4 ++++ arch/arm/dts/zynqmp-zcu111-revA.dts | 4 ++++ arch/arm/dts/zynqmp-zcu1285-revA.dts | 4 ++++ arch/arm/dts/zynqmp-zcu208-revA.dts | 4 ++++ arch/arm/dts/zynqmp-zcu216-revA.dts | 4 ++++ 8 files changed, 29 insertions(+), 6 deletions(-)
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +4 -1
@@ -154,7 +154,10 @@ /* SD1 with level shifter */ &sdhci1 { status = "okay"; - no-1-8-v; /* for 1.0 silicon */ + /* + * This property should be removed for supporting UHS mode + */ + no-1-8-v; xlnx,mio_bank = <1>; };
arch/arm/dts/zynqmp-zcu102-rev1.0.dts +0 -4
@@ -34,7 +34,3 @@ reg = <0xe0 0x3>; }; }; - -&sdhci1 { - /delete-property/ no-1-8-v; -};
arch/arm/dts/zynqmp-zcu102-revA.dts +5 -1
@@ -655,7 +655,11 @@ /* SD1 with level shifter */ &sdhci1 { status = "okay"; - no-1-8-v; /* for 1.0 silicon */ + /* + * 1.0 revision has level shifter and this property should be + * removed for supporting UHS mode + */ + no-1-8-v; xlnx,mio_bank = <1>; };
arch/arm/dts/zynqmp-zcu106-revA.dts +4 -0
@@ -653,6 +653,10 @@ /* SD1 with level shifter */ &sdhci1 { status = "okay"; + /* + * This property should be removed for supporting UHS mode + */ + no-1-8-v; xlnx,mio_bank = <1>; };
arch/arm/dts/zynqmp-zcu111-revA.dts +4 -0
@@ -567,6 +567,10 @@ &sdhci1 { status = "okay"; disable-wp; + /* + * This property should be removed for supporting UHS mode + */ + no-1-8-v; xlnx,mio_bank = <1>; };
arch/arm/dts/zynqmp-zcu1285-revA.dts +4 -0
@@ -241,5 +241,9 @@ &sdhci1 { status = "okay"; + /* + * This property should be removed for supporting UHS mode + */ + no-1-8-v; xlnx,mio_bank = <1>; };
arch/arm/dts/zynqmp-zcu208-revA.dts +4 -0
@@ -563,6 +563,10 @@ &sdhci1 { status = "okay"; disable-wp; + /* + * This property should be removed for supporting UHS mode + */ + no-1-8-v; xlnx,mio_bank = <1>; };
arch/arm/dts/zynqmp-zcu216-revA.dts +4 -0
@@ -567,6 +567,10 @@ &sdhci1 { status = "okay"; disable-wp; + /* + * This property should be removed for supporting UHS mode + */ + no-1-8-v; xlnx,mio_bank = <1>; };
Signature · 1 line
2.25.0
PATCH 9/16 arm64: zynqmp: Remove second copy of reset-controller
In reply to Michal SimekReset controller is handled via firmware that's why it should be the part of firmware node. Origin solution hasn't been removed when above change was applied by commit b07e97b4ba27 ("arm64: zynqmp: Use reset header in zynqmp.dtsi").
---
arch/arm/dts/zynqmp.dtsi | 5 ----- 1 file changed, 5 deletions(-)
arch/arm/dts/zynqmp.dtsi +0 -5
@@ -201,11 +201,6 @@ }; }; - rst: reset-controller { - compatible = "xlnx,zynqmp-reset"; - #reset-cells = <1>; - }; - xlnx_dp_snd_card: dp_snd_card { compatible = "xlnx,dp-snd-card"; status = "disabled";
Signature · 1 line
2.25.0
PATCH 10/16 arm64: dts: zynqmp: Add clk cells for sdhci
In reply to Michal SimekFrom: Ashok Reddy Soma <[email protected]>
Add clock-cells and clock-output-names for sdhci0 and sdhci1. These are needed for linux sdhci driver from 5.4 version onwards.
---
arch/arm/dts/zynqmp.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/dts/zynqmp.dtsi +4 -0
@@ -791,6 +791,8 @@ power-domains = <&zynqmp_firmware PD_SD_0>; nvmem-cells = <&soc_revision>; nvmem-cell-names = "soc_revision"; + #clock-cells = <1>; + clock-output-names = "clk_out_sd0", "clk_in_sd0"; }; sdhci1: mmc at ff170000 {
@@ -807,6 +809,8 @@ power-domains = <&zynqmp_firmware PD_SD_1>; nvmem-cells = <&soc_revision>; nvmem-cell-names = "soc_revision"; + #clock-cells = <1>; + clock-output-names = "clk_out_sd1", "clk_in_sd1"; }; pinctrl0: pinctrl at ff180000 {
Signature · 1 line
2.25.0
PATCH 11/16 arm64: zynqmp: Do not duplicate flash partition label property
In reply to Michal SimekFrom: Amit Kumar Mahapatra <[email protected]>
In kernel 5.4, support has been added for reading MTD devices via the nvmem API.
For this the mtd devices are registered as read-only NVMEM providers under sysfs with the same name as the flash partition label property.
So if flash partition label property of multiple flash devices are identical then the second mtd device fails to get registered as a NVMEM provider.
This patch fixes the issue by having different label property for different flashes.
---
arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts +2 -2
@@ -197,7 +197,7 @@ reg = <0>; partition at 0 { - label = "data"; + label = "spi0-data"; reg = <0x0 0x100000>; }; };
@@ -214,7 +214,7 @@ reg = <0>; partition at 0 { - label = "data"; + label = "spi1-data"; reg = <0x0 0x84000>; }; };
Signature · 1 line
2.25.0
PATCH 12/16 arm64: zynqmp: Sync DP subsystem
In reply to Michal SimekSync DP subsystem with the latest state in Xilinx U-Boot repository. This binding hasn't been approved in mainline Linux but it is much better than ancient version which this patch removes.
---
arch/arm/dts/zynqmp-clk-ccf.dtsi | 6 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 19 +--- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 20 +--- arch/arm/dts/zynqmp.dtsi | 136 ++++++++++------------- 5 files changed, 73 insertions(+), 110 deletions(-)
arch/arm/dts/zynqmp-clk-ccf.dtsi +5 -1
@@ -284,11 +284,15 @@ clocks = <&zynqmp_clk AMS_REF>; }; +&zynqmp_dpsub { + clocks = <&dp_aclk>, <&zynqmp_clk DP_AUDIO_REF>, <&zynqmp_clk DP_VIDEO_REF>; +}; + &xlnx_dpdma { clocks = <&zynqmp_clk DPDMA_REF>; }; -&xlnx_dp_snd_codec0 { +&zynqmp_dp_snd_codec0 { clocks = <&zynqmp_clk DP_AUDIO_REF>; };
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +5 -14
@@ -175,32 +175,23 @@ dr_mode = "host"; }; -&xilinx_drm { +&zynqmp_dpsub { status = "okay"; }; -&xlnx_dp { +&zynqmp_dp_snd_pcm0 { status = "okay"; }; -&xlnx_dp_sub { +&zynqmp_dp_snd_pcm1 { status = "okay"; - xlnx,vid-clk-pl; }; -&xlnx_dp_snd_pcm0 { +&zynqmp_dp_snd_card0 { status = "okay"; }; -&xlnx_dp_snd_pcm1 { - status = "okay"; -}; - -&xlnx_dp_snd_card { - status = "okay"; -}; - -&xlnx_dp_snd_codec0 { +&zynqmp_dp_snd_codec0 { status = "okay"; };
arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts +1 -1
@@ -115,7 +115,7 @@ status = "okay"; }; -&xlnx_dp { +&zynqmp_dpsub { status = "okay"; };
arch/arm/dts/zynqmp-zcu102-revA.dts +5 -15
@@ -705,33 +705,23 @@ status = "okay"; }; -&xilinx_drm { +&zynqmp_dpsub { status = "okay"; - clocks = <&si570_1>; }; -&xlnx_dp { +&zynqmp_dp_snd_codec0 { status = "okay"; }; -&xlnx_dp_sub { +&zynqmp_dp_snd_pcm0 { status = "okay"; - xlnx,vid-clk-pl; }; -&xlnx_dp_snd_pcm0 { +&zynqmp_dp_snd_pcm1 { status = "okay"; }; -&xlnx_dp_snd_pcm1 { - status = "okay"; -}; - -&xlnx_dp_snd_card { - status = "okay"; -}; - -&xlnx_dp_snd_codec0 { +&zynqmp_dp_snd_card0 { status = "okay"; };
arch/arm/dts/zynqmp.dtsi +57 -79
153 lines not on this page · raw message
Signature · 1 line
2.25.0
PATCH 13/16 arm64: zynqmp: Fix addresses in partition definitions
In reply to Michal SimekNode name should be <name>@<address> which is not how partitions are described.
Issue was found by running dtbs_check as:
flash at 0: 'partition at qspi-device-tree', 'partition at qspi-fsbl-uboot', 'partition at qspi-linux', 'partition at qspi-rootfs'
do not match any of the regexes: ...
---
arch/arm/dts/zynqmp-zc1232-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zc1254-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 8 ++++---- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu102-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu104-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu104-revC.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu106-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu111-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu1275-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu1275-revB.dts | 8 ++++---- 11 files changed, 44 insertions(+), 44 deletions(-)
arch/arm/dts/zynqmp-zc1232-revA.dts +4 -4
@@ -48,19 +48,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; };
arch/arm/dts/zynqmp-zc1254-revA.dts +4 -4
@@ -48,19 +48,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; };
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +4 -4
@@ -108,19 +108,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; };
arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts +4 -4
@@ -187,19 +187,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; };
arch/arm/dts/zynqmp-zcu102-revA.dts +4 -4
@@ -614,19 +614,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; };
arch/arm/dts/zynqmp-zcu104-revA.dts +4 -4
@@ -209,19 +209,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; };
arch/arm/dts/zynqmp-zcu104-revC.dts +4 -4
@@ -222,19 +222,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; };
arch/arm/dts/zynqmp-zcu106-revA.dts +4 -4
@@ -612,19 +612,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; };
arch/arm/dts/zynqmp-zcu111-revA.dts +4 -4
@@ -525,19 +525,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; };
arch/arm/dts/zynqmp-zcu1275-revA.dts +4 -4
@@ -49,19 +49,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */ spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; };
arch/arm/dts/zynqmp-zcu1275-revB.dts +4 -4
@@ -50,19 +50,19 @@ spi-tx-bus-width = <1>; spi-rx-bus-width = <1>; spi-max-frequency = <108000000>; /* Based on DC1 spec */ - partition at qspi-fsbl-uboot { /* for testing purpose */ + partition at 0 { /* for testing purpose */ label = "qspi-fsbl-uboot"; reg = <0x0 0x100000>; }; - partition at qspi-linux { /* for testing purpose */ + partition at 10000 { /* for testing purpose */ label = "qspi-linux"; reg = <0x100000 0x500000>; }; - partition at qspi-device-tree { /* for testing purpose */ + partition at 600000 { /* for testing purpose */ label = "qspi-device-tree"; reg = <0x600000 0x20000>; }; - partition at qspi-rootfs { /* for testing purpose */ + partition at 620000 { /* for testing purpose */ label = "qspi-rootfs"; reg = <0x620000 0x5E0000>; };
Signature · 1 line
2.25.0
PATCH 14/16 arm64: zynqmp: Fix GIC compatible property
In reply to Michal Simekdtbs_check is showing warning around GIC compatible property as interrupt-controller at f9010000: compatible: ['arm,gic-400', 'arm,cortex-a15-gic'] is not valid under any of the given schemas
Similar change has been done also by Linux kernel commit 5400cdc1410b ("ARM: dts: sunxi: Fix GIC compatible")
---
arch/arm/dts/zynqmp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/zynqmp.dtsi +1 -1
@@ -208,7 +208,7 @@ ranges = <0 0 0 0 0xffffffff>; gic: interrupt-controller at f9010000 { - compatible = "arm,gic-400", "arm,cortex-a15-gic"; + compatible = "arm,gic-400"; #interrupt-cells = <3>; reg = <0x0 0xf9010000 0x10000>, <0x0 0xf9020000 0x20000>,
Signature · 1 line
2.25.0
PATCH 15/16 arm64: zynqmp: Change bus naming to axi
In reply to Michal SimekLinux dtbs_check reports issue with bus name reported as
amba-apu at 0: $nodename:0: 'amba-apu at 0' does not match '^(bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$'
amba: $nodename:0: 'amba' does not match '^(bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$'
That's why change bus names to axi.
---
arch/arm/dts/zynqmp.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/zynqmp.dtsi +2 -2
@@ -201,7 +201,7 @@ }; }; - amba_apu: amba-apu at 0 { + amba_apu: axi at 0 { compatible = "simple-bus"; #address-cells = <2>; #size-cells = <1>;
@@ -220,7 +220,7 @@ }; }; - amba: amba { + amba: axi { compatible = "simple-bus"; u-boot,dm-pre-reloc; #address-cells = <2>;
Signature · 1 line
2.25.0
PATCH 16/16 arm64: zynqmp: Move pinctrl node under firmware node
In reply to Michal SimekPinctrl is handled via firmare interface that's why move it there without reg property and new compatible string.
---
arch/arm/dts/zynqmp.dtsi | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
arch/arm/dts/zynqmp.dtsi +5 -6
@@ -167,6 +167,11 @@ compatible = "xlnx,zynqmp-reset"; #reset-cells = <1>; }; + + pinctrl0: pinctrl { + compatible = "xlnx,zynqmp-pinctrl"; + status = "disabled"; + }; }; };
@@ -765,12 +770,6 @@ clock-output-names = "clk_out_sd1", "clk_in_sd1"; }; - pinctrl0: pinctrl at ff180000 { - compatible = "xlnx,pinctrl-zynqmp"; - status = "disabled"; - reg = <0x0 0xff180000 0x0 0x1000>; - }; - smmu: smmu at fd800000 { compatible = "arm,mmu-500"; reg = <0x0 0xfd800000 0x0 0x20000>;
Signature · 1 line
2.25.0
cover xilinx: DT sync up
In reply to Michal Simek?t 18. 2. 2020 v 13:20 odes?latel Michal Simek <[email protected]> napsal:
Quoted 74 lines
Hi,
I am sending these patches based on Xilinx SoC vendor tree. There are also fixes found based on Linux yaml parser. Patches with link to Linux mainline patches should be marked properly.
Thanks,
MichalAmit Kumar Mahapatra (1):
arm64: zynqmp: Do not duplicate flash partition label propertyAshok Reddy Soma (1):
arm64: dts: zynqmp: Add clk cells for sdhciManish Narani (1):
arm64: zynqmp: Add 'no-1-8-v' property for ZynqMP BoardsMichal Simek (10):
arm64: zynqmp: Replace gpio-key,wakeup with wakeup source
arm64: zynqmp: Update Copyright years to 2020
ARM: zynq: Fix spi name node
arm64: zynqmp: Remove unusedzynqmp-clk.dtsi
arm64: zynqmp: Remove second copy of reset-controller
arm64: zynqmp: Sync DP subsystem
arm64: zynqmp: Fix addresses in partition definitions
arm64: zynqmp: Fix GIC compatible property
arm64: zynqmp: Change bus naming to axi
arm64: zynqmp: Move pinctrl node under firmware nodeNava kishore Manne (1):
arm64: zynqmp: Sync zynqmp fpga manager with mainlineQuanyang Wang (1):
ARM: dts: zc702: Fix I2C bus warningsSudeep Holla (1):
ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source propertyarch/arm/dts/avnet-ultra96-rev1.dts | 2 +- arch/arm/dts/zynq-zc702.dts | 12 +- arch/arm/dts/zynq-zc770-xm010.dts | 2 +- arch/arm/dts/zynq-zc770-xm013.dts | 2 +- arch/arm/dts/zynq-zturn.dts | 2 +- arch/arm/dts/zynqmp-clk-ccf.dtsi | 12 +- arch/arm/dts/zynqmp-clk.dtsi | 244 ----------------------- arch/arm/dts/zynqmp-mini-qspi.dts | 2 +- arch/arm/dts/zynqmp-zc1232-revA.dts | 10 +- arch/arm/dts/zynqmp-zc1254-revA.dts | 10 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 34 ++-- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 6 +- arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 12 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu102-rev1.0.dts | 6 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 36 ++-- arch/arm/dts/zynqmp-zcu102-revB.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 10 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 10 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 14 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 14 +- arch/arm/dts/zynqmp-zcu1275-revA.dts | 10 +- arch/arm/dts/zynqmp-zcu1275-revB.dts | 10 +- arch/arm/dts/zynqmp-zcu1285-revA.dts | 6 +- arch/arm/dts/zynqmp-zcu208-revA.dts | 8 +- arch/arm/dts/zynqmp-zcu216-revA.dts | 8 +- arch/arm/dts/zynqmp.dtsi | 176 +++++++--------- 29 files changed, 206 insertions(+), 460 deletions(-) delete mode 100644 arch/arm/dts/zynqmp-clk.dtsi
Quoted 3 lines
--
2.25.0
Applied all.
M
Signature · 5 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs