ARM: dts: qcom: msm8974: clean up USB nodes

Rename "otg" label to "usb" to group it with other usb nodes and also
because "usb" makes more sense for a USB controller.

And now we can also better use the usb_hsX_phy labels instead of having
the ulpi -> phy@X structure in every dts.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221128171623.825572-1-luca@z3ntu.xyz

diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
index 438fe86b3d4d429e9cb567969446aba697cf2ee7..1345df7cbd002ce3c92e97a7e1381b17169c9af3 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
@@ -35,28 +35,6 @@
        };
 };
 
-&otg {
-       status = "okay";
-
-       phys = <&usb_hs2_phy>;
-       phy-select = <&tcsr 0xb000 1>;
-       extcon = <&smbb>, <&usb_id>;
-       vbus-supply = <&chg_otg>;
-       hnp-disable;
-       srp-disable;
-       adp-disable;
-
-       ulpi {
-               phy@b {
-                       status = "okay";
-                       v3p3-supply = <&pm8941_l24>;
-                       v1p8-supply = <&pm8941_l6>;
-                       extcon = <&smbb>;
-                       qcom,init-seq = /bits/ 8 <0x1 0x63>;
-               };
-       };
-};
-
 &rpm_requests {
        regulators-0 {
                compatible = "qcom,rpm-pm8841-regulators";
@@ -307,3 +285,23 @@
                };
        };
 };
+
+&usb {
+       status = "okay";
+
+       phys = <&usb_hs2_phy>;
+       phy-select = <&tcsr 0xb000 1>;
+       extcon = <&smbb>, <&usb_id>;
+       vbus-supply = <&chg_otg>;
+       hnp-disable;
+       srp-disable;
+       adp-disable;
+};
+
+&usb_hs2_phy {
+       status = "okay";
+       v3p3-supply = <&pm8941_l24>;
+       v1p8-supply = <&pm8941_l6>;
+       extcon = <&smbb>;
+       qcom,init-seq = /bits/ 8 <0x1 0x63>;
+};

diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
index 9cc453987d0e8258ea3a359ed066f7c1bd4bd601..280e63e3ebf2eeac7bd1f2eb024bcbfdea6062b2 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -248,31 +248,6 @@
        status = "okay";
 };
 
-&otg {
-       status = "okay";
-
-       phys = <&usb_hs1_phy>;
-       phy-select = <&tcsr 0xb000 0>;
-
-       extcon = <&charger>, <&usb_id>;
-       vbus-supply = <&usb_otg_vbus>;
-
-       hnp-disable;
-       srp-disable;
-       adp-disable;
-
-       ulpi {
-               phy@a {
-                       status = "okay";
-
-                       v1p8-supply = <&pm8941_l6>;
-                       v3p3-supply = <&pm8941_l24>;
-
-                       qcom,init-seq = /bits/ 8 <0x1 0x64>;
-               };
-       };
-};
-
 &pm8941_gpios {
        gpio_keys_pin_a: gpio-keys-active-state {
                pins = "gpio2", "gpio3";
@@ -652,3 +627,26 @@
                };
        };
 };
+
+&usb {
+       status = "okay";
+
+       phys = <&usb_hs1_phy>;
+       phy-select = <&tcsr 0xb000 0>;
+
+       extcon = <&charger>, <&usb_id>;
+       vbus-supply = <&usb_otg_vbus>;
+
+       hnp-disable;
+       srp-disable;
+       adp-disable;
+};
+
+&usb_hs1_phy {
+       status = "okay";
+
+       v1p8-supply = <&pm8941_l6>;
+       v3p3-supply = <&pm8941_l24>;
+
+       qcom,init-seq = /bits/ 8 <0x1 0x64>;
+};

diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
index 00542bd555e8766d7d45331d9388c4c6b8e29fa7..1b683690a1adef40b1ca253b32e2c57c1158ee99 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
@@ -132,31 +132,6 @@
        /* sii8334 MHL HDMI bridge */
 };
 
