diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-09 13:14:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-09 13:14:02 -0700 |
| commit | 6e6a3af7f182f0529c26e0633f68f60aaec51831 (patch) | |
| tree | 068e2548f9a2ffeb94cc94326f1d7f93610118ca /arch/arm/boot/dts/omap3-evm.dts | |
| parent | 474dbaa78c9fedbe4fe7e49abb27f0ce766ec9fc (diff) | |
| parent | 914dc329ee11d6b1ecbebef802962dc06e78b942 (diff) | |
| download | linux-6e6a3af7f182f0529c26e0633f68f60aaec51831.tar.bz2 | |
Merge tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren:
Omap device tree fixes for issue discovered during the merge window:
- Fix triggering for GPIO interrupts that's needed for 4430sdp
Ethernet. Otherwise booting with nfsroot won't work.
- Fix CPU operating point values
- Fix wrong assumption that twl PMIC is always connected to omap3
- Add gpmc for am33xx so beaglebone users can use the bus
- Cosmetic fix for mcspi pin muxing to avoid confusion
* tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: don't assume boards are using twl4030 for omap3
ARM: dts: Configure and fix the McSPI pins for 4430sdp
ARM: dts: AM33XX: Add GPMC node
ARM: dts: OMAP4460: Fix CPU OPP voltages
ARM: dts: OMAP36xx: Fix CPU OPP voltages
ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards
Diffstat (limited to 'arch/arm/boot/dts/omap3-evm.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3-evm.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts index 05f51e10ddd6..96d1c206a57b 100644 --- a/arch/arm/boot/dts/omap3-evm.dts +++ b/arch/arm/boot/dts/omap3-evm.dts @@ -68,6 +68,7 @@ &usb_otg_hs { interface-type = <0>; + usb-phy = <&usb2_phy>; mode = <3>; power = <50>; }; |