arm64: dts: qcom: sm8550: 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: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240429-usb-link-dtsi-v1-4-87c341b55cdf@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
index 12d60a0ee095ee1ca4cbffdc9cfbd19d4ea015f3..f786d9114936adcacc280dfa5f0b55a6afd56c2f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
@@ -940,7 +940,6 @@
 };
 
 &mdss_dp0_out {
-       remote-endpoint = <&usb_dp_qmpphy_dp_in>;
        data-lanes = <0 1>;
 };
 
@@ -1267,10 +1266,6 @@
        remote-endpoint = <&pmic_glink_hs_in>;
 };
 
-&usb_1_dwc3_ss {
-       remote-endpoint = <&usb_dp_qmpphy_usb_ss_in>;
-};
-
 &usb_1_hsphy {
        vdd-supply = <&vreg_l1e_0p88>;
        vdda12-supply = <&vreg_l3e_1p2>;
@@ -1289,18 +1284,10 @@
        status = "okay";
 };
 
-&usb_dp_qmpphy_dp_in {
-       remote-endpoint = <&mdss_dp0_out>;
-};
-
 &usb_dp_qmpphy_out {
        remote-endpoint = <&pmic_glink_ss_in>;
 };
 
-&usb_dp_qmpphy_usb_ss_in {
-       remote-endpoint = <&usb_1_dwc3_ss>;
-};
-
 &xo_board {
        clock-frequency = <76800000>;
 };

diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
index 3d4ad5aac70fa5e74aad9830be6131332c5f629a..56800ab903a1c58e92d7504888d61f61527d53f8 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
@@ -736,7 +736,6 @@
 
 &mdss_dp0_out {
        data-lanes = <0 1>;
-       remote-endpoint = <&usb_dp_qmpphy_dp_in>;
 };
 
 &pcie_1_phy_aux_clk {
@@ -960,10 +959,6 @@
        remote-endpoint = <&pmic_glink_hs_in>;
 };
 
-&usb_1_dwc3_ss {
-       remote-endpoint = <&usb_dp_qmpphy_usb_ss_in>;
-};
-
 &usb_1_hsphy {
        vdd-supply = <&vreg_l1e_0p88>;
        vdda12-supply = <&vreg_l3e_1p2>;
@@ -982,18 +977,10 @@
        status = "okay";
 };
 
-&usb_dp_qmpphy_dp_in {
-       remote-endpoint = <&mdss_dp0_out>;
-};
-
 &usb_dp_qmpphy_out {
        remote-endpoint = <&pmic_glink_ss_in>;
 };
 
-&usb_dp_qmpphy_usb_ss_in {
-       remote-endpoint = <&usb_1_dwc3_ss>;
-};
-
 &xo_board {
        clock-frequency = <76800000>;
 };

diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
index 92f0150174187dab2d5194041838b4c4eac49e90..d0b373da39d434b742c4bef32b390c8a5e5e6df2 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
@@ -807,7 +807,6 @@
 
 &mdss_dp0_out {
        data-lanes = <0 1>;
-       remote-endpoint = <&usb_dp_qmpphy_dp_in>;
 };
 
 &pcie_1_phy_aux_clk {
@@ -1144,10 +1143,6 @@
        remote-endpoint = <&pmic_glink_hs_in>;
 };
 
-&usb_1_dwc3_ss {
-       remote-endpoint = <&usb_dp_qmpphy_usb_ss_in>;
-};
-
 &usb_1_hsphy {
        vdd-supply = <&vreg_l1e_0p88>;
        vdda12-supply = <&vreg_l3e_1p2>;
@@ -1166,18 +1161,10 @@
        status = "okay";
 };
 
-&usb_dp_qmpphy_dp_in {
-       remote-endpoint = <&mdss_dp0_out>;
-};
-
 &usb_dp_qmpphy_out {
        remote-endpoint = <&redriver_ss_in>;
 };
 
-&usb_dp_qmpphy_usb_ss_in {
-       remote-endpoint = <&usb_1_dwc3_ss>;
-};
-
 &xo_board {
        clock-frequency = <76800000>;
 };

diff --git a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
index 85e0d3d66e16a76d0ad2474d3dfe5166b2509b57..7a8d5c34e9e65e9babc8f4111ff5386693866e38 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
@@ -746,10 +746,6 @@
        remote-endpoint = <&pmic_glink_hs_in>;
 };
 
-&usb_1_dwc3_ss {
-       remote-endpoint = <&usb_dp_qmpphy_usb_ss_in>;
-};
-
 &usb_1_hsphy {
        vdd-supply = <&pm8550vs_2_l1>;
        vdda12-supply = <&pm8550vs_2_l3>;
@@ -770,10 +766,6 @@
        remote-endpoint = <&pmic_glink_ss_in>;
 };
 
-&usb_dp_qmpphy_usb_ss_in {
-       remote-endpoint = <&usb_1_dwc3_ss>;
-};
-
 &xo_board {
        clock-frequency = <76800000>;
 };

diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
index bc5aeb05ffc3dbb0887a95b693a501896523790f..3ada5a30ecb7fc23bb29cde278020b55220e71e5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
@@ -2910,6 +2910,7 @@
                                        port@1 {
                                                reg = <1>;
                                                mdss_dp0_out: endpoint {
+                                                       remote-endpoint = <&usb_dp_qmpphy_dp_in>;
                                                };
                                        };
                                };
@@ -3186,6 +3187,7 @@
                                        reg = <1>;
 
                                        usb_dp_qmpphy_usb_ss_in: endpoint {
+                                               remote-endpoint = <&usb_1_dwc3_ss>;
                                        };
                                };
 
@@ -3193,6 +3195,7 @@
                                        reg = <2>;
 
                                        usb_dp_qmpphy_dp_in: endpoint {
+                                               remote-endpoint = <&mdss_dp0_out>;
                                        };
                                };
                        };
@@ -3280,6 +3283,7 @@
                                                reg = <1>;
 
                                                usb_1_dwc3_ss: endpoint {
+                                                       remote-endpoint = <&usb_dp_qmpphy_usb_ss_in>;
                                                };
                                        };
                                };