diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 21:45:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 21:46:01 +0200 |
| commit | e6511df4f25607e2e6d60062eb69c28c057329fa (patch) | |
| tree | 0902e695f2995d3919398b2ffd3b90ad66bad095 /arch/arm/boot/dts/omap3-beagle.dts | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
| parent | b3431f5ba402a98a89b78a9408b4972d8870df4d (diff) | |
| download | op-kernel-dev-e6511df4f25607e2e6d60062eb69c28c057329fa.zip op-kernel-dev-e6511df4f25607e2e6d60062eb69c28c057329fa.tar.gz | |
Merge branch 'omap/dt-missed-3.4' into drivers/mmc
The omap/dt branch adds a few instances of mmc device nodes that
need to get changed to use the common bindings. Pull that into
a new branch so we can apply the patch in a single run.
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 9f72cd4..8c756be 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>; + ti,bus-width = <8>; +}; + +&mmc2 { + status = "disable"; +}; + +&mmc3 { + status = "disable"; +}; |
