arm64: dts: qcom: sm8450: switch to usb3/dp combo phy

The QMP PHY is a USB3/DP combo phy, switch to the newly
documented bindings and register the clocks to the GCC
and DISPCC controllers.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230206-topic-sm8450-upstream-dp-controller-v6-4-d78313cbc41d@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index 357ef1d..c334200 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -11,6 +11,7 @@
 #include <dt-bindings/dma/qcom-gpi.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/mailbox/qcom-ipcc.h>
+#include <dt-bindings/phy/phy-qcom-qmp.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/interconnect/qcom,sm8450.h>
 #include <dt-bindings/soc/qcom,gpr.h>
@@ -747,7 +748,7 @@
                                 <&ufs_mem_phy_lanes 0>,
                                 <&ufs_mem_phy_lanes 1>,
                                 <&ufs_mem_phy_lanes 2>,
-                                <0>;
+                                <&usb_1_qmpphy QMP_USB43DP_USB3_PIPE_CLK>;
                        clock-names = "bi_tcxo",
                                      "sleep_clk",
                                      "pcie_0_pipe_clk",
@@ -2033,37 +2034,24 @@
                        resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;
                };
 
-               usb_1_qmpphy: phy-wrapper@88e9000 {
-                       compatible = "qcom,sm8450-qmp-usb3-phy";
-                       reg = <0 0x088e9000 0 0x200>,
-                             <0 0x088e8000 0 0x20>;
-                       status = "disabled";
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+               usb_1_qmpphy: phy@88e8000 {
+                       compatible = "qcom,sm8450-qmp-usb3-dp-phy";
+                       reg = <0 0x088e8000 0 0x3000>;
 
                        clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>,
                                 <&rpmhcc RPMH_CXO_CLK>,
-                                <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>;
-                       clock-names = "aux", "ref_clk_src", "com_aux";
+                                <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>,
+                                <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
+                       clock-names = "aux", "ref", "com_aux", "usb3_pipe";
 
                        resets = <&gcc GCC_USB3_DP_PHY_PRIM_BCR>,
                                 <&gcc GCC_USB3_PHY_PRIM_BCR>;
                        reset-names = "phy", "common";
 
-                       usb_1_ssphy: phy@88e9200 {
-                               reg = <0 0x088e9200 0 0x200>,
-                                     <0 0x088e9400 0 0x200>,
-                                     <0 0x088e9c00 0 0x400>,
-                                     <0 0x088e9600 0 0x200>,
-                                     <0 0x088e9800 0 0x200>,
-                                     <0 0x088e9a00 0 0x100>;
-                               #phy-cells = <0>;
-                               #clock-cells = <0>;
-                               clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
-                               clock-names = "pipe0";
-                               clock-output-names = "usb3_phy_pipe_clk_src";
-                       };
+                       #clock-cells = <1>;
+                       #phy-cells = <1>;
+
+                       status = "disabled";
                };
 
                remoteproc_slpi: remoteproc@2400000 {
@@ -2970,8 +2958,8 @@
                                 <&mdss_dsi0_phy 1>,
                                 <&mdss_dsi1_phy 0>,
                                 <&mdss_dsi1_phy 1>,
-                                <0>, /* dp0 */
-                                <0>,
+                                <&usb_1_qmpphy QMP_USB43DP_DP_LINK_CLK>,
+                                <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>,
                                 <0>, /* dp1 */
                                 <0>,
                                 <0>, /* dp2 */
@@ -4167,7 +4155,7 @@
                                iommus = <&apps_smmu 0x0 0x0>;
                                snps,dis_u2_susphy_quirk;
                                snps,dis_enblslpm_quirk;
-                               phys = <&usb_1_hsphy>, <&usb_1_ssphy>;
+                               phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>;
                                phy-names = "usb2-phy", "usb3-phy";
 
                                ports {