arm64: dts: qcom: sc8280xp: describe USB signals properly

Follow example of other platforms. Rename HS graph nodes to contain
'dwc3_hs' and link SS lanes from DWC3 controllers to QMP PHYs.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240512-typec-fix-sm8250-v4-7-ad153c747a97@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 41215567b3aed7d4211a8a4c5ab94042d205b422..a2627ab4db9a902a9dee597a0e1a70394494aa54 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -56,7 +56,7 @@
                                        reg = <0>;
 
                                        pmic_glink_con0_hs: endpoint {
-                                               remote-endpoint = <&usb_0_role_switch>;
+                                               remote-endpoint = <&usb_0_dwc3_hs>;
                                        };
                                };
 
@@ -91,7 +91,7 @@
                                        reg = <0>;
 
                                        pmic_glink_con1_hs: endpoint {
-                                               remote-endpoint = <&usb_1_role_switch>;
+                                               remote-endpoint = <&usb_1_dwc3_hs>;
                                        };
                                };
 
@@ -675,6 +675,10 @@
        dr_mode = "host";
 };
 
+&usb_0_dwc3_hs {
+       remote-endpoint = <&pmic_glink_con0_hs>;
+};
+
 &usb_0_hsphy {
        vdda-pll-supply = <&vreg_l9d>;
        vdda18-supply = <&vreg_l1c>;
@@ -700,10 +704,6 @@
        remote-endpoint = <&pmic_glink_con0_ss>;
 };
 
-&usb_0_role_switch {
-       remote-endpoint = <&pmic_glink_con0_hs>;
-};
-
 &usb_1 {
        status = "okay";
 };
@@ -712,6 +712,10 @@
        dr_mode = "host";
 };
 
+&usb_1_dwc3_hs {
+       remote-endpoint = <&pmic_glink_con1_hs>;
+};
+
 &usb_1_hsphy {
        vdda-pll-supply = <&vreg_l4b>;
        vdda18-supply = <&vreg_l1c>;
@@ -737,10 +741,6 @@
        remote-endpoint = <&pmic_glink_con1_ss>;
 };
 
-&usb_1_role_switch {
-       remote-endpoint = <&pmic_glink_con1_hs>;
-};
-
 &xo_board_clk {
        clock-frequency = <38400000>;
 };

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index e937732abeded972eb86af841549576092c31995..cd914fffcf0686d9b70c36dbbb769d628edc3241 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -117,7 +117,7 @@
                                        reg = <0>;
 
                                        pmic_glink_con0_hs: endpoint {
-                                               remote-endpoint = <&usb_0_role_switch>;
+                                               remote-endpoint = <&usb_0_dwc3_hs>;
                                        };
                                };
 
@@ -152,7 +152,7 @@
                                        reg = <0>;
 
                                        pmic_glink_con1_hs: endpoint {
-                                               remote-endpoint = <&usb_1_role_switch>;
+                                               remote-endpoint = <&usb_1_dwc3_hs>;
                                        };
                                };
 
@@ -1131,6 +1131,10 @@
        dr_mode = "host";
 };
 
+&usb_0_dwc3_hs {
+       remote-endpoint = <&pmic_glink_con0_hs>;
+};
+
 &usb_0_hsphy {
        vdda-pll-supply = <&vreg_l9d>;
        vdda18-supply = <&vreg_l1c>;
@@ -1156,10 +1160,6 @@
        remote-endpoint = <&pmic_glink_con0_ss>;
 };
 
-&usb_0_role_switch {
-       remote-endpoint = <&pmic_glink_con0_hs>;
-};
-
 &usb_1 {
        status = "okay";
 };
@@ -1168,6 +1168,10 @@
        dr_mode = "host";
 };
 
+&usb_1_dwc3_hs {
+       remote-endpoint = <&pmic_glink_con1_hs>;
+};
+
 &usb_1_hsphy {
        vdda-pll-supply = <&vreg_l4b>;
        vdda18-supply = <&vreg_l1c>;
@@ -1193,10 +1197,6 @@
        remote-endpoint = <&pmic_glink_con1_ss>;
 };
 
-&usb_1_role_switch {
-       remote-endpoint = <&pmic_glink_con1_hs>;
-};
-
 &usb_2 {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index 0549ba1fbeea897b490b614b029cc24578c0370b..e87196b2ace08f4548854e46b164619c26a44306 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -3222,6 +3222,14 @@
                                        usb_0_qmpphy_out: endpoint {};
                                };
 
+                               port@1 {
+                                       reg = <1>;
+
+                                       usb_0_qmpphy_usb_ss_in: endpoint {
+                                               remote-endpoint = <&usb_0_dwc3_ss>;
+                                       };
+                               };
+
                                port@2 {
                                        reg = <2>;
 
@@ -3275,6 +3283,14 @@
                                        usb_1_qmpphy_out: endpoint {};
                                };
 
+                               port@1 {
+                                       reg = <1>;
+
+                                       usb_1_qmpphy_usb_ss_in: endpoint {
+                                               remote-endpoint = <&usb_1_dwc3_ss>;
+                                       };
+                               };
+
                                port@2 {
                                        reg = <2>;
 
@@ -3560,8 +3576,23 @@
                                phys = <&usb_0_hsphy>, <&usb_0_qmpphy QMP_USB43DP_USB3_PHY>;
                                phy-names = "usb2-phy", "usb3-phy";
 
-                               port {
-                                       usb_0_role_switch: endpoint {
+                               ports {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       port@0 {
+                                               reg = <0>;
+
+                                               usb_0_dwc3_hs: endpoint {
+                                               };
+                                       };
+
+                                       port@1 {
+                                               reg = <1>;
+
+                                               usb_0_dwc3_ss: endpoint {
+                                                       remote-endpoint = <&usb_0_qmpphy_usb_ss_in>;
+                                               };
                                        };
                                };
                        };
@@ -3622,8 +3653,23 @@
                                phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>;
                                phy-names = "usb2-phy", "usb3-phy";
 
-                               port {
-                                       usb_1_role_switch: endpoint {
+                               ports {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       port@0 {
+                                               reg = <0>;
+
+                                               usb_1_dwc3_hs: endpoint {
+                                               };
+                                       };
+
+                                       port@1 {
+                                               reg = <1>;
+
+                                               usb_1_dwc3_ss: endpoint {
+                                                       remote-endpoint = <&usb_1_qmpphy_usb_ss_in>;
+                                               };
                                        };
                                };
                        };