aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-19 20:57:28 +0000
committerArnd Bergmann <arnd@arndb.de>2012-03-19 20:57:28 +0000
commitf4eb28340771c12cdbf8b5ec149dbd3b0eef1687 (patch)
tree71c0860b9271daac24dfa37350ec3f569e2583f2 /arch/arm/boot
parenta94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78 (diff)
parent0a428036dfb28be3e5f0d671e3457509d1f4ea29 (diff)
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
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/tegra-seaboard.dts1
-rw-r--r--arch/arm/boot/dts/tegra20.dtsi1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 876d5c92ce3..dbf1c5a171c 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -112,6 +112,7 @@
usb@c5000000 {
nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
+ dr_mode = "otg";
};
gpio-keys {
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index d2bc7e7ad06..f29978ecaeb 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -188,6 +188,7 @@
reg = <0xc5000000 0x4000>;
interrupts = < 0 20 0x04 >;
phy_type = "utmi";
+ nvidia,has-legacy-mode;
};
usb@c5004000 {