arm64: zynqmp: Move USB3 PHY properties from DWC3 node to USB node

Move the PHY properties from DWC3 node to USB node in ZynqMP DTs as here
the USB3 PHY used is PSGTR, which is connected to Xilinx USB core. This
PHY initialization should be handled from Xilinx USB core as the
prerequisite register configurations are done here only.

Signed-off-by: Manish Narani <manish.narani@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
index d50b335e674d1113679449a55fb4e0cdaf242128..c893aaaafd8f9d1f7738c6d564ccebe6d34f99ef 100644 (file)
--- a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
+++ b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
@@ -545,6 +545,8 @@
        status = "okay";
        xlnx,usb-polarity = <0>;
        xlnx,usb-reset-mode = <0>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 1 PHY_TYPE_USB3 0 1>;
 };
 
 &dwc3_0 {
@@ -553,8 +555,6 @@
        snps,dis_u2_susphy_quirk;
        snps,dis_u3_susphy_quirk;
        maximum-speed = "super-speed";
-       phy-names = "usb3-phy";
-       phys = <&psgtr 1 PHY_TYPE_USB3 0 1>;
 };
 
 &usb1 {

diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revA.dts b/arch/arm/dts/zynqmp-sck-kv-g-revA.dts
index 59d5751e0634f0274535bf760798290473f561c8..4e8086c82f23228e603b32e7b78e50f18d451acd 100644 (file)
--- a/arch/arm/dts/zynqmp-sck-kv-g-revA.dts
+++ b/arch/arm/dts/zynqmp-sck-kv-g-revA.dts
@@ -125,6 +125,8 @@
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
        usbhub: usb5744 { /* u43 */
                compatible = "microchip,usb5744";
                reset-gpios = <&gpio 44 GPIO_ACTIVE_HIGH>;
@@ -135,8 +137,6 @@
        status = "okay";
        dr_mode = "host";
        snps,usb3_lpm_capable;
-       phy-names = "usb3-phy";
-       phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
        maximum-speed = "super-speed";
 };
 

diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revB.dts b/arch/arm/dts/zynqmp-sck-kv-g-revB.dts
index b5443afff98234e6244ec0bb0febdb2c24418776..048d5665c57bbb86f8aebd2a2728ebcb4eeb69c7 100644 (file)
--- a/arch/arm/dts/zynqmp-sck-kv-g-revB.dts
+++ b/arch/arm/dts/zynqmp-sck-kv-g-revB.dts
@@ -109,14 +109,14 @@
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
 };
 
 &dwc3_0 {
        status = "okay";
        dr_mode = "host";
        snps,usb3_lpm_capable;
-       phy-names = "usb3-phy";
-       phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
        maximum-speed = "super-speed";
 };
 

diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
index b92a2ee3e60a79c58324781d2f02348c3ba2aacc..4a87bd6a6aafba5acddbc200165c721f57edf203 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
@@ -424,14 +424,14 @@
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
 };
 
 &dwc3_0 {
        status = "okay";
        dr_mode = "host";
        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-zc1751-xm017-dc3.dts b/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts
index 344323ab7f933cee6d36f8124e9c08e0fa4bc10e..13812470ae34b998ff6bc192eacb6c73effe006a 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts
@@ -221,27 +221,27 @@
 
 &usb0 {
        status = "okay";
+       phy-names = "usb3-phy";
+       phys = <&psgtr 0 PHY_TYPE_USB3 0 2>;
 };
 
 &dwc3_0 {
        status = "okay";
        dr_mode = "host";
        snps,usb3_lpm_capable;
-       phy-names = "usb3-phy";
-       phys = <&psgtr 0 PHY_TYPE_USB3 0 2>;
        maximum-speed = "super-speed";
 };
 
 /* ULPI SMSC USB3320 */
 &usb1 {
        status = "okay";
+       phy-names = "usb3-phy";
+       phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;
 };
 
 &dwc3_1 {
        status = "okay";
        dr_mode = "host";
        snps,usb3_lpm_capable;
-       phy-names = "usb3-phy";
-       phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;
        maximum-speed = "super-speed";
 };

diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts
index 2d615774782f19c4a990fef4f8decf7da96a7932..ea630a43dc7f8cd18ae9d2f38202f8267ddfb74e 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu100-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu100-revC.dts
@@ -561,13 +561,13 @@
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 0>;
 };
 
 &dwc3_0 {
        status = "okay";
        dr_mode = "peripheral";
-       phy-names = "usb3-phy";
-       phys = <&psgtr 2 PHY_TYPE_USB3 0 0>;
        maximum-speed = "super-speed";
 };
 
@@ -576,13 +576,13 @@
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb1_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 3 PHY_TYPE_USB3 1 0>;
 };
 
 &dwc3_1 {
        status = "okay";
        dr_mode = "host";
-       phy-names = "usb3-phy";
-       phys = <&psgtr 3 PHY_TYPE_USB3 1 0>;
        maximum-speed = "super-speed";
 };
 

diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
index c1af5fc635eee877239049384d8e2c9e4c396e82..1b1cabb004ff3e2ca23e2fbb5b995c5f046a9e9a 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -1019,14 +1019,14 @@
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
 };
 
 &dwc3_0 {
        status = "okay";
        dr_mode = "host";
        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-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts
index 7e5eca82fdaaeda9340aeb4e481fc96cbeea01e6..9cd30447eb3ed908e8920c7a5b20255f8bbf31f7 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
@@ -502,14 +502,14 @@
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
 };
 
 &dwc3_0 {
        status = "okay";
        dr_mode = "host";
        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-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
index f4ebcbb318b41860727d4cb7d743eefc8f4119e4..45191569c101f10f818b142d23521da0b9411de7 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -514,14 +514,14 @@
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
 };
 
 &dwc3_0 {
        status = "okay";
        dr_mode = "host";
        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-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index ac6689c167308078b34851069df0fb24f809c0ca..50cc72eb9240e92615db59ac6dfae4f3f04aa3ff 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -1012,14 +1012,14 @@
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
 };
 
 &dwc3_0 {
        status = "okay";
        dr_mode = "host";
        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-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index 8d57ca2b3bf3d4f3bf472ce020bea4e7beb8d086..2b15ce1ea8471495eb79638caf223b41e7b12eb8 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -849,14 +849,14 @@
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb0_default>;
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
 };
 
 &dwc3_0 {
        status = "okay";
        dr_mode = "host";
        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-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts
index d3e20ae85d7e9f7ab6658cc9316c1746a028a62d..32a6e6fb55e2fe7c8d967827406427410bf88e37 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu208-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
@@ -692,13 +692,13 @@
 /* ULPI SMSC USB3320 */
 &usb0 {
        status = "okay";
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
 };
 
 &dwc3_0 {
        status = "okay";
        dr_mode = "host";
        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 ae7c18196894cacfee36ff0987ed0504fa2ed5f3..1e347036d0a7bb08643d3bd75da70679a2c148c5 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu216-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
@@ -696,13 +696,13 @@
 /* ULPI SMSC USB3320 */
 &usb0 {
        status = "okay";
+       phy-names = "usb3-phy";
+       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
 };
 
 &dwc3_0 {
        status = "okay";
        dr_mode = "host";
        snps,usb3_lpm_capable;
-       phy-names = "usb3-phy";
-       phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;
        maximum-speed = "super-speed";
 };