arm64: dts: qcom: sm8250: stop using SoC-specific genpd indices

The SM8250 has switched to RPMHPD_* indices for RPMh power domains,
however commit 86a9264b6c56 ("arm64: dts: qcom: sm8250: Add
interconnects and power-domains to QUPs") brought some more old-style
indices. Convert all of them to use common RPMh PD indices.

Fixes: 86a9264b6c56 ("arm64: dts: qcom: sm8250: Add interconnects and power-domains to QUPs")
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250718-fix-rpmhpd-abi-v2-3-0059edb9ddb3@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index b30aea8b05409094837ad494389d7c22fa1ba7dd..2b3442a74a5a24a5e24f556d0b29103071a68fa3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -1030,7 +1030,7 @@
                                dmas = <&gpi_dma2 0 0 QCOM_GPI_I2C>,
                                       <&gpi_dma2 1 0 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_2 0 &qup_virt SLAVE_QUP_CORE_2 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_2 0>,
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1075,7 +1075,7 @@
                                dmas = <&gpi_dma2 0 1 QCOM_GPI_I2C>,
                                       <&gpi_dma2 1 1 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_2 0 &qup_virt SLAVE_QUP_CORE_2 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_2 0>,
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1120,7 +1120,7 @@
                                dmas = <&gpi_dma2 0 2 QCOM_GPI_I2C>,
                                       <&gpi_dma2 1 2 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_2 0 &qup_virt SLAVE_QUP_CORE_2 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_2 0>,
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1165,7 +1165,7 @@
                                dmas = <&gpi_dma2 0 3 QCOM_GPI_I2C>,
                                       <&gpi_dma2 1 3 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_2 0 &qup_virt SLAVE_QUP_CORE_2 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_2 0>,
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1227,7 +1227,7 @@
                                dmas = <&gpi_dma2 0 4 QCOM_GPI_I2C>,
                                       <&gpi_dma2 1 4 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_2 0 &qup_virt SLAVE_QUP_CORE_2 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_2 0>,
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1289,7 +1289,7 @@
                                dmas = <&gpi_dma2 0 5 QCOM_GPI_I2C>,
                                       <&gpi_dma2 1 5 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_2 0 &qup_virt SLAVE_QUP_CORE_2 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_2 0>,
                                                <&aggre1_noc MASTER_QUP_2 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1370,7 +1370,7 @@
                                dmas = <&gpi_dma0 0 0 QCOM_GPI_I2C>,
                                       <&gpi_dma0 1 0 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_0 0>,
                                                <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1415,7 +1415,7 @@
                                dmas = <&gpi_dma0 0 1 QCOM_GPI_I2C>,
                                       <&gpi_dma0 1 1 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_0 0>,
                                                <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1460,7 +1460,7 @@
                                dmas = <&gpi_dma0 0 2 QCOM_GPI_I2C>,
                                       <&gpi_dma0 1 2 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_0 0>,
                                                <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1522,7 +1522,7 @@
                                dmas = <&gpi_dma0 0 3 QCOM_GPI_I2C>,
                                       <&gpi_dma0 1 3 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_0 0>,
                                                <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1567,7 +1567,7 @@
                                dmas = <&gpi_dma0 0 4 QCOM_GPI_I2C>,
                                       <&gpi_dma0 1 4 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_0 0>,
                                                <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1612,7 +1612,7 @@
                                dmas = <&gpi_dma0 0 5 QCOM_GPI_I2C>,
                                       <&gpi_dma0 1 5 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_0 0>,
                                                <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1657,7 +1657,7 @@
                                dmas = <&gpi_dma0 0 6 QCOM_GPI_I2C>,
                                       <&gpi_dma0 1 6 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_0 0>,
                                                <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1719,7 +1719,7 @@
                                dmas = <&gpi_dma0 0 7 QCOM_GPI_I2C>,
                                       <&gpi_dma0 1 7 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_0 0>,
                                                <&aggre2_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1797,7 +1797,7 @@
                                dmas = <&gpi_dma1 0 0 QCOM_GPI_I2C>,
                                       <&gpi_dma1 1 0 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_1 0>,
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1842,7 +1842,7 @@
                                dmas = <&gpi_dma1 0 1 QCOM_GPI_I2C>,
                                       <&gpi_dma1 1 1 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_1 0>,
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1887,7 +1887,7 @@
                                dmas = <&gpi_dma1 0 2 QCOM_GPI_I2C>,
                                       <&gpi_dma1 1 2 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_1 0>,
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1932,7 +1932,7 @@
                                dmas = <&gpi_dma1 0 3 QCOM_GPI_I2C>,
                                       <&gpi_dma1 1 3 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_1 0>,
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -1977,7 +1977,7 @@
                                dmas = <&gpi_dma1 0 4 QCOM_GPI_I2C>,
                                       <&gpi_dma1 1 4 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_1 0>,
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -2039,7 +2039,7 @@
                                dmas = <&gpi_dma1 0 5 QCOM_GPI_I2C>,
                                       <&gpi_dma1 1 5 QCOM_GPI_I2C>;
                                dma-names = "tx", "rx";
-                               power-domains = <&rpmhpd SM8250_CX>;
+                               power-domains = <&rpmhpd RPMHPD_CX>;
                                interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
                                                <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_QUP_1 0>,
                                                <&aggre1_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI_CH0 0>;
@@ -4797,7 +4797,7 @@
                                #sound-dai-cells = <0>;
 
                                operating-points-v2 = <&dp_opp_table>;
-                               power-domains = <&rpmhpd SM8250_MMCX>;
+                               power-domains = <&rpmhpd RPMHPD_MMCX>;
 
                                status = "disabled";