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: Bhushan Shah <bshah@kde.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Andy Gross <andy.gross@linaro.org>
This commit is contained in:
Родитель
0485ef8e04
Коммит
73bae19c3a
|
@ -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 {
|
&soc {
|
||||||
|
@ -446,11 +429,6 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
gpios@c000 {
|
gpios@c000 {
|
||||||
boost_bypass_n_pin: boost-bypass {
|
|
||||||
pins = "gpio21";
|
|
||||||
function = "normal";
|
|
||||||
};
|
|
||||||
|
|
||||||
gpio_keys_pin_a: gpio-keys-active {
|
gpio_keys_pin_a: gpio-keys-active {
|
||||||
pins = "gpio2", "gpio3", "gpio4", "gpio5";
|
pins = "gpio2", "gpio3", "gpio4", "gpio5";
|
||||||
function = "normal";
|
function = "normal";
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||||
#include <dt-bindings/clock/qcom,gcc-msm8974.h>
|
#include <dt-bindings/clock/qcom,gcc-msm8974.h>
|
||||||
|
#include <dt-bindings/gpio/gpio.h>
|
||||||
#include "skeleton.dtsi"
|
#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 {
|
vreg_vph_pwr: vreg-vph-pwr {
|
||||||
compatible = "regulator-fixed";
|
compatible = "regulator-fixed";
|
||||||
regulator-name = "vph-pwr";
|
regulator-name = "vph-pwr";
|
||||||
|
|
|
@ -88,6 +88,11 @@
|
||||||
<0 0xe1 0 IRQ_TYPE_NONE>,
|
<0 0xe1 0 IRQ_TYPE_NONE>,
|
||||||
<0 0xe2 0 IRQ_TYPE_NONE>,
|
<0 0xe2 0 IRQ_TYPE_NONE>,
|
||||||
<0 0xe3 0 IRQ_TYPE_NONE>;
|
<0 0xe3 0 IRQ_TYPE_NONE>;
|
||||||
|
|
||||||
|
boost_bypass_n_pin: boost-bypass {
|
||||||
|
pins = "gpio21";
|
||||||
|
function = "normal";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
pm8941_mpps: mpps@a000 {
|
pm8941_mpps: mpps@a000 {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче