Skip to content

Commit 16860ae

Browse files
lumagandersson
lumag
authored and
andersson
committed
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>
1 parent 1ef28ee commit 16860ae

8 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎arch/arm64/boot/dts/qcom/msm8916.dtsi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,8 +1945,8 @@
19451945
interrupt-names = "wdog", "fatal", "ready",
19461946
"handover", "stop-ack";
19471947

1948-
power-domains = <&rpmpd MSM8916_VDDCX>,
1949-
<&rpmpd MSM8916_VDDMX>;
1948+
power-domains = <&rpmpd RPMPD_VDDCX>,
1949+
<&rpmpd RPMPD_VDDMX>;
19501950
power-domain-names = "cx", "mx";
19511951

19521952
clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,
@@ -2449,8 +2449,8 @@
24492449
<&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
24502450
interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
24512451

2452-
power-domains = <&rpmpd MSM8916_VDDCX>,
2453-
<&rpmpd MSM8916_VDDMX>;
2452+
power-domains = <&rpmpd RPMPD_VDDCX>,
2453+
<&rpmpd RPMPD_VDDMX>;
24542454
power-domain-names = "cx", "mx";
24552455

24562456
qcom,smem-states = <&wcnss_smp2p_out 0>;

‎arch/arm64/boot/dts/qcom/msm8917.dtsi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@
10701070
phys = <&mdss_dsi0_phy>;
10711071

10721072
operating-points-v2 = <&mdss_dsi0_opp_table>;
1073-
power-domains = <&rpmpd MSM8917_VDDCX>;
1073+
power-domains = <&rpmpd RPMPD_VDDCX>;
10741074

10751075
#address-cells = <1>;
10761076
#size-cells = <0>;
@@ -1288,7 +1288,7 @@
12881288
pinctrl-0 = <&sdc1_default>;
12891289
pinctrl-1 = <&sdc1_sleep>;
12901290
pinctrl-names = "default", "sleep";
1291-
power-domains = <&rpmpd MSM8917_VDDCX>;
1291+
power-domains = <&rpmpd RPMPD_VDDCX>;
12921292
mmc-hs200-1_8v;
12931293
mmc-hs400-1_8v;
12941294
mmc-ddr-1_8v;
@@ -1313,7 +1313,7 @@
13131313
pinctrl-0 = <&sdc2_default>;
13141314
pinctrl-1 = <&sdc2_sleep>;
13151315
pinctrl-names = "default", "sleep";
1316-
power-domains = <&rpmpd MSM8917_VDDCX>;
1316+
power-domains = <&rpmpd RPMPD_VDDCX>;
13171317
bus-width = <4>;
13181318
status = "disabled";
13191319
};
@@ -1517,8 +1517,8 @@
15171517
<&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
15181518
interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
15191519

1520-
power-domains = <&rpmpd MSM8917_VDDCX>,
1521-
<&rpmpd MSM8917_VDDMX>;
1520+
power-domains = <&rpmpd RPMPD_VDDCX>,
1521+
<&rpmpd RPMPD_VDDMX>;
15221522
power-domain-names = "cx", "mx";
15231523

15241524
qcom,smem-states = <&wcnss_smp2p_out 0>;

‎arch/arm64/boot/dts/qcom/msm8937.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@
11221122
phys = <&mdss_dsi0_phy>;
11231123

11241124
operating-points-v2 = <&mdss_dsi0_opp_table>;
1125-
power-domains = <&rpmpd MSM8937_VDDCX>;
1125+
power-domains = <&rpmpd RPMPD_VDDCX>;
11261126

11271127
#address-cells = <1>;
11281128
#size-cells = <0>;
@@ -1210,7 +1210,7 @@
12101210
phys = <&mdss_dsi1_phy>;
12111211

12121212
operating-points-v2 = <&mdss_dsi1_opp_table>;
1213-
power-domains = <&rpmpd MSM8937_VDDCX>;
1213+
power-domains = <&rpmpd RPMPD_VDDCX>;
12141214

12151215
#address-cells = <1>;
12161216
#size-cells = <0>;
@@ -1457,7 +1457,7 @@
14571457
pinctrl-1 = <&sdc1_sleep>;
14581458
pinctrl-names = "default",
14591459
"sleep";
1460-
power-domains = <&rpmpd MSM8937_VDDCX>;
1460+
power-domains = <&rpmpd RPMPD_VDDCX>;
14611461
mmc-hs200-1_8v;
14621462
mmc-hs400-1_8v;
14631463
mmc-ddr-1_8v;
@@ -1487,7 +1487,7 @@
14871487
pinctrl-1 = <&sdc2_sleep>;
14881488
pinctrl-names = "default",
14891489
"sleep";
1490-
power-domains = <&rpmpd MSM8937_VDDCX>;
1490+
power-domains = <&rpmpd RPMPD_VDDCX>;
14911491
bus-width = <4>;
14921492
status = "disabled";
14931493
};
@@ -1710,8 +1710,8 @@
17101710
"handover",
17111711
"stop-ack";
17121712

