[PATCH 0/2] Update PD Macros

[PATCH 0/2] Update PD Macros

[Rohit Agarwal]

Hi,

This series updates the PD macros for the Qualcomm chipsets
in the devicetree files based on [1].

[1] https://lore.kernel.org/all/1688635218-23779-1-git-send-email-quic_rohiagar@quicinc.com/

Thanks,
Rohit.

Rohit Agarwal (2):
  ARM: dts: qcom: Update the PD macros in dts
  arm64: dts: qcom: Update the PD macros in dts

 arch/arm/boot/dts/qcom/qcom-msm8226.dtsi     |   2 +-
 arch/arm/boot/dts/qcom/qcom-sdx55.dtsi       |   6 +-
 arch/arm/boot/dts/qcom/qcom-sdx65.dtsi       |   6 +-
 arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi |   4 +-
 arch/arm64/boot/dts/qcom/msm8916.dtsi        |   8 +-
 arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi |   6 +-
 arch/arm64/boot/dts/qcom/msm8939.dtsi        |   8 +-
 arch/arm64/boot/dts/qcom/msm8953.dtsi        |  16 +--
 arch/arm64/boot/dts/qcom/msm8996.dtsi        |   8 +-
 arch/arm64/boot/dts/qcom/msm8998.dtsi        |  10 +-
 arch/arm64/boot/dts/qcom/qcm2290.dtsi        |  10 +-
 arch/arm64/boot/dts/qcom/qdu1000.dtsi        |   2 +-
 arch/arm64/boot/dts/qcom/sa8155p.dtsi        |  12 +--
 arch/arm64/boot/dts/qcom/sa8775p.dtsi        |  94 ++++++++---------
 arch/arm64/boot/dts/qcom/sc7180.dtsi         |  88 ++++++++--------
 arch/arm64/boot/dts/qcom/sc7280.dtsi         | 126 +++++++++++-----------
 arch/arm64/boot/dts/qcom/sc8180x.dtsi        |  22 ++--
 arch/arm64/boot/dts/qcom/sc8280xp.dtsi       | 150 +++++++++++++--------------
 arch/arm64/boot/dts/qcom/sdm630.dtsi         |  12 +--
 arch/arm64/boot/dts/qcom/sdm660.dtsi         |   2 +-
 arch/arm64/boot/dts/qcom/sdm670.dtsi         |  34 +++---
 arch/arm64/boot/dts/qcom/sdm845.dtsi         |  88 ++++++++--------
 arch/arm64/boot/dts/qcom/sm6115.dtsi         |  14 +--
 arch/arm64/boot/dts/qcom/sm6125.dtsi         |   4 +-
 arch/arm64/boot/dts/qcom/sm6350.dtsi         |  18 ++--
 arch/arm64/boot/dts/qcom/sm6375.dtsi         |  28 ++---
 arch/arm64/boot/dts/qcom/sm8150.dtsi         |  20 ++--
 arch/arm64/boot/dts/qcom/sm8250.dtsi         |  76 +++++++-------
 arch/arm64/boot/dts/qcom/sm8350.dtsi         |  74 ++++++-------
 arch/arm64/boot/dts/qcom/sm8450.dtsi         |  36 +++----
 arch/arm64/boot/dts/qcom/sm8550.dtsi         |  28 ++---
 31 files changed, 506 insertions(+), 506 deletions(-)

-- 
2.7.4

[PATCH 1/2] ARM: dts: qcom: Update the PD macros in dts

[Rohit Agarwal]

Update the PD macros according to the new macros.

Signed-off-by: Rohit Agarwal <quic_rohiagar@quicinc.com>
---
 arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 2 +-
 arch/arm/boot/dts/qcom/qcom-sdx55.dtsi   | 6 +++---
 arch/arm/boot/dts/qcom/qcom-sdx65.dtsi   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi
index 313a726..1e12b3f 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi
@@ -761,7 +761,7 @@
 					      <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
 			interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
 
-			power-domains = <&rpmpd MSM8226_VDDCX>;
+			power-domains = <&rpmpd RPMPD_VDDCX>;
 			power-domain-names = "cx";
 
 			clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>;
diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi
index df3cd9c..435570c 100644
--- a/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi
@@ -56,7 +56,7 @@
 			reg = <0x0>;
 			enable-method = "psci";
 			clocks = <&apcs>;
-			power-domains = <&rpmhpd SDX55_CX>;
+			power-domains = <&rpmhpd RPMHPD_CX>;
 			power-domain-names = "rpmhpd";
 			operating-points-v2 = <&cpu_opp_table>;
 		};
@@ -552,8 +552,8 @@
 			clocks = <&rpmhcc RPMH_CXO_CLK>;
 			clock-names = "xo";
 
-			power-domains = <&rpmhpd SDX55_CX>,
-					<&rpmhpd SDX55_MSS>;
+			power-domains = <&rpmhpd RPMHPD_CX>,
+					<&rpmhpd RPMHPD_MSS>;
 			power-domain-names = "cx", "mss";
 
 			qcom,smem-states = <&modem_smp2p_out 0>;
diff --git a/arch/arm/boot/dts/qcom/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom/qcom-sdx65.dtsi
index 1a35830..16516e9 100644
--- a/arch/arm/boot/dts/qcom/qcom-sdx65.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-sdx65.dtsi
@@ -57,7 +57,7 @@
 			reg = <0x0>;
 			enable-method = "psci";
 			clocks = <&apcs>;
-			power-domains = <&rpmhpd SDX65_CX_AO>;
+			power-domains = <&rpmhpd RPMHPD_CX_AO>;
 			power-domain-names = "rpmhpd";
 			operating-points-v2 = <&cpu_opp_table>;
 		};
@@ -442,8 +442,8 @@
 			clocks = <&rpmhcc RPMH_CXO_CLK>;
 			clock-names = "xo";
 
-			power-domains = <&rpmhpd SDX65_CX>,
-					<&rpmhpd SDX65_MSS>;
+			power-domains = <&rpmhpd RPMHPD_CX>,
+					<&rpmhpd RPMHPD_MSS>;
 			power-domain-names = "cx", "mss";
 
 			qcom,smem-states = <&modem_smp2p_out 0>;
-- 
2.7.4

Re: [PATCH 0/2] Update PD Macros

[Krzysztof Kozlowski]

On 06/07/2023 11:23, Rohit Agarwal wrote:
> Hi,
> 
> This series updates the PD macros for the Qualcomm chipsets
> in the devicetree files based on [1].
> 
> [1] https://lore.kernel.org/all/1688635218-23779-1-git-send-email-quic_rohiagar@quicinc.com/

You need to clearly mark dependencies also in other patchset, otherwise
this is unmerge'able. Specifically, the header changes should go with
DTS branch, so you need to give proper hint to Bjorn about that.

Best regards,
Krzysztof