On 27.06.2023 03:24, Dmitry Baryshkov wrote:
> The set of regulators available over the RPM requests is not a property
> of the SoC. Move them to board files.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> .../boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 136 ++++++++++++++++++
> arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 134 -----------------
> 2 files changed, 136 insertions(+), 134 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
> index cc264861afe5..1e1c66c7f9d2 100644
> --- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
> @@ -130,6 +130,142 @@ &gsbi5_serial {
> pinctrl-names = "default";
> };
>
> +&rpm {
> + regulators {
> + compatible = "qcom,rpm-pm8018-regulators";
> +
> + vin_lvs1-supply = <&pm8018_s3>;
> +
> + vdd_l7-supply = <&pm8018_s4>;
> + vdd_l8-supply = <&pm8018_s3>;
> + vdd_l9_l10_l11_l12-supply = <&pm8018_s5>;
> +
> + /* Buck SMPS */
> + pm8018_s1: s1 {
> + regulator-min-microvolt = <500000>;
> + regulator-max-microvolt = <1150000>;
> + qcom,switch-mode-frequency = <1600000>;
> + bias-pull-down;
> + };
> +
> + pm8018_s2: s2 {
> + regulator-min-microvolt = <1225000>;
> + regulator-max-microvolt = <1300000>;
> + qcom,switch-mode-frequency = <1600000>;
> + bias-pull-down;
> + };
> +
> + pm8018_s3: s3 {
> + regulator-always-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + qcom,switch-mode-frequency = <1600000>;
> + bias-pull-down;
> + };
> +
> + pm8018_s4: s4 {
> + regulator-min-microvolt = <2100000>;
> + regulator-max-microvolt = <2200000>;
> + qcom,switch-mode-frequency = <1600000>;
> + bias-pull-down;
> + };
> +
> + pm8018_s5: s5 {
> + regulator-always-on;
> + regulator-min-microvolt = <1350000>;
> + regulator-max-microvolt = <1350000>;
> + qcom,switch-mode-frequency = <1600000>;
> + bias-pull-down;
> + };
> +
> + /* PMOS LDO */
> + pm8018_l2: l2 {
> + regulator-always-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l3: l3 {
> + regulator-always-on;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l4: l4 {
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l5: l5 {
> + regulator-min-microvolt = <2850000>;
> + regulator-max-microvolt = <2850000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l6: l6 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <2850000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l7: l7 {
> + regulator-min-microvolt = <1850000>;
> + regulator-max-microvolt = <1900000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l8: l8 {
> + regulator-min-microvolt = <1200000>;
> + regulator-max-microvolt = <1200000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l9: l9 {
> + regulator-min-microvolt = <750000>;
> + regulator-max-microvolt = <1150000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l10: l10 {
> + regulator-min-microvolt = <1050000>;
> + regulator-max-microvolt = <1050000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l11: l11 {
> + regulator-min-microvolt = <1050000>;
> + regulator-max-microvolt = <1050000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l12: l12 {
> + regulator-min-microvolt = <1050000>;
> + regulator-max-microvolt = <1050000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l13: l13 {
> + regulator-min-microvolt = <1850000>;
> + regulator-max-microvolt = <2950000>;
> + bias-pull-down;
> + };
> +
> + pm8018_l14: l14 {
> + regulator-min-microvolt = <2850000>;
> + regulator-max-microvolt = <2850000>;
> + bias-pull-down;
> + };
> +
> + /* Low Voltage Switch */
> + pm8018_lvs1: lvs1 {
> + bias-pull-down;
> + };
> + };
> +};
> +
> &sdcc1 {
> status = "okay";
> };
> diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
> index ac2327bc4ec5..0a8240f72daa 100644
> --- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
> @@ -326,140 +326,6 @@ rpm: rpm@108000 {
> <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
> <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>;
> interrupt-names = "ack", "err", "wakeup";
> -
> - regulators {
> - compatible = "qcom,rpm-pm8018-regulators";
> -
> - vin_lvs1-supply = <&pm8018_s3>;
> -
> - vdd_l7-supply = <&pm8018_s4>;
> - vdd_l8-supply = <&pm8018_s3>;
> - vdd_l9_l10_l11_l12-supply = <&pm8018_s5>;
> -
> - /* Buck SMPS */
> - pm8018_s1: s1 {
> - regulator-min-microvolt = <500000>;
> - regulator-max-microvolt = <1150000>;
> - qcom,switch-mode-frequency = <1600000>;
> - bias-pull-down;
> - };
> -
> - pm8018_s2: s2 {
> - regulator-min-microvolt = <1225000>;
> - regulator-max-microvolt = <1300000>;
> - qcom,switch-mode-frequency = <1600000>;
> - bias-pull-down;
> - };
> -
> - pm8018_s3: s3 {
> - regulator-always-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - qcom,switch-mode-frequency = <1600000>;
> - bias-pull-down;
> - };
> -
> - pm8018_s4: s4 {
> - regulator-min-microvolt = <2100000>;
> - regulator-max-microvolt = <2200000>;
> - qcom,switch-mode-frequency = <1600000>;
> - bias-pull-down;
> - };
> -
> - pm8018_s5: s5 {
> - regulator-always-on;
> - regulator-min-microvolt = <1350000>;
> - regulator-max-microvolt = <1350000>;
> - qcom,switch-mode-frequency = <1600000>;
> - bias-pull-down;
> - };
> -
> - /* PMOS LDO */
> - pm8018_l2: l2 {
> - regulator-always-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l3: l3 {
> - regulator-always-on;
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <1800000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l4: l4 {
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l5: l5 {
> - regulator-min-microvolt = <2850000>;
> - regulator-max-microvolt = <2850000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l6: l6 {
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <2850000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l7: l7 {
> - regulator-min-microvolt = <1850000>;
> - regulator-max-microvolt = <1900000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l8: l8 {
> - regulator-min-microvolt = <1200000>;
> - regulator-max-microvolt = <1200000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l9: l9 {
> - regulator-min-microvolt = <750000>;
> - regulator-max-microvolt = <1150000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l10: l10 {
> - regulator-min-microvolt = <1050000>;
> - regulator-max-microvolt = <1050000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l11: l11 {
> - regulator-min-microvolt = <1050000>;
> - regulator-max-microvolt = <1050000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l12: l12 {
> - regulator-min-microvolt = <1050000>;
> - regulator-max-microvolt = <1050000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l13: l13 {
> - regulator-min-microvolt = <1850000>;
> - regulator-max-microvolt = <2950000>;
> - bias-pull-down;
> - };
> -
> - pm8018_l14: l14 {
> - regulator-min-microvolt = <2850000>;
> - regulator-max-microvolt = <2850000>;
> - bias-pull-down;
> - };
> -
> - /* Low Voltage Switch */
> - pm8018_lvs1: lvs1 {
> - bias-pull-down;
> - };
> - };
> };
> };
> };
