Commit 16860aee authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: switch to RPMPD_* indices 



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

Reviewed-by: default avatarBjorn Andersson <andersson@kernel.org>
Acked-by: default avatarBjorn Andersson <andersson@kernel.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: default avatarKonrad 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: default avatarBjorn Andersson <andersson@kernel.org>
parent 1ef28ee5

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

+4 −4
Original line number Diff line number Diff line
@@ -1945,8 +1945,8 @@ mpss: remoteproc@4080000 { 
			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: remoteproc@a204000 { 
					      <&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>;

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

+5 −5
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ mdss_dsi0: dsi@1a94000 { 
				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 @@ sdhc_1: mmc@7824900 { 
			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 @@ sdhc_2: mmc@7864900 { 
			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: remoteproc@a204000 { 
					      <&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>;

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

+6 −6
Original line number Diff line number Diff line
@@ -1122,7 +1122,7 @@ mdss_dsi0: dsi@1a94000 { 
				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 @@ mdss_dsi1: dsi@1a96000 { 
				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 @@ sdhc_1: mmc@7824900 { 
			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 @@ sdhc_2: mmc@7864900 { 
			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 @@ wcnss: remoteproc@a204000 { 
					  "handover",

					  "stop-ack";



			power-domains = <&rpmpd MSM8937_VDDCX>,

					<&rpmpd MSM8937_VDDMX>;

			power-domains = <&rpmpd RPMPD_VDDCX>,

					<&rpmpd RPMPD_VDDMX>;

			power-domain-names = "cx",

					     "mx";

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

+2 −2
Original line number Diff line number Diff line
@@ -1558,8 +1558,8 @@ wcnss: remoteproc@a204000 { 
					  "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>;

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

+8 −8
Original line number Diff line number Diff line
@@ -1497,8 +1497,8 @@ remoteproc_mss: remoteproc@4080000 { 


			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 @@ adreno_gpu: gpu@5000000 { 
			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 @@ remoteproc_slpi: remoteproc@5800000 { 
			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 @@ mdss_mdp: display-controller@c901000 { 
				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: dsi@c994000 { 
							 <&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: dsi@c996000 { 
							 <&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 @@ remoteproc_adsp: remoteproc@17300000 { 
			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";