arm64: dts: qcom: msm8996: switch UFS QMP PHY to new style of bindings

Change the UFS QMP PHY to use newer style of QMP PHY bindings (single
resource region, no per-PHY subnodes).

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20231205032552.1583336-2-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 35a0d2a..d3d01c1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -780,9 +780,9 @@
                                 <&pciephy_1>,
                                 <&pciephy_2>,
                                 <&usb3phy>,
-                                <&ufsphy_lane 0>,
-                                <&ufsphy_lane 1>,
-                                <&ufsphy_lane 2>;
+                                <&ufsphy 0>,
+                                <&ufsphy 1>,
+                                <&ufsphy 2>;
                        clock-names = "cxo",
                                      "cxo2",
                                      "sleep_clk",
@@ -2047,7 +2047,7 @@
                        reg = <0x00624000 0x2500>;
                        interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
 
-                       phys = <&ufsphy_lane>;
+                       phys = <&ufsphy>;
                        phy-names = "ufsphy";
 
                        power-domains = <&gcc UFS_GDSC>;
@@ -2100,25 +2100,18 @@
 
                ufsphy: phy@627000 {
                        compatible = "qcom,msm8996-qmp-ufs-phy";
-                       reg = <0x00627000 0x1c4>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
+                       reg = <0x00627000 0x1000>;
 
                        clocks = <&gcc GCC_UFS_CLKREF_CLK>;
                        clock-names = "ref";
 
                        resets = <&ufshc 0>;
                        reset-names = "ufsphy";
-                       status = "disabled";
 
-                       ufsphy_lane: phy@627400 {
-                               reg = <0x627400 0x12c>,
-                                     <0x627600 0x200>,
-                                     <0x627c00 0x1b4>;
-                               #clock-cells = <1>;
-                               #phy-cells = <0>;
-                       };
+                       #clock-cells = <1>;
+                       #phy-cells = <0>;
+
+                       status = "disabled";
                };
 
                camss: camss@a34000 {