diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 21:48:45 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 13:31:11 +0200 |
commit | c49314fa6c7d2c130d850b30980cffab53a40592 (patch) | |
tree | 9c7597ad98a42ef8ba1e18e897106c2cb29e52e6 /arch/arm/boot/dts/omap3-beagle.dts | |
parent | 21b7f153dd0d7366197c37e7a630c7585db0b8ea (diff) | |
parent | 7f217794ffa72f208a250b79ab0b7ea3de19677f (diff) |
Merge branch 'drivers/mmc' into next/drivers
* drivers/mmc:
mmc: dt: Consolidate DT bindings
Also pulls in the omap/dt-missed-3.4 branch as a dependency.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/omap3-beagle.dts')
-rw-r--r-- | arch/arm/boot/dts/omap3-beagle.dts | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index 9f72cd4cf308..5b4506c0a8c4 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts @@ -18,3 +18,52 @@ reg = <0x80000000 0x20000000>; /* 512 MB */ }; }; + +&i2c1 { + clock-frequency = <2600000>; + + twl: twl@48 { + reg = <0x48>; + interrupts = <7>; /* SYS_NIRQ cascaded to intc */ + interrupt-parent = <&intc>; + + vsim: regulator@10 { + compatible = "ti,twl4030-vsim"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3000000>; + }; + }; +}; + +/include/ "twl4030.dtsi" + +&i2c2 { + clock-frequency = <400000>; +}; + +&i2c3 { + clock-frequency = <100000>; + + /* + * Display monitor features are burnt in the EEPROM + * as EDID data. + */ + eeprom@50 { + compatible = "ti,eeprom"; + reg = <0x50>; + }; +}; + +&mmc1 { + vmmc-supply = <&vmmc1>; + vmmc_aux-supply = <&vsim>; + bus-width = <8>; +}; + +&mmc2 { + status = "disable"; +}; + +&mmc3 { + status = "disable"; +}; |