[PATCH 0/6] arm64: zynqmp: DT syncup patches

[PATCH 0/6] arm64: zynqmp: DT syncup patches

[Michal Simek]

Hi,

this series is trying to clean and sync DTS files. At the end we want to
have all these files be in sync with the Linux kernel based on DT binding
available in the Linux kernel.

Thanks,
Michal


Michal Simek (6):
  arm64: zynqmp: Remove additional header from zc1232 DT
  arm64: zynqmp: Add maximum-speed property for dwc3 nodes
  arm64: zynqmp: Remove addition newline from zc1751 dc1
  arm64: zynqmp: Remove unused dp_aclk clock
  arm64: zynqmp: Sync dp port location on zc1751 dc4
  arm64: zynqmp: Sync psgtr location on zcu100/zcu106

 arch/arm/dts/zynqmp-clk-ccf.dtsi         |  7 -------
 arch/arm/dts/zynqmp-zc1232-revA.dts      |  1 -
 arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts |  2 +-
 arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 16 ++++++++--------
 arch/arm/dts/zynqmp-zcu100-revC.dts      | 14 +++++++-------
 arch/arm/dts/zynqmp-zcu106-revA.dts      | 15 ++++++++-------
 arch/arm/dts/zynqmp-zcu111-revA.dts      |  1 +
 arch/arm/dts/zynqmp-zcu208-revA.dts      |  1 +
 arch/arm/dts/zynqmp-zcu216-revA.dts      |  1 +
 9 files changed, 27 insertions(+), 31 deletions(-)

-- 
2.31.1

[PATCH 1/6] arm64: zynqmp: Remove additional header from zc1232 DT

[Michal Simek]

Remove unused phy.h from zc1232 DTS.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/dts/zynqmp-zc1232-revA.dts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/dts/zynqmp-zc1232-revA.dts b/arch/arm/dts/zynqmp-zc1232-revA.dts
index 65dd4e1f3a5d..7543855c9fda 100644
--- a/arch/arm/dts/zynqmp-zc1232-revA.dts
+++ b/arch/arm/dts/zynqmp-zc1232-revA.dts
@@ -11,7 +11,6 @@
 
 #include "zynqmp.dtsi"
 #include "zynqmp-clk-ccf.dtsi"
-#include <dt-bindings/phy/phy.h>
 
 / {
 	model = "ZynqMP ZC1232 RevA";
-- 
2.31.1

[PATCH 2/6] arm64: zynqmp: Add maximum-speed property for dwc3 nodes

[Michal Simek]

dwc3 can be used only for higher speeds than super-speed that's why
explicitly set it up.
This is also aligned with other ZynqMP dts files.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 1 +
 arch/arm/dts/zynqmp-zcu106-revA.dts      | 1 +
 arch/arm/dts/zynqmp-zcu111-revA.dts      | 1 +
 arch/arm/dts/zynqmp-zcu208-revA.dts      | 1 +
 arch/arm/dts/zynqmp-zcu216-revA.dts      | 1 +
 5 files changed, 5 insertions(+)

diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
index 0c6a2a92dfe5..b0506c08418e 100644
--- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
@@ -433,6 +433,7 @@
 	snps,usb3_lpm_capable;
 	phy-names = "usb3-phy";
 	phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
+	maximum-speed = "super-speed";
 };
 
 &zynqmp_dpdma {
diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index 4da7a3edf548..d7140fc950ee 100644
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -1040,6 +1040,7 @@
 	snps,usb3_lpm_capable;
 	phy-names = "usb3-phy";
 	phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
+	maximum-speed = "super-speed";
 };
 
 &watchdog0 {
diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index 85821065dd43..223bb8a61462 100644
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -861,6 +861,7 @@
 	snps,usb3_lpm_capable;
 	phy-names = "usb3-phy";
 	phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
+	maximum-speed = "super-speed";
 };
 
 &zynqmp_dpdma {
diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts
index 03c84ae21acb..7607098ac077 100644
--- a/arch/arm/dts/zynqmp-zcu208-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
@@ -701,4 +701,5 @@
 	snps,usb3_lpm_capable;
 	phy-names = "usb3-phy";
 	phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
+	maximum-speed = "super-speed";
 };
diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts
index fd1d9bfbd199..7ba60da131f1 100644
--- a/arch/arm/dts/zynqmp-zcu216-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
@@ -705,4 +705,5 @@
 	snps,usb3_lpm_capable;
 	phy-names = "usb3-phy";
 	phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
+	maximum-speed = "super-speed";
 };
-- 
2.31.1

[PATCH 3/6] arm64: zynqmp: Remove addition newline from zc1751 dc1

[Michal Simek]

Trivial patch.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
index b0506c08418e..8f361e47bda1 100644
--- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
@@ -443,4 +443,3 @@
 &zynqmp_dpsub {
 	status = "okay";
 };
-
-- 
2.31.1

