arm64: zynqmp: DT syncup
Subsystems (2)
cover arm64: zynqmp: DT syncup
Hi,
I am sending this series to align DT files with the latest description. Couple of changes are taken from Linux kernel and others from Xilinx trees.
Thanks,
Michal
Michal Simek (6):
arm64: zynqmp: Update psgtr clocks index for boards
arm64: zynqmp: Disable CCI by default
arm64: zynqmp: Add reset description for sata
arm64: zynqmp: Move DP nodes to the end of file (zcu106)
arm64: zynqmp: Add label for zynqmp_ipi
arm64: zynqmp: Update Copyright years to 2021
Stefano Stabellini (1):
arm64: zynqmp: Add missing SMID for pcie to zynqmp.dtsi
arch/arm/dts/zynqmp-zc1232-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-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 20 ++++++------- arch/arm/dts/zynqmp-zcu102-revA.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 | 38 ++++++++++++------------ arch/arm/dts/zynqmp-zcu111-revA.dts | 16 +++++----- 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 | 8 ++--- arch/arm/dts/zynqmp-zcu216-revA.dts | 8 ++--- arch/arm/dts/zynqmp.dtsi | 8 +++-- 16 files changed, 61 insertions(+), 57 deletions(-)
Signature · 1 line
2.31.1
PATCH 4/7 arm64: zynqmp: Add reset description for sata
Sata needs to get reset before configuration that's why add property for it there.
---
arch/arm/dts/zynqmp.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/dts/zynqmp.dtsi +1 -0
@@ -701,6 +701,7 @@ interrupt-parent = <&gic>; interrupts = <0 133 4>; power-domains = <&zynqmp_firmware PD_SATA>; + resets = <&zynqmp_reset ZYNQMP_RESET_SATA>; #stream-id-cells = <4>; iommus = <&smmu 0x4c0>, <&smmu 0x4c1>, <&smmu 0x4c2>, <&smmu 0x4c3>;
Signature · 1 line
2.31.1
PATCH 1/7 arm64: zynqmp: Update psgtr clocks index for boards
In reply to Michal SimekUpdate the psgtr clock indexing for couple of zynqmp boards.
---
arch/arm/dts/zynqmp-zcu100-revC.dts | 18 +++++++++--------- arch/arm/dts/zynqmp-zcu106-revA.dts | 14 +++++++------- arch/arm/dts/zynqmp-zcu111-revA.dts | 14 +++++++------- arch/arm/dts/zynqmp-zcu208-revA.dts | 6 +++--- arch/arm/dts/zynqmp-zcu216-revA.dts | 6 +++--- 5 files changed, 29 insertions(+), 29 deletions(-)
arch/arm/dts/zynqmp-zcu100-revC.dts +9 -9
@@ -132,13 +132,13 @@ io-channels = <&u35 0>, <&u35 1>, <&u35 2>, <&u35 3>; }; - si5335a_0: clk26 { + si5335_0: si5335_0 { /* clk0_usb - u23 */ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <26000000>; }; - si5335a_1: clk27 { + si5335_1: si5335_1 { /* clk1_dp - u23 */ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <27000000>;
@@ -483,13 +483,6 @@ }; }; -&psgtr { - status = "okay"; - /* usb3, dps */ - clocks = <&si5335a_0>, <&si5335a_1>; - clock-names = "ref0", "ref1"; -}; - &rtc { status = "okay"; };
@@ -525,6 +518,13 @@ }; }; +&psgtr { + status = "okay"; + /* usb3, dp */ + clocks = <&si5335_0>, <&si5335_1>; + clock-names = "ref0", "ref1"; +}; + &spi0 { /* Low Speed connector */ status = "okay"; label = "LS-SPI0";
arch/arm/dts/zynqmp-zcu106-revA.dts +7 -7
@@ -958,13 +958,6 @@ }; }; -&psgtr { - status = "okay"; - /* nc, sata, usb3, dp */ - clocks = <&si5341 0 3>, <&si5341 0 2>, <&si5341 0 0>; - clock-names = "ref1", "ref2", "ref3"; -}; - &qspi { status = "okay"; is-dual = <1>;
@@ -995,6 +988,13 @@ }; }; +&psgtr { + status = "okay"; + /* nc, sata, usb3, dp */ + clocks = <&si5341 0 3>, <&si5341 0 2>, <&si5341 0 0>; + clock-names = "ref1", "ref2", "ref3"; +}; + &rtc { status = "okay"; };
arch/arm/dts/zynqmp-zcu111-revA.dts +7 -7
@@ -773,13 +773,6 @@ }; }; -&psgtr { - status = "okay"; - /* nc, sata, usb3, dp */ - clocks = <&si5341 0 3>, <&si5341 0 2>, <&si5341 0 0>; - clock-names = "ref1", "ref2", "ref3"; -}; - &qspi { status = "okay"; is-dual = <1>;
@@ -810,6 +803,13 @@ }; }; +&psgtr { + status = "okay"; + /* nc, dp, usb3, sata */ + clocks = <&si5341 0 0>, <&si5341 0 2>, <&si5341 0 3>; + clock-names = "ref1", "ref2", "ref3"; +}; + &rtc { status = "okay"; };
arch/arm/dts/zynqmp-zcu208-revA.dts +3 -3
@@ -651,9 +651,9 @@ &psgtr { status = "okay"; - /* pcie, sata, usb3, dp */ - clocks = <&si5341 0 5>, <&si5341 0 3>, <&si5341 0 2>, <&si5341 0 0>; - clock-names = "ref0", "ref1", "ref2", "ref3"; + /* nc, nc, usb3, sata */ + clocks = <&si5341 0 2>, <&si5341 0 3>; + clock-names = "ref2", "ref3"; }; &rtc {
arch/arm/dts/zynqmp-zcu216-revA.dts +3 -3
@@ -132,9 +132,9 @@ &psgtr { status = "okay"; - /* pcie, sata, usb3, dp */ - clocks = <&si5341 0 5>, <&si5341 0 3>, <&si5341 0 2>, <&si5341 0 0>; - clock-names = "ref0", "ref1", "ref2", "ref3"; + /* nc, nc, usb3, sata */ + clocks = <&si5341 0 2>, <&si5341 0 3>; + clock-names = "ref2", "ref3"; }; &dcc {
Signature · 1 line
2.31.1
PATCH 2/7 arm64: zynqmp: Disable CCI by default
In reply to Michal SimekThere is no reason to have CCI no enabled by default. Enable it when your system configuration requires it. In Xilinx configuration flow this is work for Device Tree Generator which reads information from HW Design configuration.
---
arch/arm/dts/zynqmp.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/dts/zynqmp.dtsi +1 -0
@@ -246,6 +246,7 @@ cci: cci@fd6e0000 { compatible = "arm,cci-400"; + status = "disabled"; reg = <0x0 0xfd6e0000 0x0 0x9000>; ranges = <0x0 0x0 0xfd6e0000 0x10000>; #address-cells = <1>;
Signature · 1 line
2.31.1
PATCH 3/7 arm64: zynqmp: Add missing SMID for pcie to zynqmp.dtsi
In reply to Michal SimekFrom: Stefano Stabellini <[email protected]>
The SMMU is disabled in device tree so this change has no impact. The benefit is that this way it is in sync with xen.dtsi. Xen enables the SMMU and makes use of it.
---
arch/arm/dts/zynqmp.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/dts/zynqmp.dtsi +2 -0
@@ -648,6 +648,8 @@ <0x0 0x0 0x0 0x2 &pcie_intc 0x2>, <0x0 0x0 0x0 0x3 &pcie_intc 0x3>, <0x0 0x0 0x0 0x4 &pcie_intc 0x4>; + #stream-id-cells = <1>; + iommus = <&smmu 0x4d0>; power-domains = <&zynqmp_firmware PD_PCIE>; pcie_intc: legacy-interrupt-controller { interrupt-controller;
Signature · 1 line
2.31.1
PATCH 5/7 arm64: zynqmp: Move DP nodes to the end of file (zcu106)
In reply to Michal SimekJust sync it with others for easier comparison.
---
arch/arm/dts/zynqmp-zcu106-revA.dts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm/dts/zynqmp-zcu106-revA.dts +11 -11
@@ -163,17 +163,6 @@ status = "okay"; }; -&zynqmp_dpdma { - status = "okay"; -}; - -&zynqmp_dpsub { - status = "okay"; - phy-names = "dp-phy0", "dp-phy1"; - phys = <&psgtr 1 PHY_TYPE_DP 0 3>, - <&psgtr 0 PHY_TYPE_DP 1 3>; -}; - /* fpd_dma clk 667MHz, lpd_dma 500MHz */ &fpd_dma_chan1 { status = "okay";
@@ -1056,3 +1045,14 @@ &watchdog0 { status = "okay"; }; + +&zynqmp_dpdma { + status = "okay"; +}; + +&zynqmp_dpsub { + status = "okay"; + phy-names = "dp-phy0", "dp-phy1"; + phys = <&psgtr 1 PHY_TYPE_DP 0 3>, + <&psgtr 0 PHY_TYPE_DP 1 3>; +};
Signature · 1 line
2.31.1
PATCH 6/7 arm64: zynqmp: Add label for zynqmp_ipi
In reply to Michal SimekAdd label which is used by bootloader for adding bootloader specific flag.
---
arch/arm/dts/zynqmp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/zynqmp.dtsi +1 -1
@@ -100,7 +100,7 @@ }; }; - zynqmp_ipi { + zynqmp_ipi: zynqmp_ipi { u-boot,dm-pre-reloc; compatible = "xlnx,zynqmp-ipi-mailbox"; interrupt-parent = <&gic>;
Signature · 1 line
2.31.1
PATCH 7/7 arm64: zynqmp: Update Copyright years to 2021
In reply to Michal SimekTrivial change for all files I have touched recently.
---
arch/arm/dts/zynqmp-zc1232-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-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.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 +- 16 files changed, 16 insertions(+), 16 deletions(-)
arch/arm/dts/zynqmp-zc1232-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZC1232 * - * (C) Copyright 2017 - 2020, Xilinx, Inc. + * (C) Copyright 2017 - 2021, Xilinx, Inc. * * Michal Simek <[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 - 2020, Xilinx, Inc. + * (C) Copyright 2015 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2015 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2015 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2016 - 2021, Xilinx, Inc. * * Michal Simek <[email protected]> * Nathalie Chan King Choy
arch/arm/dts/zynqmp-zcu102-revA.dts +1 -1
@@ -2,7 +2,7 @@ /* * dts file for Xilinx ZynqMP ZCU102 RevA * - * (C) Copyright 2015 - 2020, Xilinx, Inc. + * (C) Copyright 2015 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2017 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2017 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2016 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2017 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2017 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2018 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2018 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2017 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2017 - 2021, 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 - 2020, Xilinx, Inc. + * (C) Copyright 2014 - 2021, Xilinx, Inc. * * Michal Simek <[email protected]> *
Signature · 1 line
2.31.1
Michal Simek
Appliedpo 31. 5. 2021 v 10:00 odesílatel Michal Simek <[email protected]> napsal:
Quoted 39 lines
Hi,
I am sending this series to align DT files with the latest description. Couple of changes are taken from Linux kernel and others from Xilinx trees.
Thanks,
MichalMichal Simek (6):
arm64: zynqmp: Update psgtr clocks index for boards
arm64: zynqmp: Disable CCI by default
arm64: zynqmp: Add reset description for sata
arm64: zynqmp: Move DP nodes to the end of file (zcu106)
arm64: zynqmp: Add label forzynqmp_ipi
arm64: zynqmp: Update Copyright years to 2021Stefano Stabellini (1):
arm64: zynqmp: Add missing SMID for pcie tozynqmp.dtsiarch/arm/dts/zynqmp-zc1232-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-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 20 ++++++------- arch/arm/dts/zynqmp-zcu102-revA.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 | 38 ++++++++++++------------ arch/arm/dts/zynqmp-zcu111-revA.dts | 16 +++++----- 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 | 8 ++--- arch/arm/dts/zynqmp-zcu216-revA.dts | 8 ++--- arch/arm/dts/zynqmp.dtsi | 8 +++-- 16 files changed, 61 insertions(+), 57 deletions(-)
Quoted 3 lines
--
2.31.1
Applied.
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