Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73bae19c authored by Bhushan Shah's avatar Bhushan Shah Committed by Andy Gross
Browse files

ARM: dts: msm8974: Move vreg_boost node from the honami to msm8974 



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: default avatarBhushan Shah <bshah@kde.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent 0485ef8e

arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts

+0 −22
Original line number Diff line number Diff line
@@ -257,23 +257,6 @@ 
			};

		};

	};



	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>;

     };

};



&soc {
@@ -446,11 +429,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";

arch/arm/boot/dts/qcom-msm8974.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/clock/qcom,gcc-msm8974.h>

#include <dt-bindings/gpio/gpio.h>

#include "skeleton.dtsi"



/ {
@@ -728,6 +729,22 @@ 
		};

	};



	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";

arch/arm/boot/dts/qcom-pm8941.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ 
				     <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 {