diff mbox series

arm64: dts: qcom: sm6350: Replace literal rpmpd indices with constants

Message ID 20220507224645.2238421-1-marijn.suijten@somainline.org (mailing list archive)
State Queued
Headers show
Series arm64: dts: qcom: sm6350: Replace literal rpmpd indices with constants | expand

Commit Message

Marijn Suijten May 7, 2022, 10:46 p.m. UTC
It seems the SM6350_CX definition was temporarily replaced with its
literal value 0 in 1797e1c9a95c ("arm64: dts: qcom: sm6350: Add SDHCI1/2
nodes") to prevent a dependency on the qcom-rpmpd.h header patch being
available prior to this DT patch being applied, similar to c23f1b77358c
("arm64: dts: qcom: sm6125: Avoid using missing SM6125_VDDCX").
However, unlike the revert of that in the sm6125 tree the next merge
window around in a90b8adfa2dd ("Revert "arm64: dts: qcom: sm6125: Avoid
using missing SM6125_VDDCX""), this has not yet happened for sm6350:
replace them back now that the definitions are definitely available.

Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
---
 arch/arm64/boot/dts/qcom/sm6350.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Konrad Dybcio May 8, 2022, 1 p.m. UTC | #1
On 8.05.2022 00:46, Marijn Suijten wrote:
> It seems the SM6350_CX definition was temporarily replaced with its
> literal value 0 in 1797e1c9a95c ("arm64: dts: qcom: sm6350: Add SDHCI1/2
> nodes") to prevent a dependency on the qcom-rpmpd.h header patch being
> available prior to this DT patch being applied, similar to c23f1b77358c
> ("arm64: dts: qcom: sm6125: Avoid using missing SM6125_VDDCX").
> However, unlike the revert of that in the sm6125 tree the next merge
> window around in a90b8adfa2dd ("Revert "arm64: dts: qcom: sm6125: Avoid
> using missing SM6125_VDDCX""), this has not yet happened for sm6350:
> replace them back now that the definitions are definitely available.
> 
> Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>

Konrad

>  arch/arm64/boot/dts/qcom/sm6350.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
> index fb1a0f662575..b3160720edcb 100644
> --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
> @@ -489,7 +489,7 @@ sdhc_1: sdhci@7c4000 {
>  			clock-names = "iface", "core", "xo";
>  			qcom,dll-config = <0x000f642c>;
>  			qcom,ddr-config = <0x80040868>;
> -			power-domains = <&rpmhpd 0>;
> +			power-domains = <&rpmhpd SM6350_CX>;
>  			operating-points-v2 = <&sdhc1_opp_table>;
>  			bus-width = <8>;
>  			non-removable;
> @@ -935,7 +935,7 @@ sdhc_2: sdhci@8804000 {
>  			clock-names = "iface", "core", "xo";
>  			qcom,dll-config = <0x0007642c>;
>  			qcom,ddr-config = <0x80040868>;
> -			power-domains = <&rpmhpd 0>;
> +			power-domains = <&rpmhpd SM6350_CX>;
>  			operating-points-v2 = <&sdhc2_opp_table>;
>  			bus-width = <4>;
>
Marijn Suijten May 8, 2022, 2:50 p.m. UTC | #2
Note that the title should have been rpmHpd, apologies for that typo.

On 2022-05-08 00:46:45, Marijn Suijten wrote:
> It seems the SM6350_CX definition was temporarily replaced with its
> literal value 0 in 1797e1c9a95c ("arm64: dts: qcom: sm6350: Add SDHCI1/2
> nodes") to prevent a dependency on the qcom-rpmpd.h header patch being
> available prior to this DT patch being applied, similar to c23f1b77358c
> ("arm64: dts: qcom: sm6125: Avoid using missing SM6125_VDDCX").
> However, unlike the revert of that in the sm6125 tree the next merge
> window around in a90b8adfa2dd ("Revert "arm64: dts: qcom: sm6125: Avoid
> using missing SM6125_VDDCX""), this has not yet happened for sm6350:
> replace them back now that the definitions are definitely available.
> 
> Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
> ---
>  arch/arm64/boot/dts/qcom/sm6350.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
> index fb1a0f662575..b3160720edcb 100644
> --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
> @@ -489,7 +489,7 @@ sdhc_1: sdhci@7c4000 {
>  			clock-names = "iface", "core", "xo";
>  			qcom,dll-config = <0x000f642c>;
>  			qcom,ddr-config = <0x80040868>;
> -			power-domains = <&rpmhpd 0>;
> +			power-domains = <&rpmhpd SM6350_CX>;
>  			operating-points-v2 = <&sdhc1_opp_table>;
>  			bus-width = <8>;
>  			non-removable;
> @@ -935,7 +935,7 @@ sdhc_2: sdhci@8804000 {
>  			clock-names = "iface", "core", "xo";
>  			qcom,dll-config = <0x0007642c>;
>  			qcom,ddr-config = <0x80040868>;
> -			power-domains = <&rpmhpd 0>;
> +			power-domains = <&rpmhpd SM6350_CX>;
>  			operating-points-v2 = <&sdhc2_opp_table>;
>  			bus-width = <4>;
>  
> -- 
> 2.36.0
>
Bjorn Andersson July 16, 2022, 3:19 p.m. UTC | #3
On Sun, 8 May 2022 00:46:45 +0200, Marijn Suijten wrote:
> It seems the SM6350_CX definition was temporarily replaced with its
> literal value 0 in 1797e1c9a95c ("arm64: dts: qcom: sm6350: Add SDHCI1/2
> nodes") to prevent a dependency on the qcom-rpmpd.h header patch being
> available prior to this DT patch being applied, similar to c23f1b77358c
> ("arm64: dts: qcom: sm6125: Avoid using missing SM6125_VDDCX").
> However, unlike the revert of that in the sm6125 tree the next merge
> window around in a90b8adfa2dd ("Revert "arm64: dts: qcom: sm6125: Avoid
> using missing SM6125_VDDCX""), this has not yet happened for sm6350:
> replace them back now that the definitions are definitely available.
> 
> [...]

Applied, thanks!

[1/1] arm64: dts: qcom: sm6350: Replace literal rpmpd indices with constants
      commit: 7a9016dbc8760c4f8a610e5cb0ae0f815b0cca81

Best regards,
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
index fb1a0f662575..b3160720edcb 100644
--- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
@@ -489,7 +489,7 @@  sdhc_1: sdhci@7c4000 {
 			clock-names = "iface", "core", "xo";
 			qcom,dll-config = <0x000f642c>;
 			qcom,ddr-config = <0x80040868>;
-			power-domains = <&rpmhpd 0>;
+			power-domains = <&rpmhpd SM6350_CX>;
 			operating-points-v2 = <&sdhc1_opp_table>;
 			bus-width = <8>;
 			non-removable;
@@ -935,7 +935,7 @@  sdhc_2: sdhci@8804000 {
 			clock-names = "iface", "core", "xo";
 			qcom,dll-config = <0x0007642c>;
 			qcom,ddr-config = <0x80040868>;
-			power-domains = <&rpmhpd 0>;
+			power-domains = <&rpmhpd SM6350_CX>;
 			operating-points-v2 = <&sdhc2_opp_table>;
 			bus-width = <4>;