On 2.07.2023 15:43, Dmitry Baryshkov wrote:
> The vph-pwr and boost regulators (even if they are unified by design)
> are not a property of SoC, so move them to board files.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> .../dts/qcom/qcom-apq8074-dragonboard.dts | 27 +++++++++++++++++++
> .../qcom-msm8974-lge-nexus5-hammerhead.dts | 27 +++++++++++++++++++
> .../qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 27 +++++++++++++++++++
> arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 27 -------------------
> .../qcom/qcom-msm8974pro-fairphone-fp2.dts | 27 +++++++++++++++++++
> .../qcom/qcom-msm8974pro-oneplus-bacon.dts | 27 +++++++++++++++++++
> .../dts/qcom/qcom-msm8974pro-samsung-klte.dts | 10 ++++++-
> ...-msm8974pro-sony-xperia-shinano-castor.dts | 27 +++++++++++++++++++
> 8 files changed, 171 insertions(+), 28 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
> index 5a8af16bf02d..3e5311e7196e 100644
> --- a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
> @@ -49,6 +49,33 @@ mpss_region: mpss@ac00000 {
> no-map;
> };
> };
> +
> + vreg_boost: vreg-boost {
> + compatible = "regulator-fixed";
> +
> + regulator-name = "vreg-boost";
> + regulator-min-microvolt = <3150000>;
> + regulator-max-microvolt = <3150000>;
> +
> + regulator-always-on;
> + regulator-boot-on;
> +
> + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&boost_bypass_n_pin>;
> + };
> +
> + vreg_vph_pwr: vreg-vph-pwr {
> + compatible = "regulator-fixed";
> + regulator-name = "vph-pwr";
> +
> + regulator-min-microvolt = <3600000>;
> + regulator-max-microvolt = <3600000>;
> +
> + regulator-always-on;
> + };
> };
>
> &blsp1_uart2 {
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
> index da99f770d4f5..ca402b4a68bd 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
> @@ -60,6 +60,33 @@ vibrator {
> enable-gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>;
> };
>
> + vreg_boost: vreg-boost {
> + compatible = "regulator-fixed";
> +
> + regulator-name = "vreg-boost";
> + regulator-min-microvolt = <3150000>;
> + regulator-max-microvolt = <3150000>;
> +
> + regulator-always-on;
> + regulator-boot-on;
> +
> + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&boost_bypass_n_pin>;
> + };
> +
> + vreg_vph_pwr: vreg-vph-pwr {
> + compatible = "regulator-fixed";
> + regulator-name = "vph-pwr";
> +
> + regulator-min-microvolt = <3600000>;
> + regulator-max-microvolt = <3600000>;
> +
> + regulator-always-on;
> + };
> +
> vreg_wlan: wlan-regulator {
> compatible = "regulator-fixed";
>
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
> index 23ae474698aa..a43341ae4495 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
> @@ -65,6 +65,33 @@ ramoops@3e8e0000 {
> pmsg-size = <0x80000>;
> };
> };
> +
> + vreg_boost: vreg-boost {
> + compatible = "regulator-fixed";
> +
> + regulator-name = "vreg-boost";
> + regulator-min-microvolt = <3150000>;
> + regulator-max-microvolt = <3150000>;
> +
> + regulator-always-on;
> + regulator-boot-on;
> +
> + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&boost_bypass_n_pin>;
> + };
> +
> + vreg_vph_pwr: vreg-vph-pwr {
> + compatible = "regulator-fixed";
> + regulator-name = "vph-pwr";
> +
> + regulator-min-microvolt = <3600000>;
> + regulator-max-microvolt = <3600000>;
> +
> + regulator-always-on;
> + };
> };
>
> &blsp1_i2c2 {
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
> index aeca504918a0..a4ff1fe63903 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
> @@ -2376,31 +2376,4 @@ timer {
> <GIC_PPI 1 0xf08>;
> clock-frequency = <19200000>;
> };
> -
> - vreg_boost: vreg-boost {
> - compatible = "regulator-fixed";
> -
> - regulator-name = "vreg-boost";
> - regulator-min-microvolt = <3150000>;
> - regulator-max-microvolt = <3150000>;
> -
> - regulator-always-on;
> - regulator-boot-on;
> -
> - gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> - enable-active-high;
> -
> - pinctrl-names = "default";
> - pinctrl-0 = <&boost_bypass_n_pin>;
> - };
> -
> - vreg_vph_pwr: vreg-vph-pwr {
> - compatible = "regulator-fixed";
> - regulator-name = "vph-pwr";
> -
> - regulator-min-microvolt = <3600000>;
> - regulator-max-microvolt = <3600000>;
> -
> - regulator-always-on;
> - };
> };
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
> index 24f9521a0be6..9cbdfe62051e 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
> @@ -57,6 +57,33 @@ vibrator {
> enable-gpios = <&tlmm 86 GPIO_ACTIVE_HIGH>;
> vcc-supply = <&pm8941_l18>;
> };
> +
> + vreg_boost: vreg-boost {
> + compatible = "regulator-fixed";
> +
> + regulator-name = "vreg-boost";
> + regulator-min-microvolt = <3150000>;
> + regulator-max-microvolt = <3150000>;
> +
> + regulator-always-on;
> + regulator-boot-on;
> +
> + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&boost_bypass_n_pin>;
> + };
> +
> + vreg_vph_pwr: vreg-vph-pwr {
> + compatible = "regulator-fixed";
> + regulator-name = "vph-pwr";
> +
> + regulator-min-microvolt = <3600000>;
> + regulator-max-microvolt = <3600000>;
> +
> + regulator-always-on;
> + };
> };
>
> &blsp1_i2c2 {
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
> index c0ca264d8140..6d1412aec45a 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
> @@ -51,6 +51,33 @@ event-hall-sensor {
> debounce-interval = <150>;
> };
> };
> +
> + vreg_boost: vreg-boost {
> + compatible = "regulator-fixed";
> +
> + regulator-name = "vreg-boost";
> + regulator-min-microvolt = <3150000>;
> + regulator-max-microvolt = <3150000>;
> +
> + regulator-always-on;
> + regulator-boot-on;
> +
> + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&boost_bypass_n_pin>;
> + };
> +
> + vreg_vph_pwr: vreg-vph-pwr {
> + compatible = "regulator-fixed";
> + regulator-name = "vph-pwr";
> +
> + regulator-min-microvolt = <3600000>;
> + regulator-max-microvolt = <3600000>;
> +
> + regulator-always-on;
> + };
> };
>
> &blsp1_i2c1 {
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts
> index 325feb89b343..ca3aa16b4b10 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts
> @@ -155,7 +155,15 @@ vreg_panel: panel-regulator {
> enable-active-high;
> };
>
> - /delete-node/ vreg-boost;
> + vreg_vph_pwr: vreg-vph-pwr {
> + compatible = "regulator-fixed";
> + regulator-name = "vph-pwr";
> +
> + regulator-min-microvolt = <3600000>;
> + regulator-max-microvolt = <3600000>;
> +
> + regulator-always-on;
> + };
> };
>
> &blsp1_i2c2 {
> diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> index efe21289c9fe..b76d51b1b667 100644
> --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> @@ -84,6 +84,33 @@ vreg_vsp: lcd-dcdc-regulator {
> pinctrl-0 = <&lcd_dcdc_en_pin_a>;
> };
>
> + vreg_boost: vreg-boost {
> + compatible = "regulator-fixed";
> +
> + regulator-name = "vreg-boost";
> + regulator-min-microvolt = <3150000>;
> + regulator-max-microvolt = <3150000>;
> +
> + regulator-always-on;
> + regulator-boot-on;
> +
> + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&boost_bypass_n_pin>;
> + };
> +
> + vreg_vph_pwr: vreg-vph-pwr {
> + compatible = "regulator-fixed";
> + regulator-name = "vph-pwr";
> +
> + regulator-min-microvolt = <3600000>;
> + regulator-max-microvolt = <3600000>;
> +
> + regulator-always-on;
> + };
> +
> vreg_wlan: wlan-regulator {
> compatible = "regulator-fixed";
>
