arm64: dts: qcom: sc8180x: 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-6-ad153c747a97@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
index 6af99116c7158d77e5d68ca2e9025d536afbe143..5b226577f9d8afccaf7f77fc40ec3dea8d96510d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
+++ b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
@@ -68,7 +68,7 @@
                                        reg = <0>;
 
                                        pmic_glink_con0_hs: endpoint {
-                                               remote-endpoint = <&usb_prim_role_switch>;
+                                               remote-endpoint = <&usb_prim_dwc3_hs>;
                                        };
                                };
 
@@ -103,7 +103,7 @@
                                        reg = <0>;
 
                                        pmic_glink_con1_hs: endpoint {
-                                               remote-endpoint = <&usb_sec_role_switch>;
+                                               remote-endpoint = <&usb_sec_dwc3_hs>;
                                        };
                                };
 
@@ -582,6 +582,10 @@
        dr_mode = "host";
 };
 
+&usb_prim_dwc3_hs {
+       remote-endpoint = <&pmic_glink_con0_hs>;
+};
+
 &usb_prim_qmpphy_dp_in {
        remote-endpoint = <&mdss_dp0_out>;
 };
@@ -590,8 +594,8 @@
        remote-endpoint = <&pmic_glink_con0_ss>;
 };
 
-&usb_prim_role_switch {
-       remote-endpoint = <&pmic_glink_con0_hs>;
+&usb_sec_dwc3_hs {
+       remote-endpoint = <&pmic_glink_con1_hs>;
 };
 
 &usb_sec_hsphy {
@@ -619,10 +623,6 @@
        remote-endpoint = <&pmic_glink_con1_ss>;
 };
 
-&usb_sec_role_switch {
-       remote-endpoint = <&pmic_glink_con1_hs>;
-};
-
 &usb_sec {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
index bfee60c93ccce8f1dd0fb0c7a7e09eed9a1ce54d..65d923497a057d94f2619a950435b1530466a376 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
+++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
@@ -71,7 +71,7 @@
                                        reg = <0>;
 
                                        pmic_glink_con0_hs: endpoint {
-                                               remote-endpoint = <&usb_prim_role_switch>;
+                                               remote-endpoint = <&usb_prim_dwc3_hs>;
                                        };
                                };
 
@@ -106,7 +106,7 @@
                                        reg = <0>;
 
                                        pmic_glink_con1_hs: endpoint {
-                                               remote-endpoint = <&usb_sec_role_switch>;
+                                               remote-endpoint = <&usb_sec_dwc3_hs>;
                                        };
                                };
 
@@ -648,6 +648,10 @@
        dr_mode = "host";
 };
 
+&usb_prim_dwc3_hs {
+       remote-endpoint = <&pmic_glink_con0_hs>;
+};
+
 &usb_prim_qmpphy_dp_in {
        remote-endpoint = <&mdss_dp0_out>;
 };
@@ -656,10 +660,6 @@
        remote-endpoint = <&pmic_glink_con0_ss>;
 };
 
-&usb_prim_role_switch {
-       remote-endpoint = <&pmic_glink_con0_hs>;
-};
-
 &usb_sec_hsphy {
        vdda-pll-supply = <&vreg_l5e_0p88>;
        vdda18-supply = <&vreg_l12a_1p8>;
@@ -685,10 +685,6 @@
        remote-endpoint = <&pmic_glink_con1_ss>;
 };
 
-&usb_sec_role_switch {
-       remote-endpoint = <&pmic_glink_con1_hs>;
-};
-
 &usb_sec {
        status = "okay";
 };
@@ -697,6 +693,10 @@
        dr_mode = "host";
 };
 
+&usb_sec_dwc3_hs {
+       remote-endpoint = <&pmic_glink_con1_hs>;
+};
+
 &wifi {
        memory-region = <&wlan_mem>;
 

diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
index 4234c80932cdb414e3ad370a9e04653c32664b80..140b38e35481a0db623ce2dcc8d3c19bf30ab553 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
@@ -2542,7 +2542,9 @@
                                port@1 {
                                        reg = <1>;
 
-                                       usb_prim_qmpphy_usb_ss_in: endpoint {};
+                                       usb_prim_qmpphy_usb_ss_in: endpoint {
+                                               remote-endpoint = <&usb_prim_dwc3_ss>;
+                                       };
                                };
 
                                port@2 {
@@ -2587,7 +2589,9 @@
                                port@1 {
                                        reg = <1>;
 
-                                       usb_sec_qmpphy_usb_ss_in: endpoint {};
+                                       usb_sec_qmpphy_usb_ss_in: endpoint {
+                                               remote-endpoint = <&usb_sec_dwc3_ss>;
+                                       };
                                };
 
                                port@2 {
@@ -2667,8 +2671,23 @@
                                phys = <&usb_prim_hsphy>, <&usb_prim_qmpphy QMP_USB43DP_USB3_PHY>;
                                phy-names = "usb2-phy", "usb3-phy";
 
-                               port {
-                                       usb_prim_role_switch: endpoint {
+                               ports {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       port@0 {
+                                               reg = <0>;
+
+                                               usb_prim_dwc3_hs: endpoint {
+                                               };
+                                       };
+
+                                       port@1 {
+                                               reg = <1>;
+
+                                               usb_prim_dwc3_ss: endpoint {
+                                                       remote-endpoint = <&usb_prim_qmpphy_usb_ss_in>;
+                                               };
                                        };
                                };
                        };
@@ -2724,8 +2743,23 @@
                                phys = <&usb_sec_hsphy>, <&usb_sec_qmpphy QMP_USB43DP_USB3_PHY>;
                                phy-names = "usb2-phy", "usb3-phy";
 
-                               port {
-                                       usb_sec_role_switch: endpoint {
+                               ports {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       port@0 {
+                                               reg = <0>;
+
+                                               usb_sec_dwc3_hs: endpoint {
+                                               };
+                                       };
+
+                                       port@1 {
+                                               reg = <1>;
+
+                                               usb_sec_dwc3_ss: endpoint {
+                                                       remote-endpoint = <&usb_sec_qmpphy_usb_ss_in>;
+                                               };
                                        };
                                };
                        };