| Message ID | 20210105122649.13581-19-manivannan.sadhasivam@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Devicetree update for SDX55 platform | expand |
On Tue 05 Jan 06:26 CST 2021, Manivannan Sadhasivam wrote: > From: Vinod Koul <vkoul@kernel.org> > > This adds the regulators found on SDX55 MTP. > > Signed-off-by: Vinod Koul <vkoul@kernel.org> > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- > arch/arm/boot/dts/qcom-sdx55-mtp.dts | 179 +++++++++++++++++++++++++++ > 1 file changed, 179 insertions(+) > > diff --git a/arch/arm/boot/dts/qcom-sdx55-mtp.dts b/arch/arm/boot/dts/qcom-sdx55-mtp.dts > index 825cc7d0ba18..61e7d5d4bd48 100644 > --- a/arch/arm/boot/dts/qcom-sdx55-mtp.dts > +++ b/arch/arm/boot/dts/qcom-sdx55-mtp.dts > @@ -6,6 +6,7 @@ > > /dts-v1/; > > +#include <dt-bindings/regulator/qcom,rpmh-regulator.h> > #include "qcom-sdx55.dtsi" > #include <arm64/qcom/pm8150b.dtsi> > #include "qcom-pmx55.dtsi" > @@ -22,6 +23,184 @@ aliases { > chosen { > stdout-path = "serial0:115200n8"; > }; > + > + vph_pwr: vph-pwr-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "vph_pwr"; > + regulator-min-microvolt = <3700000>; > + regulator-max-microvolt = <3700000>; > + }; > + > + vreg_bob_3p3: pmx55-bob { > + compatible = "regulator-fixed"; > + regulator-name = "vreg_bob_3p3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + > + regulator-always-on; > + regulator-boot-on; > + > + vin-supply = <&vph_pwr>; > + }; > + > + vreg_s7e_mx_0p752: pmx55-s7e { > + compatible = "regulator-fixed"; > + regulator-name = "vreg_s7e_mx_0p752"; > + regulator-min-microvolt = <752000>; > + regulator-max-microvolt = <752000>; > + > + vin-supply = <&vph_pwr>; > + }; > + > + vreg_vddpx_2: vddpx-2 { Isn't this the name of the pad on the SoC, i.e. the consumer? Does the regulator output have a more suitable name? I don't see any references to this node and you got it "boot-on", what happens when the regulator core tuns it off? Or this isn't an issue until we actually try to support sdhci (guessing based on the voltages)? Regards, Bjorn > + compatible = "regulator-gpio"; > + regulator-name = "vreg_vddpx_2"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <2850000>; > + enable-gpios = <&tlmm 98 GPIO_ACTIVE_HIGH>; > + gpios = <&tlmm 100 GPIO_ACTIVE_HIGH>; > + states = <1800000 0>, <2850000 1>; > + startup-delay-us = <200000>; > + enable-active-high; > + regulator-boot-on; > + > + vin-supply = <&vph_pwr>; > + }; > +}; > + > +&apps_rsc { > + pmx55-rpmh-regulators { > + compatible = "qcom,pmx55-rpmh-regulators"; > + qcom,pmic-id = "e"; > + > + vdd-s1-supply = <&vph_pwr>; > + vdd-s2-supply = <&vph_pwr>; > + vdd-s3-supply = <&vph_pwr>; > + vdd-s4-supply = <&vph_pwr>; > + vdd-s5-supply = <&vph_pwr>; > + vdd-s6-supply = <&vph_pwr>; > + vdd-s7-supply = <&vph_pwr>; > + vdd-l1-l2-supply = <&vreg_s2e_1p224>; > + vdd-l3-l9-supply = <&vreg_s3e_0p824>; > + vdd-l4-l12-supply = <&vreg_s4e_1p904>; > + vdd-l5-l6-supply = <&vreg_s4e_1p904>; > + vdd-l7-l8-supply = <&vreg_s3e_0p824>; > + vdd-l10-l11-l13-supply = <&vreg_bob_3p3>; > + vdd-l14-supply = <&vreg_s7e_mx_0p752>; > + vdd-l15-supply = <&vreg_s2e_1p224>; > + vdd-l16-supply = <&vreg_s4e_1p904>; > + > + vreg_s2e_1p224: smps2 { > + regulator-min-microvolt = <1280000>; > + regulator-max-microvolt = <1400000>; > + }; > + > + vreg_s3e_0p824: smps3 { > + regulator-min-microvolt = <800000>; > + regulator-max-microvolt = <1000000>; > + }; > + > + vreg_s4e_1p904: smps4 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1960000>; > + }; > + > + ldo1 { > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo2 { > + regulator-min-microvolt = <1128000>; > + regulator-max-microvolt = <1128000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo3 { > + regulator-min-microvolt = <800000>; > + regulator-max-microvolt = <800000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo4 { > + regulator-min-microvolt = <872000>; > + regulator-max-microvolt = <872000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo5 { > + regulator-min-microvolt = <1704000>; > + regulator-max-microvolt = <1900000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo6 { > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo7 { > + regulator-min-microvolt = <480000>; > + regulator-max-microvolt = <900000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo8 { > + regulator-min-microvolt = <480000>; > + regulator-max-microvolt = <900000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo9 { > + regulator-min-microvolt = <800000>; > + regulator-max-microvolt = <800000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo10 { > + regulator-min-microvolt = <3088000>; > + regulator-max-microvolt = <3088000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo11 { > + regulator-min-microvolt = <1704000>; > + regulator-max-microvolt = <2928000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo12 { > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo13 { > + regulator-min-microvolt = <1704000>; > + regulator-max-microvolt = <2928000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo14 { > + regulator-min-microvolt = <600000>; > + regulator-max-microvolt = <800000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo15 { > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + > + ldo16 { > + regulator-min-microvolt = <1704000>; > + regulator-max-microvolt = <1904000>; > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > + }; > + }; > }; > > &blsp1_uart3 { > -- > 2.25.1 >
On Tue, Jan 05, 2021 at 12:16:11PM -0600, Bjorn Andersson wrote: > On Tue 05 Jan 06:26 CST 2021, Manivannan Sadhasivam wrote: > > > From: Vinod Koul <vkoul@kernel.org> > > > > This adds the regulators found on SDX55 MTP. > > > > Signed-off-by: Vinod Koul <vkoul@kernel.org> > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > --- > > arch/arm/boot/dts/qcom-sdx55-mtp.dts | 179 +++++++++++++++++++++++++++ > > 1 file changed, 179 insertions(+) > > > > diff --git a/arch/arm/boot/dts/qcom-sdx55-mtp.dts b/arch/arm/boot/dts/qcom-sdx55-mtp.dts > > index 825cc7d0ba18..61e7d5d4bd48 100644 > > --- a/arch/arm/boot/dts/qcom-sdx55-mtp.dts > > +++ b/arch/arm/boot/dts/qcom-sdx55-mtp.dts > > @@ -6,6 +6,7 @@ > > > > /dts-v1/; > > > > +#include <dt-bindings/regulator/qcom,rpmh-regulator.h> > > #include "qcom-sdx55.dtsi" > > #include <arm64/qcom/pm8150b.dtsi> > > #include "qcom-pmx55.dtsi" > > @@ -22,6 +23,184 @@ aliases { > > chosen { > > stdout-path = "serial0:115200n8"; > > }; > > + > > + vph_pwr: vph-pwr-regulator { > > + compatible = "regulator-fixed"; > > + regulator-name = "vph_pwr"; > > + regulator-min-microvolt = <3700000>; > > + regulator-max-microvolt = <3700000>; > > + }; > > + > > + vreg_bob_3p3: pmx55-bob { > > + compatible = "regulator-fixed"; > > + regulator-name = "vreg_bob_3p3"; > > + regulator-min-microvolt = <3300000>; > > + regulator-max-microvolt = <3300000>; > > + > > + regulator-always-on; > > + regulator-boot-on; > > + > > + vin-supply = <&vph_pwr>; > > + }; > > + > > + vreg_s7e_mx_0p752: pmx55-s7e { > > + compatible = "regulator-fixed"; > > + regulator-name = "vreg_s7e_mx_0p752"; > > + regulator-min-microvolt = <752000>; > > + regulator-max-microvolt = <752000>; > > + > > + vin-supply = <&vph_pwr>; > > + }; > > + > > + vreg_vddpx_2: vddpx-2 { > > Isn't this the name of the pad on the SoC, i.e. the consumer? Does the > regulator output have a more suitable name? > The reference is from the downstream dts. > I don't see any references to this node and you got it "boot-on", what > happens when the regulator core tuns it off? Or this isn't an issue > until we actually try to support sdhci (guessing based on the voltages)? > I think we can ignore this regulator since there is no SDHCI support in MTP. Thanks, Mani > Regards, > Bjorn > > > + compatible = "regulator-gpio"; > > + regulator-name = "vreg_vddpx_2"; > > + regulator-min-microvolt = <1800000>; > > + regulator-max-microvolt = <2850000>; > > + enable-gpios = <&tlmm 98 GPIO_ACTIVE_HIGH>; > > + gpios = <&tlmm 100 GPIO_ACTIVE_HIGH>; > > + states = <1800000 0>, <2850000 1>; > > + startup-delay-us = <200000>; > > + enable-active-high; > > + regulator-boot-on; > > + > > + vin-supply = <&vph_pwr>; > > + }; > > +}; > > + > > +&apps_rsc { > > + pmx55-rpmh-regulators { > > + compatible = "qcom,pmx55-rpmh-regulators"; > > + qcom,pmic-id = "e"; > > + > > + vdd-s1-supply = <&vph_pwr>; > > + vdd-s2-supply = <&vph_pwr>; > > + vdd-s3-supply = <&vph_pwr>; > > + vdd-s4-supply = <&vph_pwr>; > > + vdd-s5-supply = <&vph_pwr>; > > + vdd-s6-supply = <&vph_pwr>; > > + vdd-s7-supply = <&vph_pwr>; > > + vdd-l1-l2-supply = <&vreg_s2e_1p224>; > > + vdd-l3-l9-supply = <&vreg_s3e_0p824>; > > + vdd-l4-l12-supply = <&vreg_s4e_1p904>; > > + vdd-l5-l6-supply = <&vreg_s4e_1p904>; > > + vdd-l7-l8-supply = <&vreg_s3e_0p824>; > > + vdd-l10-l11-l13-supply = <&vreg_bob_3p3>; > > + vdd-l14-supply = <&vreg_s7e_mx_0p752>; > > + vdd-l15-supply = <&vreg_s2e_1p224>; > > + vdd-l16-supply = <&vreg_s4e_1p904>; > > + > > + vreg_s2e_1p224: smps2 { > > + regulator-min-microvolt = <1280000>; > > + regulator-max-microvolt = <1400000>; > > + }; > > + > > + vreg_s3e_0p824: smps3 { > > + regulator-min-microvolt = <800000>; > > + regulator-max-microvolt = <1000000>; > > + }; > > + > > + vreg_s4e_1p904: smps4 { > > + regulator-min-microvolt = <1800000>; > > + regulator-max-microvolt = <1960000>; > > + }; > > + > > + ldo1 { > > + regulator-min-microvolt = <1200000>; > > + regulator-max-microvolt = <1200000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo2 { > > + regulator-min-microvolt = <1128000>; > > + regulator-max-microvolt = <1128000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo3 { > > + regulator-min-microvolt = <800000>; > > + regulator-max-microvolt = <800000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo4 { > > + regulator-min-microvolt = <872000>; > > + regulator-max-microvolt = <872000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo5 { > > + regulator-min-microvolt = <1704000>; > > + regulator-max-microvolt = <1900000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo6 { > > + regulator-min-microvolt = <1800000>; > > + regulator-max-microvolt = <1800000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo7 { > > + regulator-min-microvolt = <480000>; > > + regulator-max-microvolt = <900000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo8 { > > + regulator-min-microvolt = <480000>; > > + regulator-max-microvolt = <900000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo9 { > > + regulator-min-microvolt = <800000>; > > + regulator-max-microvolt = <800000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo10 { > > + regulator-min-microvolt = <3088000>; > > + regulator-max-microvolt = <3088000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo11 { > > + regulator-min-microvolt = <1704000>; > > + regulator-max-microvolt = <2928000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo12 { > > + regulator-min-microvolt = <1200000>; > > + regulator-max-microvolt = <1200000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo13 { > > + regulator-min-microvolt = <1704000>; > > + regulator-max-microvolt = <2928000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo14 { > > + regulator-min-microvolt = <600000>; > > + regulator-max-microvolt = <800000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo15 { > > + regulator-min-microvolt = <1200000>; > > + regulator-max-microvolt = <1200000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + > > + ldo16 { > > + regulator-min-microvolt = <1704000>; > > + regulator-max-microvolt = <1904000>; > > + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; > > + }; > > + }; > > }; > > > > &blsp1_uart3 { > > -- > > 2.25.1 > >
diff --git a/arch/arm/boot/dts/qcom-sdx55-mtp.dts b/arch/arm/boot/dts/qcom-sdx55-mtp.dts index 825cc7d0ba18..61e7d5d4bd48 100644 --- a/arch/arm/boot/dts/qcom-sdx55-mtp.dts +++ b/arch/arm/boot/dts/qcom-sdx55-mtp.dts @@ -6,6 +6,7 @@ /dts-v1/; +#include <dt-bindings/regulator/qcom,rpmh-regulator.h> #include "qcom-sdx55.dtsi" #include <arm64/qcom/pm8150b.dtsi> #include "qcom-pmx55.dtsi" @@ -22,6 +23,184 @@ aliases { chosen { stdout-path = "serial0:115200n8"; }; + + vph_pwr: vph-pwr-regulator { + compatible = "regulator-fixed"; + regulator-name = "vph_pwr"; + regulator-min-microvolt = <3700000>; + regulator-max-microvolt = <3700000>; + }; + + vreg_bob_3p3: pmx55-bob { + compatible = "regulator-fixed"; + regulator-name = "vreg_bob_3p3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + regulator-always-on; + regulator-boot-on; + + vin-supply = <&vph_pwr>; + }; + + vreg_s7e_mx_0p752: pmx55-s7e { + compatible = "regulator-fixed"; + regulator-name = "vreg_s7e_mx_0p752"; + regulator-min-microvolt = <752000>; + regulator-max-microvolt = <752000>; + + vin-supply = <&vph_pwr>; + }; + + vreg_vddpx_2: vddpx-2 { + compatible = "regulator-gpio"; + regulator-name = "vreg_vddpx_2"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2850000>; + enable-gpios = <&tlmm 98 GPIO_ACTIVE_HIGH>; + gpios = <&tlmm 100 GPIO_ACTIVE_HIGH>; + states = <1800000 0>, <2850000 1>; + startup-delay-us = <200000>; + enable-active-high; + regulator-boot-on; + + vin-supply = <&vph_pwr>; + }; +}; + +&apps_rsc { + pmx55-rpmh-regulators { + compatible = "qcom,pmx55-rpmh-regulators"; + qcom,pmic-id = "e"; + + vdd-s1-supply = <&vph_pwr>; + vdd-s2-supply = <&vph_pwr>; + vdd-s3-supply = <&vph_pwr>; + vdd-s4-supply = <&vph_pwr>; + vdd-s5-supply = <&vph_pwr>; + vdd-s6-supply = <&vph_pwr>; + vdd-s7-supply = <&vph_pwr>; + vdd-l1-l2-supply = <&vreg_s2e_1p224>; + vdd-l3-l9-supply = <&vreg_s3e_0p824>; + vdd-l4-l12-supply = <&vreg_s4e_1p904>; + vdd-l5-l6-supply = <&vreg_s4e_1p904>; + vdd-l7-l8-supply = <&vreg_s3e_0p824>; + vdd-l10-l11-l13-supply = <&vreg_bob_3p3>; + vdd-l14-supply = <&vreg_s7e_mx_0p752>; + vdd-l15-supply = <&vreg_s2e_1p224>; + vdd-l16-supply = <&vreg_s4e_1p904>; + + vreg_s2e_1p224: smps2 { + regulator-min-microvolt = <1280000>; + regulator-max-microvolt = <1400000>; + }; + + vreg_s3e_0p824: smps3 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1000000>; + }; + + vreg_s4e_1p904: smps4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1960000>; + }; + + ldo1 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo2 { + regulator-min-microvolt = <1128000>; + regulator-max-microvolt = <1128000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo3 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <800000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo4 { + regulator-min-microvolt = <872000>; + regulator-max-microvolt = <872000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo5 { + regulator-min-microvolt = <1704000>; + regulator-max-microvolt = <1900000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo7 { + regulator-min-microvolt = <480000>; + regulator-max-microvolt = <900000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo8 { + regulator-min-microvolt = <480000>; + regulator-max-microvolt = <900000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo9 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <800000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo10 { + regulator-min-microvolt = <3088000>; + regulator-max-microvolt = <3088000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo11 { + regulator-min-microvolt = <1704000>; + regulator-max-microvolt = <2928000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo12 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo13 { + regulator-min-microvolt = <1704000>; + regulator-max-microvolt = <2928000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo14 { + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <800000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo15 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + + ldo16 { + regulator-min-microvolt = <1704000>; + regulator-max-microvolt = <1904000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_LPM>; + }; + }; }; &blsp1_uart3 {