projects
/
oweals
/
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-usb
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
tegra114-dalmore.dts
diff --git
a/arch/arm/dts/tegra114-dalmore.dts
b/arch/arm/dts/tegra114-dalmore.dts
index 81ad212e71291906f6d3b16ea020cc41e68ee727..51ff266d760a69c56d12bd69b021b3c7ed5de8c0 100644
(file)
--- a/
arch/arm/dts/tegra114-dalmore.dts
+++ b/
arch/arm/dts/tegra114-dalmore.dts
@@
-57,7
+57,7
@@
};
sdhci@78000400 {
};
sdhci@78000400 {
- cd-gpios = <&gpio
170 1>; /* gpio PV2 */
+ cd-gpios = <&gpio
TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
bus-width = <4>;
status = "okay";
};
bus-width = <4>;
status = "okay";
};
@@
-68,8
+68,7
@@
};
usb@7d008000 {
};
usb@7d008000 {
- /* SPDIF_IN: USB_VBUS_EN1 */
- nvidia,vbus-gpio = <&gpio 86 0>;
+ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
status = "okay";
};
};
status = "okay";
};
};