-&otg {
-       status = "okay";
-
-       phys = <&usb_hs1_phy>;
-       phy-select = <&tcsr 0xb000 0>;
-       extcon = <&smbb>, <&usb_id>;
-       vbus-supply = <&chg_otg>;
-
-       hnp-disable;
-       srp-disable;
-       adp-disable;
-
-       ulpi {
-               phy@a {
-                       status = "okay";
-
-                       v1p8-supply = <&pm8941_l6>;
-                       v3p3-supply = <&pm8941_l24>;
-
-                       extcon = <&smbb>;
-                       qcom,init-seq = /bits/ 8 <0x1 0x64>;
-               };
-       };
-};
-
 &pm8941_coincell {
        status = "okay";
        qcom,rset-ohms = <2100>;
@@ -485,3 +460,26 @@
                };
        };
 };
+
+&usb {
+       status = "okay";
+
+       phys = <&usb_hs1_phy>;
+       phy-select = <&tcsr 0xb000 0>;
+       extcon = <&smbb>, <&usb_id>;
+       vbus-supply = <&chg_otg>;
+
+       hnp-disable;
+       srp-disable;
+       adp-disable;
+};
+
+&usb_hs1_phy {
+       status = "okay";
+
+       v1p8-supply = <&pm8941_l6>;
+       v3p3-supply = <&pm8941_l24>;
+
+       extcon = <&smbb>;
+       qcom,init-seq = /bits/ 8 <0x1 0x64>;
+};

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index bdf1a4cca1c120e0dde81d1c65f040ce40ca06db..8d216a3c08511f39b2aa0a46bbfbba7b25aa7811 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -653,7 +653,7 @@
                        #size-cells = <0>;
                };
 
-               otg: usb@f9a55000 {
+               usb: usb@f9a55000 {
                        compatible = "qcom,ci-hdrc";
                        reg = <0xf9a55000 0x200>,
                              <0xf9a55200 0x200>;
@@ -679,7 +679,7 @@
                                        #phy-cells = <0>;
                                        clocks = <&xo_board>, <&gcc GCC_USB2A_PHY_SLEEP_CLK>;
                                        clock-names = "ref", "sleep";
-                                       resets = <&gcc GCC_USB2A_PHY_BCR>, <&otg 0>;
+                                       resets = <&gcc GCC_USB2A_PHY_BCR>, <&usb 0>;
                                        reset-names = "phy", "por";
                                        status = "disabled";
                                };
@@ -690,7 +690,7 @@
                                        #phy-cells = <0>;
                                        clocks = <&xo_board>, <&gcc GCC_USB2B_PHY_SLEEP_CLK>;
                                        clock-names = "ref", "sleep";
-                                       resets = <&gcc GCC_USB2B_PHY_BCR>, <&otg 1>;
+                                       resets = <&gcc GCC_USB2B_PHY_BCR>, <&usb 1>;
                                        reset-names = "phy", "por";
                                        status = "disabled";
                                };

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
index 6523257815a0bf21c95802e1a78dcddc3e6cd33f..f531d2679f6c5cc21d55c274d40c6ce844afefca 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
@@ -86,31 +86,6 @@
        };
 };
 
-&otg {
-       status = "okay";
-
-       phys = <&usb_hs1_phy>;
-       phy-select = <&tcsr 0xb000 0>;
-       extcon = <&smbb>, <&usb_id>;
-       vbus-supply = <&chg_otg>;
-
-       hnp-disable;
-       srp-disable;
-       adp-disable;
-
-       ulpi {
-               phy@a {
-                       status = "okay";
-
-                       v1p8-supply = <&pm8941_l6>;
-                       v3p3-supply = <&pm8941_l24>;
-
-                       extcon = <&smbb>;
-                       qcom,init-seq = /bits/ 8 <0x1 0x64>;
-               };
-       };
-};
-
 &pm8941_gpios {
        gpio_keys_pin_a: gpio-keys-active-state {
                pins = "gpio1", "gpio2", "gpio5";
@@ -463,3 +438,26 @@
                };
        };
 };
