diff options
author | Tom Rini <trini@ti.com> | 2013-07-12 10:36:48 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-07-12 10:36:48 -0400 |
commit | fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc (patch) | |
tree | 9c91526cefd027d9bd964572d4f92bd2d1376c5d /board/nvidia/dts/tegra30-cardhu.dts | |
parent | d72da1582895ca226b995758426ec3769b54a9b8 (diff) | |
parent | efc284e32503b240dbd35c6e8b8d098d702b4be7 (diff) | |
download | talos-obmc-uboot-fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc.tar.gz talos-obmc-uboot-fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc.zip |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.
Conflicts:
arch/arm/dts/exynos5250.dtsi
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board/nvidia/dts/tegra30-cardhu.dts')
-rw-r--r-- | board/nvidia/dts/tegra30-cardhu.dts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/board/nvidia/dts/tegra30-cardhu.dts b/board/nvidia/dts/tegra30-cardhu.dts index 4d22b48ee9..ea2cf76ff3 100644 --- a/board/nvidia/dts/tegra30-cardhu.dts +++ b/board/nvidia/dts/tegra30-cardhu.dts @@ -14,6 +14,7 @@ i2c4 = "/i2c@7000c700"; sdhci0 = "/sdhci@78000600"; sdhci1 = "/sdhci@78000000"; + usb0 = "/usb@7d008000"; }; memory { @@ -63,4 +64,9 @@ status = "okay"; bus-width = <8>; }; + + usb@7d008000 { + nvidia,vbus-gpio = <&gpio 236 0>; /* PDD4 */ + status = "okay"; + }; }; |