arm64: dts: qcom: switch to RPMPD_* indices

Use generic RPMPD_* defines for power domain instead of using
platform-specific defines.

Reviewed-by: Bjorn Andersson <andersson@kernel.org>
Acked-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20251211-rework-rpmhpd-rpmpd-v2-1-a5ec4028129f@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index d3a25a837488c940f7f9dd08d0aa4054aeed014c..e39743e22043894955fddc17f04ed859fede5aa9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1945,8 +1945,8 @@
                        interrupt-names = "wdog", "fatal", "ready",
                                          "handover", "stop-ack";
 
-                       power-domains = <&rpmpd MSM8916_VDDCX>,
-                                       <&rpmpd MSM8916_VDDMX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>,
+                                       <&rpmpd RPMPD_VDDMX>;
                        power-domain-names = "cx", "mx";
 
                        clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,
@@ -2449,8 +2449,8 @@
                                              <&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
                        interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
 
-                       power-domains = <&rpmpd MSM8916_VDDCX>,
-                                       <&rpmpd MSM8916_VDDMX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>,
+                                       <&rpmpd RPMPD_VDDMX>;
                        power-domain-names = "cx", "mx";
 
                        qcom,smem-states = <&wcnss_smp2p_out 0>;

diff --git a/arch/arm64/boot/dts/qcom/msm8917.dtsi b/arch/arm64/boot/dts/qcom/msm8917.dtsi
index 6251189b8e6dd131ced14d50d3529af0a19f1372..a2907f8a6376c52116dc8f8a26e4d4db89512edb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8917.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8917.dtsi
@@ -1070,7 +1070,7 @@
                                phys = <&mdss_dsi0_phy>;
 
                                operating-points-v2 = <&mdss_dsi0_opp_table>;
-                               power-domains = <&rpmpd MSM8917_VDDCX>;
+                               power-domains = <&rpmpd RPMPD_VDDCX>;
 
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1288,7 +1288,7 @@
                        pinctrl-0 = <&sdc1_default>;
                        pinctrl-1 = <&sdc1_sleep>;
                        pinctrl-names = "default", "sleep";
-                       power-domains = <&rpmpd MSM8917_VDDCX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>;
                        mmc-hs200-1_8v;
                        mmc-hs400-1_8v;
                        mmc-ddr-1_8v;
@@ -1313,7 +1313,7 @@
                        pinctrl-0 = <&sdc2_default>;
                        pinctrl-1 = <&sdc2_sleep>;
                        pinctrl-names = "default", "sleep";
-                       power-domains = <&rpmpd MSM8917_VDDCX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>;
                        bus-width = <4>;
                        status = "disabled";
                };
@@ -1517,8 +1517,8 @@
                                              <&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
                        interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
 
-                       power-domains = <&rpmpd MSM8917_VDDCX>,
-                                       <&rpmpd MSM8917_VDDMX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>,
+                                       <&rpmpd RPMPD_VDDMX>;
                        power-domain-names = "cx", "mx";
 
                        qcom,smem-states = <&wcnss_smp2p_out 0>;

diff --git a/arch/arm64/boot/dts/qcom/msm8937.dtsi b/arch/arm64/boot/dts/qcom/msm8937.dtsi
index c94eb14e31bdbe3dc1de6ac39b5cea904b10970d..7de6447de48fe704e7854a9bf3b019d263b999fa 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8937.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8937.dtsi
@@ -1122,7 +1122,7 @@
                                phys = <&mdss_dsi0_phy>;
 
                                operating-points-v2 = <&mdss_dsi0_opp_table>;
-                               power-domains = <&rpmpd MSM8937_VDDCX>;
+                               power-domains = <&rpmpd RPMPD_VDDCX>;
 
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1210,7 +1210,7 @@
                                phys = <&mdss_dsi1_phy>;
 
                                operating-points-v2 = <&mdss_dsi1_opp_table>;
-                               power-domains = <&rpmpd MSM8937_VDDCX>;
+                               power-domains = <&rpmpd RPMPD_VDDCX>;
 
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1457,7 +1457,7 @@
                        pinctrl-1 = <&sdc1_sleep>;
                        pinctrl-names = "default",
                                        "sleep";
-                       power-domains = <&rpmpd MSM8937_VDDCX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>;
                        mmc-hs200-1_8v;
                        mmc-hs400-1_8v;
                        mmc-ddr-1_8v;
@@ -1487,7 +1487,7 @@
                        pinctrl-1 = <&sdc2_sleep>;
                        pinctrl-names = "default",
                                        "sleep";
-                       power-domains = <&rpmpd MSM8937_VDDCX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>;
                        bus-width = <4>;
                        status = "disabled";
                };
@@ -1710,8 +1710,8 @@
                                          "handover",
                                          "stop-ack";
 