+
+&usb {
+       status = "okay";
+
+       phys = <&usb_hs1_phy>;
+       phy-select = <&tcsr 0xb000 0>;
+       extcon = <&smbb>, <&usb_id>;
+       vbus-supply = <&chg_otg>;
+
+       hnp-disable;
+       srp-disable;
+       adp-disable;
+};
+
+&usb_hs1_phy {
+       status = "okay";
+
+       v1p8-supply = <&pm8941_l6>;
+       v3p3-supply = <&pm8941_l24>;
+
+       extcon = <&smbb>;
+       qcom,init-seq = /bits/ 8 <0x1 0x64>;
+};

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
index 52ece17986e497311fdf7c06876a81e936fe289a..b9698ffb66ca82c14211beb5f0a501f28a3060a0 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
@@ -376,28 +376,6 @@
        status = "okay";
 };
 
-&otg {
-       status = "okay";
-
-       phys = <&usb_hs1_phy>;
-       phy-select = <&tcsr 0xb000 0>;
-
-       hnp-disable;
-       srp-disable;
-       adp-disable;
-
-       ulpi {
-               phy@a {
-                       status = "okay";
-
-                       v1p8-supply = <&pma8084_l6>;
-                       v3p3-supply = <&pma8084_l24>;
-
-                       qcom,init-seq = /bits/ 8 <0x1 0x64>;
-               };
-       };
-};
-
 &pma8084_gpios {
        gpio_keys_pin_a: gpio-keys-active-state {
                pins = "gpio2", "gpio3", "gpio5";
@@ -814,3 +792,23 @@
                bias-disable;
        };
 };
+
+&usb {
+       status = "okay";
+
+       phys = <&usb_hs1_phy>;
+       phy-select = <&tcsr 0xb000 0>;
+
+       hnp-disable;
+       srp-disable;
+       adp-disable;
+};
+
+&usb_hs1_phy {
+       status = "okay";
+
+       v1p8-supply = <&pma8084_l6>;
+       v3p3-supply = <&pma8084_l24>;
+
+       qcom,init-seq = /bits/ 8 <0x1 0x64>;
+};

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
index 07131db2e35df74a2094db7288910941dc66158f..3b1cc39f22691057b106b340f747736e646c0a79 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
@@ -213,31 +213,6 @@
        };
 };
 
-&otg {
-       status = "okay";
-
-       phys = <&usb_hs1_phy>;
-       phy-select = <&tcsr 0xb000 0>;
-       extcon = <&smbb>, <&usb_id>;
-       vbus-supply = <&chg_otg>;
-
-       hnp-disable;
-       srp-disable;
-       adp-disable;
-
-       ulpi {
-               phy@a {
-                       status = "okay";
-
-                       v1p8-supply = <&pm8941_l6>;
-                       v3p3-supply = <&pm8941_l24>;
-
-                       extcon = <&smbb>;
-                       qcom,init-seq = /bits/ 8 <0x1 0x64>;
-               };
-       };
-};
-
 &pm8941_coincell {
        status = "okay";
 
@@ -638,3 +613,26 @@
                bias-disable;
        };
 };
+
+&usb {
+       status = "okay";
+
+       phys = <&usb_hs1_phy>;
+       phy-select = <&tcsr 0xb000 0>;
+       extcon = <&smbb>, <&usb_id>;
+       vbus-supply = <&chg_otg>;
+
+       hnp-disable;
+       srp-disable;
+       adp-disable;
+};
+
+&usb_hs1_phy {
+       status = "okay";
+
+       v1p8-supply = <&pm8941_l6>;
+       v3p3-supply = <&pm8941_l24>;
+
+       extcon = <&smbb>;
+       qcom,init-seq = /bits/ 8 <0x1 0x64>;
+};