1713-
power-domains = <&rpmpd MSM8937_VDDCX>,
1714-
<&rpmpd MSM8937_VDDMX>;
1713+
power-domains = <&rpmpd RPMPD_VDDCX>,
1714+
<&rpmpd RPMPD_VDDMX>;
17151715
power-domain-names = "cx",
17161716
"mx";
17171717

‎arch/arm64/boot/dts/qcom/msm8976.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,8 +1558,8 @@
15581558
"handover",
15591559
"stop-ack";
15601560

1561-
power-domains = <&rpmpd MSM8976_VDDCX>,
1562-
<&rpmpd MSM8976_VDDMX>;
1561+
power-domains = <&rpmpd RPMPD_VDDCX>,
1562+
<&rpmpd RPMPD_VDDMX>;
15631563
power-domain-names = "cx", "mx";
15641564

15651565
qcom,smem-states = <&wcnss_smp2p_out 0>;

‎arch/arm64/boot/dts/qcom/msm8998.dtsi‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,8 +1497,8 @@
14971497

14981498
qcom,halt-regs = <&tcsr_regs_1 0x3000 0x5000 0x4000>;
14991499

1500-
power-domains = <&rpmpd MSM8998_VDDCX>,
1501-
<&rpmpd MSM8998_VDDMX>;
1500+
power-domains = <&rpmpd RPMPD_VDDCX>,
1501+
<&rpmpd RPMPD_VDDMX>;
15021502
power-domain-names = "cx", "mx";
15031503

15041504
status = "disabled";
@@ -1544,7 +1544,7 @@
15441544
interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
15451545
iommus = <&adreno_smmu 0>;
15461546
operating-points-v2 = <&gpu_opp_table>;
1547-
power-domains = <&rpmpd MSM8998_VDDMX>;
1547+
power-domains = <&rpmpd RPMPD_VDDMX>;
15481548
status = "disabled";
15491549

