arm64: dts: qcom: sm8350: move USB graph to the SoC dtsi

Move the graph connection between USB host, USB SS PHY and DP port to
the SoC dtsi file. They are linked in hardware in this way.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240429-usb-link-dtsi-v1-2-87c341b55cdf@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
index 4c25ab2f5670ef51f212280bb7a503aae9803a78..81e5577cccb735da3b6fa799c80ac3501579ee55 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
@@ -486,17 +486,10 @@
 
 &mdss_dp {
        status = "okay";
+};
 
-       ports {
-               port@1 {
-                       reg = <1>;
-
-                       mdss_dp0_out: endpoint {
-                               data-lanes = <0 1>;
-                               remote-endpoint = <&usb_1_qmpphy_dp_in>;
-                       };
-               };
-       };
+&mdss_dp_out {
+       data-lanes = <0 1>;
 };
 
 &mpss {
@@ -864,10 +857,6 @@
        remote-endpoint = <&pmic_glink_hs_in>;
 };
 
-&usb_1_dwc3_ss {
-       remote-endpoint = <&usb_1_qmpphy_usb_ss_in>;
-};
-
 &usb_1_hsphy {
        status = "okay";
 
@@ -885,18 +874,10 @@
        orientation-switch;
 };
 
-&usb_1_qmpphy_dp_in {
-       remote-endpoint = <&mdss_dp0_out>;
-};
-
 &usb_1_qmpphy_out {
        remote-endpoint = <&pmic_glink_ss_in>;
 };
 
-&usb_1_qmpphy_usb_ss_in {
-       remote-endpoint = <&usb_1_dwc3_ss>;
-};
-
 &usb_2 {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index f7c4700f00c36c19ed287eaa2c6ee1188ca57121..24c42f285163493afb46ed978bccfbb5755beb75 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -2273,6 +2273,7 @@
                                        reg = <1>;
 
                                        usb_1_qmpphy_usb_ss_in: endpoint {
+                                               remote-endpoint = <&usb_1_dwc3_ss>;
                                        };
                                };
 
@@ -2280,6 +2281,7 @@
                                        reg = <2>;
 
                                        usb_1_qmpphy_dp_in: endpoint {
+                                               remote-endpoint = <&mdss_dp_out>;
                                        };
                                };
                        };
@@ -2405,6 +2407,7 @@
                                                reg = <1>;
 
                                                usb_1_dwc3_ss: endpoint {
+                                                       remote-endpoint = <&usb_1_qmpphy_usb_ss_in>;
                                                };
                                        };
                                };
@@ -2626,6 +2629,14 @@
                                                        remote-endpoint = <&dpu_intf0_out>;
                                                };
                                        };
+
+                                       port@1 {
+                                               reg = <1>;
+
+                                               mdss_dp_out: endpoint {
+                                                       remote-endpoint = <&usb_1_qmpphy_dp_in>;
+                                               };
+                                       };
                                };
 
                                dp_opp_table: opp-table {