[PATCH 4/6] arm64: zynqmp: Remove unused dp_aclk clock

[Michal Simek]

dp_aclk is not used anywhere that's why remove it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/dts/zynqmp-clk-ccf.dtsi | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/arm/dts/zynqmp-clk-ccf.dtsi b/arch/arm/dts/zynqmp-clk-ccf.dtsi
index 987792e5c511..5ee7aa244552 100644
--- a/arch/arm/dts/zynqmp-clk-ccf.dtsi
+++ b/arch/arm/dts/zynqmp-clk-ccf.dtsi
@@ -67,13 +67,6 @@
 		#clock-cells = <0>;
 		clock-frequency = <27000000>;
 	};
-
-	dp_aclk: dp_aclk {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <100000000>;
-		clock-accuracy = <100>;
-	};
 };
 
 &zynqmp_firmware {
-- 
2.31.1

[PATCH 5/6] arm64: zynqmp: Sync dp port location on zc1751 dc4

[Michal Simek]

Historically dpdma and dpsub are placed at the end of files. Move nodes
there for easier comparison among dts files.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts b/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
index aadda179c323..e7fbf1c4b70c 100644
--- a/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
@@ -115,14 +115,6 @@
 	status = "okay";
 };
 
-&zynqmp_dpsub {
-	status = "okay";
-};
-
-&zynqmp_dpdma {
-	status = "okay";
-};
-
 &gem0 {
 	status = "okay";
 	phy-mode = "rgmii-id";
@@ -221,3 +213,11 @@
 &watchdog0 {
 	status = "okay";
 };
+
+&zynqmp_dpdma {
+	status = "okay";
+};
+
+&zynqmp_dpsub {
+	status = "okay";
+};
-- 
2.31.1

[PATCH 6/6] arm64: zynqmp: Sync psgtr location on zcu100/zcu106

[Michal Simek]

psgtr node should be below pinctrl for easier comparion among dts files.
That's why move that nodes to different location.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/dts/zynqmp-zcu100-revC.dts | 14 +++++++-------
 arch/arm/dts/zynqmp-zcu106-revA.dts | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts
index cad1a23e9539..45dd7da7179b 100644
--- a/arch/arm/dts/zynqmp-zcu100-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu100-revC.dts
@@ -483,6 +483,13 @@
 	};
 };
 
+&psgtr {
+	status = "okay";
+	/* usb3, dp */
+	clocks = <&si5335_0>, <&si5335_1>;
+	clock-names = "ref0", "ref1";
+};
+
 &rtc {
 	status = "okay";
 };
@@ -518,13 +525,6 @@
 	};
 };
 
-&psgtr {
-	status = "okay";
-	/* usb3, dp */
-	clocks = <&si5335_0>, <&si5335_1>;
-	clock-names = "ref0", "ref1";
-};
-
 &spi0 { /* Low Speed connector */
 	status = "okay";
 	label = "LS-SPI0";
diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index d7140fc950ee..2b1255dc5f32 100644
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -947,6 +947,13 @@
 	};
 };
 
+&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>;
@@ -977,13 +984,6 @@
 	};
 };
 
-&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";
 };
-- 
2.31.1

Re: [PATCH 0/6] arm64: zynqmp: DT syncup patches

[Michal Simek]

čt 3. 6. 2021 v 10:11 odesílatel Michal Simek <michal.simek@xilinx.com> napsal:
>
> Hi,
>
> this series is trying to clean and sync DTS files. At the end we want to
> have all these files be in sync with the Linux kernel based on DT binding
> available in the Linux kernel.
>
> Thanks,
> Michal
>
>
> Michal Simek (6):
>   arm64: zynqmp: Remove additional header from zc1232 DT
>   arm64: zynqmp: Add maximum-speed property for dwc3 nodes
>   arm64: zynqmp: Remove addition newline from zc1751 dc1
>   arm64: zynqmp: Remove unused dp_aclk clock
>   arm64: zynqmp: Sync dp port location on zc1751 dc4
>   arm64: zynqmp: Sync psgtr location on zcu100/zcu106
>
>  arch/arm/dts/zynqmp-clk-ccf.dtsi         |  7 -------
>  arch/arm/dts/zynqmp-zc1232-revA.dts      |  1 -
>  arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts |  2 +-
>  arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 16 ++++++++--------
>  arch/arm/dts/zynqmp-zcu100-revC.dts      | 14 +++++++-------
>  arch/arm/dts/zynqmp-zcu106-revA.dts      | 15 ++++++++-------
>  arch/arm/dts/zynqmp-zcu111-revA.dts      |  1 +
>  arch/arm/dts/zynqmp-zcu208-revA.dts      |  1 +
>  arch/arm/dts/zynqmp-zcu216-revA.dts      |  1 +
>  9 files changed, 27 insertions(+), 31 deletions(-)
>
> --
> 2.31.1
>

Applied.
M

-- 
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