aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/dove-cubox.dts25
-rw-r--r--arch/arm/mach-dove/Kconfig2
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 @@
26 linux,default-trigger = "default-on"; 26 linux,default-trigger = "default-on";
27 }; 27 };
28 }; 28 };
29
30 regulators {
31 compatible = "simple-bus";
32 #address-cells = <1>;
33 #size-cells = <0>;
34
35 usb_power: regulator@1 {
36 compatible = "regulator-fixed";
37 reg = <1>;
38 regulator-name = "USB Power";
39 regulator-min-microvolt = <5000000>;
40 regulator-max-microvolt = <5000000>;
41 enable-active-high;
42 regulator-always-on;
43 regulator-boot-on;
44 gpio = <&gpio0 1 0>;
45 };
46 };
29}; 47};
30 48
31&uart0 { status = "okay"; }; 49&uart0 { status = "okay"; };
@@ -50,9 +68,14 @@
50}; 68};
51 69
52&pinctrl { 70&pinctrl {
53 pinctrl-0 = <&pmx_gpio_12>; 71 pinctrl-0 = <&pmx_gpio_1 &pmx_gpio_12>;
54 pinctrl-names = "default"; 72 pinctrl-names = "default";
55 73
74 pmx_gpio_1: pmx-gpio-1 {
75 marvell,pins = "mpp1";
76 marvell,function = "gpio";
77 };
78
56 pmx_gpio_12: pmx-gpio-12 { 79 pmx_gpio_12: pmx-gpio-12 {
57 marvell,pins = "mpp12"; 80 marvell,pins = "mpp12";
58 marvell,function = "gpio"; 81 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
24 bool "Marvell Dove Flattened Device Tree" 24 bool "Marvell Dove Flattened Device Tree"
25 select MVEBU_CLK_CORE 25 select MVEBU_CLK_CORE
26 select MVEBU_CLK_GATING 26 select MVEBU_CLK_GATING
27 select REGULATOR
28 select REGULATOR_FIXED_VOLTAGE
27 select USE_OF 29 select USE_OF
28 help 30 help
29 Say 'Y' here if you want your kernel to support the 31 Say 'Y' here if you want your kernel to support the