arm64: dts: qcom: msm8916-pm8916: Stop using s1/l3 as regulators

s1 (VDDCX) and l3 (VDDMX) are now managed by rpmpd as power domains.
This allows us to vote for voltage corners instead of voting for raw
voltages. But we cannot manage these as regulator and power domain at
the same time: The votes by rpmpd would conflict with the ones from
the regulator driver.

All users of these regulators have been converted to power domains.
Make sure that no new users are added by removing s1 and l3 from
the regulator definitions.

This also allows us to remove the arbitrary voltage constraints
we have been using for these regulators. Not all of the voltages
listed there would actually have been safe for the boards.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20200916104135.25085-11-stephan@gerhold.net
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
index 3c7f975393904f951413d16df56d430eb64ec4db..3a9538e1ec9735cac484dfe73ae21f7aab7e084f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
@@ -417,11 +417,6 @@
        vdd_l4_l5_l6-supply = <&pm8916_s4>;
        vdd_l7-supply = <&pm8916_s4>;
 
-       s1 {
-               regulator-min-microvolt = <375000>;
-               regulator-max-microvolt = <1562000>;
-       };
-
        s3 {
                regulator-min-microvolt = <375000>;
                regulator-max-microvolt = <1562000>;
@@ -445,11 +440,6 @@
                regulator-max-microvolt = <1200000>;
        };
 
-       l3 {
-               regulator-min-microvolt = <375000>;
-               regulator-max-microvolt = <1525000>;
-       };
-
        l4 {
                regulator-min-microvolt = <1750000>;
                regulator-max-microvolt = <3337000>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index b9d3c5d98dd09eb83a6894fdace9e466fdd6b86d..2c204d535d66b5dca210cb7a558b5b3383058ac9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -98,11 +98,6 @@
        vdd_l4_l5_l6-supply = <&pm8916_s4>;
        vdd_l7-supply = <&pm8916_s4>;
 
-       s1 {
-               regulator-min-microvolt = <500000>;
-               regulator-max-microvolt = <1300000>;
-       };
-
        s3 {
                regulator-min-microvolt = <1200000>;
                regulator-max-microvolt = <1300000>;
@@ -123,11 +118,6 @@
                regulator-max-microvolt = <1200000>;
        };
 
-       l3 {
-               regulator-min-microvolt = <500000>;
-               regulator-max-microvolt = <1287500>;
-       };
-
        l4 {
                regulator-min-microvolt = <2050000>;
                regulator-max-microvolt = <2050000>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
index 513e433aa5f355f48899d721d1ab2f569938b46b..539823b2c36ec467e2dfee9638ca3f512120ee44 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
@@ -50,13 +50,13 @@
        smd_rpm_regulators: pm8916-regulators {
                compatible = "qcom,rpm-pm8916-regulators";
 
-               pm8916_s1: s1 {};
+               /* pm8916_s1 is managed by rpmpd (MSM8916_VDDCX) */
                pm8916_s3: s3 {};
                pm8916_s4: s4 {};
 
                pm8916_l1: l1 {};
                pm8916_l2: l2 {};
-               pm8916_l3: l3 {};
+               /* pm8916_l3 is managed by rpmpd (MSM8916_VDDMX) */
                pm8916_l4: l4 {};
                pm8916_l5: l5 {};
                pm8916_l6: l6 {};

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index b18d21e42f596c558a73cac2e3909a0fad4fd9eb..0b0dfd3059debac12a9ea85e6c587f1ec12fc158 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -164,11 +164,6 @@
        vdd_l4_l5_l6-supply = <&pm8916_s4>;
        vdd_l7-supply = <&pm8916_s4>;
 
-       s1 {
-               regulator-min-microvolt = <500000>;
-               regulator-max-microvolt = <1300000>;
-       };
-
        s3 {
                regulator-min-microvolt = <1200000>;
                regulator-max-microvolt = <1300000>;
@@ -189,11 +184,6 @@
                regulator-max-microvolt = <1200000>;
        };
 
-       l3 {
-               regulator-min-microvolt = <500000>;
-               regulator-max-microvolt = <1287500>;
-       };
-
        l4 {
                regulator-min-microvolt = <2050000>;
                regulator-max-microvolt = <2050000>;