diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-05 22:19:03 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-05 22:19:03 +0100 |
commit | 0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7 (patch) | |
tree | a91d4934ac4ffda651804b30554bb6da5af572d4 /arch/arm/boot/dts/tegra20-harmony.dts | |
parent | ARM: nomadik: fix OF compilation regression (diff) | |
parent | ARM: tegra: remove empty tegra_smp_init_cpus() (diff) | |
download | linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.tar.xz linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.zip |
Merge branch 'next/soc' into next/dt
Diffstat (limited to 'arch/arm/boot/dts/tegra20-harmony.dts')
-rw-r--r-- | arch/arm/boot/dts/tegra20-harmony.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts index 43eb72af8948..2b4169702c8d 100644 --- a/arch/arm/boot/dts/tegra20-harmony.dts +++ b/arch/arm/boot/dts/tegra20-harmony.dts @@ -432,6 +432,10 @@ status = "okay"; }; + usb-phy@c5004400 { + nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ + }; + sdhci@c8000200 { status = "okay"; cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |