Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'for-3.4/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into next/dt2

* 'for-3.4/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
arm: tegra: dts: Mark USB1 as an OTG port on Seaboard
arm: tegra: dts: Add legacy mode support to Tegra2x USB1 port
arm: tegra: dts: Support host/device selection and legacy mode

+15
+13
Documentation/devicetree/bindings/usb/tegra-usb.txt
··· 11 11 - phy_type : Should be one of "ulpi" or "utmi". 12 12 - nvidia,vbus-gpio : If present, specifies a gpio that needs to be 13 13 activated for the bus to be powered. 14 + 15 + Optional properties: 16 + - dr_mode : dual role mode. Indicates the working mode for 17 + nvidia,tegra20-ehci compatible controllers. Can be "host", "peripheral", 18 + or "otg". Default to "host" if not defined for backward compatibility. 19 + host means this is a host controller 20 + peripheral means it is device controller 21 + otg means it can operate as either ("on the go") 22 + - nvidia,has-legacy-mode : boolean indicates whether this controller can 23 + operate in legacy mode (as APX 2500 / 2600). In legacy mode some 24 + registers are accessed through the APB_MISC base address instead of 25 + the USB controller. Since this is a legacy issue it probably does not 26 + warrant a compatible string of its own.
+1
arch/arm/boot/dts/tegra-seaboard.dts
··· 112 112 113 113 usb@c5000000 { 114 114 nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */ 115 + dr_mode = "otg"; 115 116 }; 116 117 117 118 gpio-keys {
+1
arch/arm/boot/dts/tegra20.dtsi
··· 188 188 reg = <0xc5000000 0x4000>; 189 189 interrupts = < 0 20 0x04 >; 190 190 phy_type = "utmi"; 191 + nvidia,has-legacy-mode; 191 192 }; 192 193 193 194 usb@c5004000 {