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 https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
[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..18bcb75fafa09f65d061bb27e0074e78bc3ca76a 100644
(file)
--- a/
arch/arm/dts/tegra114-dalmore.dts
+++ b/
arch/arm/dts/tegra114-dalmore.dts
@@
-16,9
+16,10
@@
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
i2c2 = "/i2c@7000c400";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
- sdhci0 = "/sdhci@78000600";
- sdhci1 = "/sdhci@78000400";
- usb0 = "/usb@7d008000";
+ mmc0 = "/sdhci@78000600";
+ mmc1 = "/sdhci@78000400";
+ usb0 = "/usb@7d000000";
+ usb1 = "/usb@7d008000";
};
memory {
};
memory {
@@
-57,7
+58,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";
};
@@
-65,11
+66,34
@@
sdhci@78000600 {
bus-width = <8>;
status = "okay";
sdhci@78000600 {
bus-width = <8>;
status = "okay";
+ non-removable;
+ };
+
+ usb@7d000000 {
+ status = "okay";
+ dr_mode = "otg";
+ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
};
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";
};
+
+ clocks {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ clk32k_in: clock@0 {
+ compatible = "fixed-clock";
+ reg=<0>;
+ #clock-cells = <0>;
+ clock-frequency = <32768>;
+ };
+ };
+};
+
+&uartd {
+ status = "okay";
};
};