[PATCH 1/3] arm64: dts: qcom: sc7180-trogdor-pazquel360: drop incorrect RT5682S VBAT-supply

[PATCH 1/3] arm64: dts: qcom: sc7180-trogdor-pazquel360: drop incorrect RT5682S VBAT-supply

[Krzysztof Kozlowski]

It seems that the RT5682S codec does not use VBAT-supply:

  sc7180-trogdor-pazquel360-lte.dtb: codec@1a: Unevaluated properties are not allowed ('VBAT-supply' was unexpected)

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

I don't have access to datasheet. Driver still requests VBAT-supply but
other boards simply remove this property for RT5682S.
---
 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi
index bc4f3b6c6634..273e2249f018 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi
@@ -12,6 +12,7 @@ &alc5682 {
 	compatible = "realtek,rt5682s";
 	realtek,dmic1-clk-pin = <2>;
 	realtek,dmic-clk-rate-hz = <2048000>;
+	/delete-property/ VBAT-supply;
 };
 
 ap_ts_pen_1v8: &i2c4 {
-- 
2.34.1

[PATCH 2/3] arm64: dts: qcom: sc7280-herobrine-audio-rt5682: add missing supplies

[Krzysztof Kozlowski]

Bindings expect DBVDD-supply and LDO1-IN-supply:

  sc7280-herobrine-evoker-lte.dtb: codec@1a: 'DBVDD-supply' is a required property
  sc7280-herobrine-evoker-lte.dtb: codec@1a: 'LDO1-IN-supply' is a required property

In sc7180-trogdor.dtsi they come from the same regulator, so let's
assume intention was the same here.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 2 ++
 arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi
index 1ca11a14104d..485f9942e128 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi
@@ -94,6 +94,8 @@ alc5682: codec@1a {
 		interrupts = <101 IRQ_TYPE_EDGE_BOTH>;
 
 		AVDD-supply = <&pp1800_alc5682>;
+		DBVDD-supply = <&pp1800_alc5682>;
+		LDO1-IN-supply = <&pp1800_alc5682>;
 		MICVDD-supply = <&pp3300_codec>;
 
 		realtek,dmic1-data-pin = <1>;
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi
index 69e7aa7b2f6c..8b855345e5c7 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi
@@ -76,6 +76,8 @@ alc5682: codec@1a {
 		interrupts = <101 IRQ_TYPE_EDGE_BOTH>;
 
 		AVDD-supply = <&pp1800_alc5682>;
+		DBVDD-supply = <&pp1800_alc5682>;
+		LDO1-IN-supply = <&pp1800_alc5682>;
 		MICVDD-supply = <&pp3300_codec>;
 
 		realtek,dmic1-data-pin = <1>;
-- 
2.34.1

[PATCH 3/3] arm64: dts: qcom: sc7280: align RPMh regulator nodes with bindings

[Krzysztof Kozlowski]

Device node names should be generic and bindings expect certain pattern
for RPMh regulator nodes.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

I was fixing these in other boards, but missed SC7280. Previous
(applied) set:
https://lore.kernel.org/r/20230127114347.235963-4-krzysztof.kozlowski@linaro.org
---
 arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts        | 2 +-
 arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 2 +-
 arch/arm64/boot/dts/qcom/sc7280-idp.dts           | 2 +-
 arch/arm64/boot/dts/qcom/sc7280-idp.dtsi          | 4 ++--
 arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi        | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
index 1185141f348e..afae7f46b050 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
@@ -27,7 +27,7 @@ chosen {
 };
 
 &apps_rsc {
-	pmg1110-regulators {
+	regulators-2 {
 		compatible = "qcom,pmg1110-rpmh-regulators";
 		qcom,pmic-id = "k";
 
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
index 4e0b013e25f4..df39a64da923 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
@@ -40,7 +40,7 @@ vreg_edp_bl_crd: vreg-edp-bl-crd-regulator {
 /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */
 
 &apps_rsc {
-	pmg1110-regulators {
+	regulators-2 {
 		compatible = "qcom,pmg1110-rpmh-regulators";
 		qcom,pmic-id = "k";
 
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
index ba64316b4427..15222e92e3f5 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
@@ -25,7 +25,7 @@ chosen {
 };
 
 &apps_rsc {
-	pmr735a-regulators {
+	regulators-2 {
 		compatible = "qcom,pmr735a-rpmh-regulators";
 		qcom,pmic-id = "e";
 
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
index 8b5293e7fd2a..8ebcf763b3c7 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
@@ -184,7 +184,7 @@ codec {
 };
 
 &apps_rsc {
-	pm7325-regulators {
+	regulators-0 {
 		compatible = "qcom,pm7325-rpmh-regulators";
 		qcom,pmic-id = "b";
 
@@ -279,7 +279,7 @@ vreg_l19b_1p8: ldo19 {
 		};
 	};
 
-	pm8350c-regulators {
+	regulators-1 {
 		compatible = "qcom,pm8350c-rpmh-regulators";
 		qcom,pmic-id = "c";
 
diff --git a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
index 88204f794ccb..cb0cc2ba2fa3 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
@@ -87,7 +87,7 @@ &apps_rsc {
 	 * are left out of here since they are managed elsewhere.
 	 */
 
-	pm7325-regulators {
+	regulators-0 {
 		compatible = "qcom,pm7325-rpmh-regulators";
 		qcom,pmic-id = "b";
 
@@ -188,7 +188,7 @@ vreg_l19b_1p8: ldo19 {
 		};
 	};
 
-	pm8350c-regulators {
+	regulators-1 {
 		compatible = "qcom,pm8350c-rpmh-regulators";
 		qcom,pmic-id = "c";
 
-- 
2.34.1

Re: [PATCH 3/3] arm64: dts: qcom: sc7280: align RPMh regulator nodes with bindings

[Konrad Dybcio]

On 17.02.2023 16:58, Krzysztof Kozlowski wrote:
> Device node names should be generic and bindings expect certain pattern
> for RPMh regulator nodes.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
> 
> I was fixing these in other boards, but missed SC7280. Previous
> (applied) set:
> https://lore.kernel.org/r/20230127114347.235963-4-krzysztof.kozlowski@linaro.org
> ---
>  arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts        | 2 +-
>  arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 2 +-
>  arch/arm64/boot/dts/qcom/sc7280-idp.dts           | 2 +-
>  arch/arm64/boot/dts/qcom/sc7280-idp.dtsi          | 4 ++--
>  arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi        | 4 ++--
>  5 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
> index 1185141f348e..afae7f46b050 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
> @@ -27,7 +27,7 @@ chosen {
>  };
>  
>  &apps_rsc {
> -	pmg1110-regulators {
> +	regulators-2 {
>  		compatible = "qcom,pmg1110-rpmh-regulators";
>  		qcom,pmic-id = "k";
>  
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
> index 4e0b013e25f4..df39a64da923 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
> @@ -40,7 +40,7 @@ vreg_edp_bl_crd: vreg-edp-bl-crd-regulator {
>  /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */
>  
>  &apps_rsc {
> -	pmg1110-regulators {
> +	regulators-2 {
>  		compatible = "qcom,pmg1110-rpmh-regulators";
>  		qcom,pmic-id = "k";
>  
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> index ba64316b4427..15222e92e3f5 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> @@ -25,7 +25,7 @@ chosen {
>  };
>  
>  &apps_rsc {
> -	pmr735a-regulators {
> +	regulators-2 {
>  		compatible = "qcom,pmr735a-rpmh-regulators";
>  		qcom,pmic-id = "e";
>  
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
> index 8b5293e7fd2a..8ebcf763b3c7 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
> @@ -184,7 +184,7 @@ codec {
>  };
>  
>  &apps_rsc {
> -	pm7325-regulators {
> +	regulators-0 {
>  		compatible = "qcom,pm7325-rpmh-regulators";
>  		qcom,pmic-id = "b";
>  
> @@ -279,7 +279,7 @@ vreg_l19b_1p8: ldo19 {
>  		};
>  	};
>  
> -	pm8350c-regulators {
> +	regulators-1 {
>  		compatible = "qcom,pm8350c-rpmh-regulators";
>  		qcom,pmic-id = "c";
>  
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
> index 88204f794ccb..cb0cc2ba2fa3 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
> @@ -87,7 +87,7 @@ &apps_rsc {
>  	 * are left out of here since they are managed elsewhere.
>  	 */
>  
> -	pm7325-regulators {
> +	regulators-0 {
>  		compatible = "qcom,pm7325-rpmh-regulators";
>  		qcom,pmic-id = "b";
>  
> @@ -188,7 +188,7 @@ vreg_l19b_1p8: ldo19 {
>  		};
>  	};
>  
> -	pm8350c-regulators {
> +	regulators-1 {
>  		compatible = "qcom,pm8350c-rpmh-regulators";
>  		qcom,pmic-id = "c";
>  

Re: [PATCH 1/3] arm64: dts: qcom: sc7180-trogdor-pazquel360: drop incorrect RT5682S VBAT-supply

[Doug Anderson]

Hi,

On Fri, Feb 17, 2023 at 7:58 AM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> It seems that the RT5682S codec does not use VBAT-supply:
>
>   sc7180-trogdor-pazquel360-lte.dtb: codec@1a: Unevaluated properties are not allowed ('VBAT-supply' was unexpected)
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>
> ---
>
> I don't have access to datasheet. Driver still requests VBAT-supply but
> other boards simply remove this property for RT5682S.

I checked and I don't see the driver requesting VBAT. Specifically
note that this is the "s" variant which seems to share no code with
the old variants (the "i" variant and the SDW variant).

> ---
>  arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi | 1 +
>  1 file changed, 1 insertion(+)

This seems right to me.

Reviewed-by: Douglas Anderson <dianders@chromium.org>

Re: [PATCH 2/3] arm64: dts: qcom: sc7280-herobrine-audio-rt5682: add missing supplies

[Doug Anderson]

Hi,

On Fri, Feb 17, 2023 at 7:58 AM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> Bindings expect DBVDD-supply and LDO1-IN-supply:
>
>   sc7280-herobrine-evoker-lte.dtb: codec@1a: 'DBVDD-supply' is a required property
>   sc7280-herobrine-evoker-lte.dtb: codec@1a: 'LDO1-IN-supply' is a required property
>
> In sc7180-trogdor.dtsi they come from the same regulator, so let's
> assume intention was the same here.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  .../arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 2 ++
>  arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi     | 2 ++
>  2 files changed, 4 insertions(+)

Confirmed on schematics.

Reviewed-by: Douglas Anderson <dianders@chromium.org>

Re: [PATCH 3/3] arm64: dts: qcom: sc7280: align RPMh regulator nodes with bindings

[Doug Anderson]

Hi,

On Fri, Feb 17, 2023 at 7:58 AM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> Device node names should be generic and bindings expect certain pattern
> for RPMh regulator nodes.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>
> ---
>
> I was fixing these in other boards, but missed SC7280. Previous
> (applied) set:
> https://lore.kernel.org/r/20230127114347.235963-4-krzysztof.kozlowski@linaro.org
> ---
>  arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts        | 2 +-
>  arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 2 +-
>  arch/arm64/boot/dts/qcom/sc7280-idp.dts           | 2 +-
>  arch/arm64/boot/dts/qcom/sc7280-idp.dtsi          | 4 ++--
>  arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi        | 4 ++--
>  5 files changed, 7 insertions(+), 7 deletions(-)

Reviewed-by: Douglas Anderson <dianders@chromium.org>

Re: (subset) [PATCH 1/3] arm64: dts: qcom: sc7180-trogdor-pazquel360: drop incorrect RT5682S VBAT-supply

[Bjorn Andersson]

On Fri, 17 Feb 2023 16:58:36 +0100, Krzysztof Kozlowski wrote:
> It seems that the RT5682S codec does not use VBAT-supply:
> 
>   sc7180-trogdor-pazquel360-lte.dtb: codec@1a: Unevaluated properties are not allowed ('VBAT-supply' was unexpected)
> 
> 

Applied, thanks!

[1/3] arm64: dts: qcom: sc7180-trogdor-pazquel360: drop incorrect RT5682S VBAT-supply
      commit: 45875db5cc91958af0e0ada3d8d27ad57ab7c8bb
[2/3] arm64: dts: qcom: sc7280-herobrine-audio-rt5682: add missing supplies
      commit: 11c0d37d4c03ac8002d378cb814aca89118e7d35
[3/3] arm64: dts: qcom: sc7280: align RPMh regulator nodes with bindings
      commit: a93af4677e8c3db24eeeb0498bee83b6b7e341fe

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>