From 532ab1aa7b34397a0a7b62edcdc23faf556b045e Mon Sep 17 00:00:00 2001 From: Sebastian Hesselbarth Date: Thu, 27 Dec 2012 23:21:59 +0100 Subject: [PATCH] --- yaml --- r: 359938 b: refs/heads/master c: 41e364bb2494afe21803aff43bd8cb89ce6fc097 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/dove-cubox.dts | 25 ++++++++++++++++++++++++- trunk/arch/arm/mach-dove/Kconfig | 2 ++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5cef9a55d46d..28041e9787e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e35e40cd553f7950c0bcb60f1d8f9672bd69d6a2 +refs/heads/master: 41e364bb2494afe21803aff43bd8cb89ce6fc097 diff --git a/trunk/arch/arm/boot/dts/dove-cubox.dts b/trunk/arch/arm/boot/dts/dove-cubox.dts index bed5b62b73a3..7e3065abd751 100644 --- a/trunk/arch/arm/boot/dts/dove-cubox.dts +++ b/trunk/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/trunk/arch/arm/mach-dove/Kconfig b/trunk/arch/arm/mach-dove/Kconfig index aedd0baa04bf..36469d813951 100644 --- a/trunk/arch/arm/mach-dove/Kconfig +++ b/trunk/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