summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-07-19 03:28:35 -0700
committerTony Lindgren <tony@atomide.com>2013-07-19 03:28:35 -0700
commit7956c487e407bdbf7f8c8a570fd5d4d089973692 (patch)
tree8c3d0b2ca2fd6f2b62ded8e154f27289045f482c /arch
parent741532c4a995be11815cb72d4d7a48f442a22fea (diff)
parent13782a7e2821f62efc747fd26605de4dc823ee29 (diff)
downloadlinux-7956c487e407bdbf7f8c8a570fd5d4d089973692.tar.bz2
Merge branch 'omap-for-v3.11/dt-fixes' into omap-for-v3.11/fixes
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/twl4030.dtsi6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index b3034da00a37..ae6a17aed9ee 100644
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -47,6 +47,12 @@
regulator-max-microvolt = <3150000>;
};
+ vmmc2: regulator-vmmc2 {
+ compatible = "ti,twl4030-vmmc2";
+ regulator-min-microvolt = <1850000>;
+ regulator-max-microvolt = <3150000>;
+ };
+
vusb1v5: regulator-vusb1v5 {
compatible = "ti,twl4030-vusb1v5";
};