| Message ID | 20160719050414.31704-3-bshah@kde.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Andy Gross |
| Headers | show |
On Mon 18 Jul 22:04 PDT 2016, Bhushan Shah wrote: > vreg_boost is Qualcomm platform specific and is also used in hammerhead > device. > > Cc: Andy Gross <andy.gross@linaro.org> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Cc: David Brown <david.brown@linaro.org> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Russell King <linux@armlinux.org.uk> > Cc: linux-arm-msm@vger.kernel.org > Cc: linux-soc@vger.kernel.org > Cc: devicetree@vger.kernel.org > Signed-off-by: Bhushan Shah <bshah@kde.org> > --- > arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 18 ++---------------- > arch/arm/boot/dts/qcom-msm8974.dtsi | 11 +++++++++++ > arch/arm/boot/dts/qcom-pm8941.dtsi | 6 ++++++ > 3 files changed, 19 insertions(+), 16 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts > index a0398b6..8e33fc3 100644 > --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts > +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts > @@ -258,22 +258,13 @@ > }; > }; > > - 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; > - > + vreg_boost { > gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; > enable-active-high; > > pinctrl-names = "default"; > pinctrl-0 = <&boost_bypass_n_pin>; > - }; > + }; This part is Qualcomm reference design and I think we should just move the entire node to the dtsi. Sorry if I wasn't clearer. Regards, Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts index a0398b6..8e33fc3 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts @@ -258,22 +258,13 @@ }; }; - 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; - + vreg_boost { gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; enable-active-high; pinctrl-names = "default"; pinctrl-0 = <&boost_bypass_n_pin>; - }; + }; }; &soc { @@ -383,11 +374,6 @@ }; gpios@c000 { - boost_bypass_n_pin: boost-bypass { - pins = "gpio21"; - function = "normal"; - }; - gpio_keys_pin_a: gpio-keys-active { pins = "gpio2", "gpio3", "gpio4", "gpio5"; function = "normal"; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index dc2ce00..570028c 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -604,4 +604,15 @@ }; }; }; + + 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; + }; }; diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi index d95edb6..ae8e5cc 100644 --- a/arch/arm/boot/dts/qcom-pm8941.dtsi +++ b/arch/arm/boot/dts/qcom-pm8941.dtsi @@ -88,6 +88,12 @@ <0 0xe1 0 IRQ_TYPE_NONE>, <0 0xe2 0 IRQ_TYPE_NONE>, <0 0xe3 0 IRQ_TYPE_NONE>; + + boost_bypass_n_pin: boost-bypass { + pins = "gpio21"; + function = "normal"; + }; + }; pm8941_mpps: mpps@a000 {
vreg_boost is Qualcomm platform specific and is also used in hammerhead device. Cc: Andy Gross <andy.gross@linaro.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: David Brown <david.brown@linaro.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Russell King <linux@armlinux.org.uk> Cc: linux-arm-msm@vger.kernel.org Cc: linux-soc@vger.kernel.org Cc: devicetree@vger.kernel.org Signed-off-by: Bhushan Shah <bshah@kde.org> --- arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts | 18 ++---------------- arch/arm/boot/dts/qcom-msm8974.dtsi | 11 +++++++++++ arch/arm/boot/dts/qcom-pm8941.dtsi | 6 ++++++ 3 files changed, 19 insertions(+), 16 deletions(-)