15501550
gpu_opp_table: opp-table {
@@ -1680,7 +1680,7 @@
16801680
qcom,smem-states = <&slpi_smp2p_out 0>;
16811681
qcom,smem-state-names = "stop";
16821682

1683-
power-domains = <&rpmpd MSM8998_SSCCX>;
1683+
power-domains = <&rpmpd RPMPD_SSCCX>;
16841684
power-domain-names = "ssc_cx";
16851685

16861686
status = "disabled";
@@ -2871,7 +2871,7 @@
28712871
assigned-clock-rates = <19200000>;
28722872

28732873
operating-points-v2 = <&mdp_opp_table>;
2874-
power-domains = <&rpmpd MSM8998_VDDMX>;
2874+
power-domains = <&rpmpd RPMPD_VDDMX>;
28752875

28762876
mdp_opp_table: opp-table {
28772877
compatible = "operating-points-v2";
@@ -2953,7 +2953,7 @@
29532953
<&mdss_dsi0_phy DSI_PIXEL_PLL_CLK>;
29542954

29552955
operating-points-v2 = <&dsi_opp_table>;
2956-
power-domains = <&rpmpd MSM8998_VDDCX>;
2956+
power-domains = <&rpmpd RPMPD_VDDCX>;
29572957

29582958
phys = <&mdss_dsi0_phy>;
29592959
phy-names = "dsi";
@@ -3029,7 +3029,7 @@
30293029
<&mdss_dsi1_phy DSI_PIXEL_PLL_CLK>;
30303030

30313031
operating-points-v2 = <&dsi_opp_table>;
3032-
power-domains = <&rpmpd MSM8998_VDDCX>;
3032+
power-domains = <&rpmpd RPMPD_VDDCX>;
30333033

30343034
phys = <&mdss_dsi1_phy>;
30353035
phy-names = "dsi";
@@ -3277,7 +3277,7 @@
32773277
qcom,smem-states = <&adsp_smp2p_out 0>;
32783278
qcom,smem-state-names = "stop";
32793279

3280-
power-domains = <&rpmpd MSM8998_VDDCX>;
3280+
power-domains = <&rpmpd RPMPD_VDDCX>;
32813281
power-domain-names = "cx";
32823282

32833283
status = "disabled";

‎arch/arm64/boot/dts/qcom/sdm630.dtsi‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,8 +1058,8 @@
10581058

10591059
qcom,halt-regs = <&tcsr_regs_1 0x3000 0x5000 0x4000>;
10601060

1061-
power-domains = <&rpmpd SDM660_VDDCX>,
1062-
<&rpmpd SDM660_VDDMX>;
1061+
power-domains = <&rpmpd RPMPD_VDDCX>,
1062+
<&rpmpd RPMPD_VDDMX>;
10631063
power-domain-names = "cx", "mx";
10641064

10651065
memory-region = <&mba_region>, <&mpss_region>, <&mdata_mem>;
@@ -1096,7 +1096,7 @@
10961096
"rbcpr",
10971097
"core";
10981098

1099-
power-domains = <&rpmpd SDM660_VDDMX>;
1099+
power-domains = <&rpmpd RPMPD_VDDMX>;
11001100
iommus = <&kgsl_smmu 0>;
11011101

11021102
nvmem-cells = <&gpu_speed_bin>;
@@ -1401,7 +1401,7 @@
14011401
pinctrl-names = "default", "sleep";
14021402
pinctrl-0 = <&sdc2_state_on>;
14031403
pinctrl-1 = <&sdc2_state_off>;
1404-
power-domains = <&rpmpd SDM660_VDDCX>;
1404+
power-domains = <&rpmpd RPMPD_VDDCX>;
14051405

14061406
status = "disabled";
14071407

@@ -1455,7 +1455,7 @@
14551455
pinctrl-names = "default", "sleep";
14561456
pinctrl-0 = <&sdc1_state_on>;
14571457
pinctrl-1 = <&sdc1_state_off>;
1458-
power-domains = <&rpmpd SDM660_VDDCX>;
1458+
power-domains = <&rpmpd RPMPD_VDDCX>;
14591459

14601460
bus-width = <8>;
14611461
non-removable;
@@ -1618,7 +1618,7 @@
16181618
"rotator-mem";
16191619
iommus = <&mmss_smmu 0>;
16201620
operating-points-v2 = <&mdp_opp_table>;
1621-
power-domains = <&rpmpd SDM660_VDDCX>;
1621+
power-domains = <&rpmpd RPMPD_VDDCX>;
16221622

16231623
ports {
16241624
#address-cells = <1>;
@@ -1670,7 +1670,7 @@
16701670
reg-names = "dsi_ctrl";
16711671

16721672
operating-points-v2 = <&dsi_opp_table>;
1673-
power-domains = <&rpmpd SDM660_VDDCX>;
1673+
power-domains = <&rpmpd RPMPD_VDDCX>;
16741674

16751675
interrupt-parent = <&mdss>;
16761676
interrupts = <4>;
@@ -2359,7 +2359,7 @@
23592359
clock-names = "xo";
23602360

23612361
memory-region = <&adsp_region>;
2362-
power-domains = <&rpmpd SDM660_VDDCX>;
2362+
power-domains = <&rpmpd RPMPD_VDDCX>;
23632363
power-domain-names = "cx";
23642364

23652365
qcom,smem-states = <&adsp_smp2p_out 0>;

‎arch/arm64/boot/dts/qcom/sdm660.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194

195195
/* DSI1 shares the OPP table with DSI0 */
196196
operating-points-v2 = <&dsi_opp_table>;
197-
power-domains = <&rpmpd SDM660_VDDCX>;
197+
power-domains = <&rpmpd RPMPD_VDDCX>;
198198

199199
interrupt-parent = <&mdss>;
200200
interrupts = <5>;

‎arch/arm64/boot/dts/qcom/sm6125.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@
724724
clock-names = "iface", "core", "xo";
725725
iommus = <&apps_smmu 0x160 0x0>;
726726

727-
power-domains = <&rpmpd SM6125_VDDCX>;
727+
power-domains = <&rpmpd RPMPD_VDDCX>;
728728

729729
qcom,dll-config = <0x000f642c>;
730730
qcom,ddr-config = <0x80040873>;
@@ -755,7 +755,7 @@
755755
pinctrl-1 = <&sdc2_off_state>;
756756
pinctrl-names = "default", "sleep";
757757

758-
power-domains = <&rpmpd SM6125_VDDCX>;
758+
power-domains = <&rpmpd RPMPD_VDDCX>;
759759

760760
qcom,dll-config = <0x0007642c>;
761761
qcom,ddr-config = <0x80040873>;
@@ -1275,7 +1275,7 @@
12751275
assigned-clock-rates = <19200000>;
12761276

12771277
operating-points-v2 = <&mdp_opp_table>;
1278-
power-domains = <&rpmpd SM6125_VDDCX>;
1278+
power-domains = <&rpmpd RPMPD_VDDCX>;
12791279

12801280
ports {
12811281
#address-cells = <1>;
@@ -1345,7 +1345,7 @@
13451345
<&mdss_dsi0_phy DSI_PIXEL_PLL_CLK>;
13461346

13471347
operating-points-v2 = <&dsi_opp_table>;
1348-
power-domains = <&rpmpd SM6125_VDDCX>;
1348+
power-domains = <&rpmpd RPMPD_VDDCX>;
13491349

13501350
phys = <&mdss_dsi0_phy>;
13511351
phy-names = "dsi";
@@ -1406,7 +1406,7 @@
14061406
"ref";
14071407

14081408
required-opps = <&rpmpd_opp_nom>;
1409-
power-domains = <&rpmpd SM6125_VDDMX>;
1409+
power-domains = <&rpmpd RPMPD_VDDMX>;
14101410

14111411
status = "disabled";
14121412
};
@@ -1434,7 +1434,7 @@
14341434
"gcc_disp_gpll0_div_clk_src";
14351435

14361436
required-opps = <&rpmpd_opp_ret>;
1437-
power-domains = <&rpmpd SM6125_VDDCX>;
1437+
power-domains = <&rpmpd RPMPD_VDDCX>;
14381438

14391439
#clock-cells = <1>;
14401440
#power-domain-cells = <1>;

0 commit comments

Comments
 (0)