summaryrefslogtreecommitdiff
path: root/arch/arm/dts/tegra20-harmony.dts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-09-27 12:47:25 -0400
committerTom Rini <trini@konsulko.com>2016-09-27 12:47:25 -0400
commit40e1236afeeacdadfa3865f70fc7e3b8016acbe2 (patch)
treea915b83d54beceb8a5c4fa424c0bcb6df56238d8 /arch/arm/dts/tegra20-harmony.dts
parent6d5565608f385b89f528ecf5680410cdc6cf63e9 (diff)
parent8e5d804f890b32959cc9d9f9349ccd2ff4a744a0 (diff)
downloadu-boot-imx-40e1236afeeacdadfa3865f70fc7e3b8016acbe2.zip
u-boot-imx-40e1236afeeacdadfa3865f70fc7e3b8016acbe2.tar.gz
u-boot-imx-40e1236afeeacdadfa3865f70fc7e3b8016acbe2.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'arch/arm/dts/tegra20-harmony.dts')
-rw-r--r--arch/arm/dts/tegra20-harmony.dts10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/dts/tegra20-harmony.dts b/arch/arm/dts/tegra20-harmony.dts
index 8e9fe5a..dcbde7c 100644
--- a/arch/arm/dts/tegra20-harmony.dts
+++ b/arch/arm/dts/tegra20-harmony.dts
@@ -15,10 +15,11 @@
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
- usb0 = "/usb@c5008000";
+ usb0 = "/usb@c5000000";
usb1 = "/usb@c5004000";
- sdhci0 = "/sdhci@c8000600";
- sdhci1 = "/sdhci@c8000200";
+ usb2 = "/usb@c5008000";
+ mmc0 = "/sdhci@c8000600";
+ mmc1 = "/sdhci@c8000200";
};
memory {
@@ -626,7 +627,8 @@
usb@c5004000 {
status = "okay";
- nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1) 0>;
+ nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+ GPIO_ACTIVE_LOW>;
};
usb-phy@c5004000 {