From b7870d460c05ce31e2311036d91de1e2e0b32cea Mon Sep 17 00:00:00 2001 From: Douglas Anderson Date: Mon, 29 Aug 2022 09:49:51 -0700 Subject: arm64: dts: qcom: sm8250-xperia-edo: Specify which LDO modes are allowed This board uses RPMH, specifies "regulator-allow-set-load" for LDOs, but doesn't specify any modes with "regulator-allowed-modes". Prior to commit efb0cb50c427 ("regulator: qcom-rpmh: Implement get_optimum_mode(), not set_load()") the above meant that we were able to set either LPM or HPM mode. After that commit (and fixes [1]) we'll be stuck at the initial mode. Discussion of this has resulted in the decision that the old dts files were wrong and should be fixed to fully restore old functionality. Let's re-enable the old functionality by fixing the dts. [1] https://lore.kernel.org/r/20220824142229.RFT.v2.2.I6f77860e5cd98bf5c67208fa9edda4a08847c304@changeid Fixes: 69cdb97ef652 ("arm64: dts: qcom: sm8250: Add support for SONY Xperia 1 II / 5 II (Edo platform)") Signed-off-by: Douglas Anderson Reviewed-by: Andrew Halaney Reviewed-by: Konrad Dybcio Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20220829094903.v2.5.Ie446d5183d8b1e9ec4e32228ca300e604e3315eb@changeid --- arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi') diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi index 549e0a2aa9fe..5428aab3058d 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi @@ -317,6 +317,9 @@ regulator-max-microvolt = <2960000>; regulator-initial-mode = ; regulator-allow-set-load; + regulator-allowed-modes = + ; }; vreg_l7c_2p85: ldo7 { @@ -339,6 +342,9 @@ regulator-max-microvolt = <2960000>; regulator-initial-mode = ; regulator-allow-set-load; + regulator-allowed-modes = + ; }; vreg_l10c_3p3: ldo10 { -- cgit v1.2.3 From 25f08f02f47d0f83f39308359bad06719ad9a55c Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 16 Nov 2022 11:20:54 +0100 Subject: arm64: dts: qcom: clean up 'regulator-allowed-modes' indentation When recently adding the missing 'regulator-allowed-modes' properties it appears that the binding example with its four-spaces indentation (corresponding to a single tab, which is still to little) was copied verbatim. Drop the unnecessary first line break after 'regulator-allowed-modes' properties and indent the single remaining continuation line properly. Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20221116102054.4673-3-johan+linaro@kernel.org --- arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 20 ++++++++------------ arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 20 ++++++++------------ arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 10 ++++------ .../boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts | 10 ++++------ arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 10 ++++------ .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 10 ++++------ arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 10 ++++------ arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 20 ++++++++------------ 8 files changed, 44 insertions(+), 66 deletions(-) (limited to 'arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi') diff --git a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts index 01ac460d910e..952acfc04adc 100644 --- a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts +++ b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts @@ -136,9 +136,8 @@ regulator-max-microvolt = <880000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l7a_1p8: ldo7 { @@ -154,9 +153,8 @@ regulator-max-microvolt = <2960000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l11a_0p8: ldo11 { @@ -263,9 +261,8 @@ regulator-max-microvolt = <1200000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l7c_1p8: ldo7 { @@ -281,9 +278,8 @@ regulator-max-microvolt = <1200000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l10c_3p3: ldo10 { diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts index e9830e72dc6c..84cb6f3eeb56 100644 --- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts +++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts @@ -90,9 +90,8 @@ regulator-max-microvolt = <1200000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l4c: ldo4 { @@ -108,9 +107,8 @@ regulator-max-microvolt = <1200000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l7c: ldo7 { @@ -126,9 +124,8 @@ regulator-max-microvolt = <2504000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l17c: ldo17 { @@ -137,9 +134,8 @@ regulator-max-microvolt = <2504000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; }; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index f09810e3d956..551768f97729 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -170,9 +170,8 @@ regulator-max-microvolt = <2504000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l13c: ldo13 { @@ -195,9 +194,8 @@ regulator-max-microvolt = <1200000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l4d: ldo4 { diff --git a/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts b/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts index 20f35623d1ef..94f77d376662 100644 --- a/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts +++ b/arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts @@ -231,9 +231,8 @@ regulator-max-microvolt = <2950000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; @@ -254,9 +253,8 @@ regulator-max-microvolt = <2960000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts index 1cb14051ab1b..c456e9594ea5 100644 --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts @@ -282,9 +282,8 @@ regulator-max-microvolt = <2950000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l7e: ldo7 { @@ -304,9 +303,8 @@ regulator-max-microvolt = <2960000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l10e: ldo10 { diff --git a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi index fb6e5a140c9f..c958a8b16730 100644 --- a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi @@ -348,9 +348,8 @@ regulator-max-microvolt = <2960000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l7c_3p0: ldo7 { @@ -370,9 +369,8 @@ regulator-max-microvolt = <2960000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l10c_3p3: ldo10 { diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi index 2a223ed50102..38746f248969 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi @@ -317,9 +317,8 @@ regulator-max-microvolt = <2960000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l7c_2p85: ldo7 { @@ -342,9 +341,8 @@ regulator-max-microvolt = <2960000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l10c_3p3: ldo10 { diff --git a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts index 69ae6503c2f6..26a608144886 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts @@ -107,9 +107,8 @@ regulator-max-microvolt = <888000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l6b_1p2: ldo6 { @@ -118,9 +117,8 @@ regulator-max-microvolt = <1208000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l7b_2p96: ldo7 { @@ -129,9 +127,8 @@ regulator-max-microvolt = <2504000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; vreg_l9b_1p2: ldo9 { @@ -140,9 +137,8 @@ regulator-max-microvolt = <1200000>; regulator-initial-mode = ; regulator-allow-set-load; - regulator-allowed-modes = - ; + regulator-allowed-modes = ; }; }; -- cgit v1.2.3 From afa8e18bf674f00c8c3a73e295ff2f6aacdad82a Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Sun, 4 Dec 2022 10:44:38 +0100 Subject: arm64: dts: qcom: sm8250-sony-xperia-edo: fix no-mmc property for SDHCI There is no "no-emmc" property, so intention for SD/SDIO only nodes was to use "no-mmc": qcom/sm8250-sony-xperia-edo-pdx206.dtb: mmc@8804000: Unevaluated properties are not allowed ('no-emmc' was unexpected) Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20221204094438.73288-6-krzysztof.kozlowski@linaro.org --- arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi') diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi index 38746f248969..09a31f707639 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi @@ -585,7 +585,7 @@ vqmmc-supply = <&vreg_l6c_2p9>; bus-width = <4>; no-sdio; - no-emmc; + no-mmc; }; &slpi { -- cgit v1.2.3