-                       power-domains = <&rpmpd MSM8937_VDDCX>,
-                                       <&rpmpd MSM8937_VDDMX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>,
+                                       <&rpmpd RPMPD_VDDMX>;
                        power-domain-names = "cx",
                                             "mx";
 

diff --git a/arch/arm64/boot/dts/qcom/msm8976.dtsi b/arch/arm64/boot/dts/qcom/msm8976.dtsi
index f9962512f243d6c1af4931787f4602554c63bb39..80a0a09e055d79c5e56f89e5d67baf9971d87069 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8976.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8976.dtsi
@@ -1558,8 +1558,8 @@
                                          "handover",
                                          "stop-ack";
 
-                       power-domains = <&rpmpd MSM8976_VDDCX>,
-                                       <&rpmpd MSM8976_VDDMX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>,
+                                       <&rpmpd RPMPD_VDDMX>;
                        power-domain-names = "cx", "mx";
 
                        qcom,smem-states = <&wcnss_smp2p_out 0>;

diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index 5c75fba16ce2c8afaebd63ca951b002bda123bf4..d41b5c470c485d18d93886ae7f6972443755dd56 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -1497,8 +1497,8 @@
 
                        qcom,halt-regs = <&tcsr_regs_1 0x3000 0x5000 0x4000>;
 
-                       power-domains = <&rpmpd MSM8998_VDDCX>,
-                                       <&rpmpd MSM8998_VDDMX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>,
+                                       <&rpmpd RPMPD_VDDMX>;
                        power-domain-names = "cx", "mx";
 
                        status = "disabled";
@@ -1544,7 +1544,7 @@
                        interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
                        iommus = <&adreno_smmu 0>;
                        operating-points-v2 = <&gpu_opp_table>;
