projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-dm
[platform/kernel/u-boot.git]
/
arch
/
arm
/
dts
/
tegra20-harmony.dts
diff --git
a/arch/arm/dts/tegra20-harmony.dts
b/arch/arm/dts/tegra20-harmony.dts
index
cace743
..
0c90705
100644
(file)
--- a/
arch/arm/dts/tegra20-harmony.dts
+++ b/
arch/arm/dts/tegra20-harmony.dts
@@
-15,8
+15,9
@@
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
- usb0 = "/usb@c500
8
000";
+ usb0 = "/usb@c500
0
000";
usb1 = "/usb@c5004000";
usb1 = "/usb@c5004000";
+ usb2 = "/usb@c5008000";
mmc0 = "/sdhci@c8000600";
mmc1 = "/sdhci@c8000200";
};
mmc0 = "/sdhci@c8000600";
mmc1 = "/sdhci@c8000200";
};
@@
-626,7
+627,8
@@
usb@c5004000 {
status = "okay";
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 {
};
usb-phy@c5004000 {
@@
-810,3
+812,7
@@
clock-names = "pll_a", "pll_a_out0", "mclk";
};
};
clock-names = "pll_a", "pll_a_out0", "mclk";
};
};
+
+&uartd {
+ status = "okay";
+};