diff options
| author | Olof Johansson <olof@lixom.net> | 2013-07-23 04:53:29 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-07-23 04:54:22 +0200 |
| commit | 9d0b375089284186116a0745d862ec713f920d9e (patch) | |
| tree | 82e6b8949f0cceeec848370d934947c95a8beee0 /arch/arm/boot | |
| parent | Merge tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | Merge branch 'omap-for-v3.11/dt-fixes' into omap-for-v3.11/fixes (diff) | |
| download | linux-9d0b375089284186116a0745d862ec713f920d9e.tar.xz linux-9d0b375089284186116a0745d862ec713f920d9e.zip | |
Merge tag 'omap-for-v3.11/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren:
Omap fixes mostly to deal with the dropping of platform data for omap4,
and to make v7_defconfig bootable on omap4 SDP with nfsroot.
* tag 'omap-for-v3.11/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Provide alias to USB PHY clock
ARM: dts: Add missing vmmc2 regulator for twl
ARM: multi_v7: Enabled omap4430 sdp nfsroot
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/twl4030.dtsi | 6 |
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"; }; |