diff options
| author |   Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2012-12-27 23:21:59 +0100 |
|---|---|---|
| committer |   Arnd Bergmann <arnd@arndb.de> | 2013-02-28 18:57:12 +0100 |
| commit | 41e364bb2494afe21803aff43bd8cb89ce6fc097 (patch) | |
| tree | e6829e028ca1fb0145a40cf92f661f12ec712d1a /arch/arm | |
| parent | ARM: Dove: move CuBox led pinctrl to gpio-leds node (diff) | |
| download | linux-dev-41e364bb2494afe21803aff43bd8cb89ce6fc097.tar.xz linux-dev-41e364bb2494afe21803aff43bd8cb89ce6fc097.zip | |
ARM: Dove: add fixed regulator for CuBox USB power
CuBox needs to enable USB power on a gpio pin. Add a fixed regulator
to always enable usb power on boot.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/dove-cubox.dts | 25 | ||||
| -rw-r--r-- | arch/arm/mach-dove/Kconfig | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index bed5b62b73a3..7e3065abd751 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts @@ -26,6 +26,24 @@ linux,default-trigger = "default-on"; }; }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + usb_power: regulator@1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "USB Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 1 0>; + }; + }; }; &uart0 { status = "okay"; }; @@ -50,9 +68,14 @@ }; &pinctrl { - pinctrl-0 = <&pmx_gpio_12>; + pinctrl-0 = <&pmx_gpio_1 &pmx_gpio_12>; pinctrl-names = "default"; + pmx_gpio_1: pmx-gpio-1 { + marvell,pins = "mpp1"; + marvell,function = "gpio"; + }; + pmx_gpio_12: pmx-gpio-12 { marvell,pins = "mpp12"; marvell,function = "gpio"; diff --git a/arch/arm/mach-dove/Kconfig b/arch/arm/mach-dove/Kconfig index aedd0baa04bf..36469d813951 100644 --- a/arch/arm/mach-dove/Kconfig +++ b/arch/arm/mach-dove/Kconfig @@ -24,6 +24,8 @@ config MACH_DOVE_DT bool "Marvell Dove Flattened Device Tree" select MVEBU_CLK_CORE select MVEBU_CLK_GATING + select REGULATOR + select REGULATOR_FIXED_VOLTAGE select USE_OF help Say 'Y' here if you want your kernel to support the |