Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4eb2834 authored Mar 19, 2012 by Arnd Bergmann

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

parents a94c7b0a 0a428036

Documentation/devicetree/bindings/usb/tegra-usb.txt

+13 −0

Original line number	Diff line number	Diff line
		@@ -11,3 +11,16 @@ Required properties :
		- phy_type : Should be one of "ulpi" or "utmi".
		- nvidia,vbus-gpio : If present, specifies a gpio that needs to be
		activated for the bus to be powered.

		Optional properties:
		- dr_mode : dual role mode. Indicates the working mode for
		nvidia,tegra20-ehci compatible controllers. Can be "host", "peripheral",
		or "otg". Default to "host" if not defined for backward compatibility.
		host means this is a host controller
		peripheral means it is device controller
		otg means it can operate as either ("on the go")
		- nvidia,has-legacy-mode : boolean indicates whether this controller can
		operate in legacy mode (as APX 2500 / 2600). In legacy mode some
		registers are accessed through the APB_MISC base address instead of
		the USB controller. Since this is a legacy issue it probably does not
		warrant a compatible string of its own.

arch/arm/boot/dts/tegra-seaboard.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@

		usb@c5000000 {
		nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
		dr_mode = "otg";
		};

		gpio-keys {

arch/arm/boot/dts/tegra20.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -188,6 +188,7 @@
		reg = <0xc5000000 0x4000>;
		interrupts = < 0 20 0x04 >;
		phy_type = "utmi";
		nvidia,has-legacy-mode;
		};

		usb@c5004000 {