-                       power-domains = <&rpmpd MSM8998_VDDMX>;
+                       power-domains = <&rpmpd RPMPD_VDDMX>;
                        status = "disabled";
 
                        gpu_opp_table: opp-table {
@@ -1680,7 +1680,7 @@
                        qcom,smem-states = <&slpi_smp2p_out 0>;
                        qcom,smem-state-names = "stop";
 
-                       power-domains = <&rpmpd MSM8998_SSCCX>;
+                       power-domains = <&rpmpd RPMPD_SSCCX>;
                        power-domain-names = "ssc_cx";
 
                        status = "disabled";
@@ -2871,7 +2871,7 @@
                                assigned-clock-rates = <19200000>;
 
                                operating-points-v2 = <&mdp_opp_table>;
-                               power-domains = <&rpmpd MSM8998_VDDMX>;
+                               power-domains = <&rpmpd RPMPD_VDDMX>;
 
                                mdp_opp_table: opp-table {
                                        compatible = "operating-points-v2";
@@ -2953,7 +2953,7 @@
                                                         <&mdss_dsi0_phy DSI_PIXEL_PLL_CLK>;
 
                                operating-points-v2 = <&dsi_opp_table>;
-                               power-domains = <&rpmpd MSM8998_VDDCX>;
+                               power-domains = <&rpmpd RPMPD_VDDCX>;
 
                                phys = <&mdss_dsi0_phy>;
                                phy-names = "dsi";
@@ -3029,7 +3029,7 @@
                                                         <&mdss_dsi1_phy DSI_PIXEL_PLL_CLK>;
 
                                operating-points-v2 = <&dsi_opp_table>;
-                               power-domains = <&rpmpd MSM8998_VDDCX>;
+                               power-domains = <&rpmpd RPMPD_VDDCX>;
 
                                phys = <&mdss_dsi1_phy>;
                                phy-names = "dsi";
@@ -3277,7 +3277,7 @@
                        qcom,smem-states = <&adsp_smp2p_out 0>;
                        qcom,smem-state-names = "stop";
 
-                       power-domains = <&rpmpd MSM8998_VDDCX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>;
                        power-domain-names = "cx";
 
                        status = "disabled";

diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index 4a72e0718fe4c061d837d1f7a6528617fb1b2fdf..f4b8e8f468f2479d1c353315a146e29d28a85019 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -1058,8 +1058,8 @@
 
                        qcom,halt-regs = <&tcsr_regs_1 0x3000 0x5000 0x4000>;
 
-                       power-domains = <&rpmpd SDM660_VDDCX>,
-                                       <&rpmpd SDM660_VDDMX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>,
+                                       <&rpmpd RPMPD_VDDMX>;
                        power-domain-names = "cx", "mx";
 
                        memory-region = <&mba_region>, <&mpss_region>, <&mdata_mem>;
@@ -1096,7 +1096,7 @@
                                "rbcpr",
                                "core";
 
-                       power-domains = <&rpmpd SDM660_VDDMX>;
+                       power-domains = <&rpmpd RPMPD_VDDMX>;
                        iommus = <&kgsl_smmu 0>;
 
                        nvmem-cells = <&gpu_speed_bin>;
@@ -1401,7 +1401,7 @@
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&sdc2_state_on>;
                        pinctrl-1 = <&sdc2_state_off>;
-                       power-domains = <&rpmpd SDM660_VDDCX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>;
 
                        status = "disabled";
 
@@ -1455,7 +1455,7 @@
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&sdc1_state_on>;
                        pinctrl-1 = <&sdc1_state_off>;
-                       power-domains = <&rpmpd SDM660_VDDCX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>;
 
                        bus-width = <8>;
                        non-removable;
@@ -1618,7 +1618,7 @@
                                                     "rotator-mem";
                                iommus = <&mmss_smmu 0>;
                                operating-points-v2 = <&mdp_opp_table>;
-                               power-domains = <&rpmpd SDM660_VDDCX>;
+                               power-domains = <&rpmpd RPMPD_VDDCX>;
 
                                ports {
                                        #address-cells = <1>;
@@ -1670,7 +1670,7 @@
                                reg-names = "dsi_ctrl";
 
                                operating-points-v2 = <&dsi_opp_table>;
-                               power-domains = <&rpmpd SDM660_VDDCX>;
+                               power-domains = <&rpmpd RPMPD_VDDCX>;
 
                                interrupt-parent = <&mdss>;
                                interrupts = <4>;
@@ -2359,7 +2359,7 @@
                        clock-names = "xo";
 
                        memory-region = <&adsp_region>;
-                       power-domains = <&rpmpd SDM660_VDDCX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>;
                        power-domain-names = "cx";
 
                        qcom,smem-states = <&adsp_smp2p_out 0>;

diff --git a/arch/arm64/boot/dts/qcom/sdm660.dtsi b/arch/arm64/boot/dts/qcom/sdm660.dtsi
index c252f248ef153e030135b25d1f92fe394e7f5b7e..3fd6dd82a9927dc80b961c5b8f09e95870fbc8c3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm660.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm660.dtsi
@@ -194,7 +194,7 @@
 
                /* DSI1 shares the OPP table with DSI0 */
                operating-points-v2 = <&dsi_opp_table>;
-               power-domains = <&rpmpd SDM660_VDDCX>;
+               power-domains = <&rpmpd RPMPD_VDDCX>;
 
                interrupt-parent = <&mdss>;
                interrupts = <5>;

diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
index 8f2d65543373e70b48b4015478e21e8e74fd23c9..80c42dff5399b7c60576c2b6cf79afdbd8b9b1d4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
@@ -724,7 +724,7 @@
                        clock-names = "iface", "core", "xo";
                        iommus = <&apps_smmu 0x160 0x0>;
 
-                       power-domains = <&rpmpd SM6125_VDDCX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>;
 
                        qcom,dll-config = <0x000f642c>;
                        qcom,ddr-config = <0x80040873>;
@@ -755,7 +755,7 @@
                        pinctrl-1 = <&sdc2_off_state>;
                        pinctrl-names = "default", "sleep";
 
-                       power-domains = <&rpmpd SM6125_VDDCX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>;
 
                        qcom,dll-config = <0x0007642c>;
                        qcom,ddr-config = <0x80040873>;
@@ -1275,7 +1275,7 @@
                                assigned-clock-rates = <19200000>;
 
                                operating-points-v2 = <&mdp_opp_table>;
-                               power-domains = <&rpmpd SM6125_VDDCX>;
+                               power-domains = <&rpmpd RPMPD_VDDCX>;
 
                                ports {
                                        #address-cells = <1>;
@@ -1345,7 +1345,7 @@
                                                         <&mdss_dsi0_phy DSI_PIXEL_PLL_CLK>;
 
                                operating-points-v2 = <&dsi_opp_table>;
-                               power-domains = <&rpmpd SM6125_VDDCX>;
+                               power-domains = <&rpmpd RPMPD_VDDCX>;
 
                                phys = <&mdss_dsi0_phy>;
                                phy-names = "dsi";
@@ -1406,7 +1406,7 @@
                                              "ref";
 
                                required-opps = <&rpmpd_opp_nom>;
-                               power-domains = <&rpmpd SM6125_VDDMX>;
+                               power-domains = <&rpmpd RPMPD_VDDMX>;
 
                                status = "disabled";
                        };
@@ -1434,7 +1434,7 @@
                                      "gcc_disp_gpll0_div_clk_src";
 
                        required-opps = <&rpmpd_opp_ret>;
-                       power-domains = <&rpmpd SM6125_VDDCX>;
+                       power-domains = <&rpmpd RPMPD_VDDCX>;
 
                        #clock-cells = <1>;
                        #power-domain-cells = <1>;