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 branch 'master' of git://git.denx.de/u-boot-x86
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
tegra124-venice2.dts
diff --git
a/arch/arm/dts/tegra124-venice2.dts
b/arch/arm/dts/tegra124-venice2.dts
index f7ccfc5ddd4bf29a6b6f1c86354b55c67513721e..add9244e68743fd43e27feb13b5c378e68327733 100644
(file)
--- a/
arch/arm/dts/tegra124-venice2.dts
+++ b/
arch/arm/dts/tegra124-venice2.dts
@@
-17,8
+17,8
@@
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
i2c5 = "/i2c@7000d100";
i2c3 = "/i2c@7000c500";
i2c4 = "/i2c@7000c700";
i2c5 = "/i2c@7000d100";
-
sdhci
0 = "/sdhci@700b0600";
-
sdhci
1 = "/sdhci@700b0400";
+
mmc
0 = "/sdhci@700b0600";
+
mmc
1 = "/sdhci@700b0400";
spi0 = "/spi@7000d400";
spi1 = "/spi@7000da00";
usb0 = "/usb@7d000000";
spi0 = "/spi@7000d400";
spi1 = "/spi@7000da00";
usb0 = "/usb@7d000000";
@@
-72,24
+72,40
@@
sdhci@700b0400 {
status = "okay";
sdhci@700b0400 {
status = "okay";
- cd-gpios = <&gpio 170 0>; /* gpio PV2 */
- power-gpios = <&gpio 136 0>; /* gpio PR0 */
+ cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
+ power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
+ wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
bus-width = <4>;
};
sdhci@700b0600 {
status = "okay";
bus-width = <8>;
bus-width = <4>;
};
sdhci@700b0600 {
status = "okay";
bus-width = <8>;
+ non-removable;
};
usb@7d000000 {
status = "okay";
dr_mode = "otg";
};
usb@7d000000 {
status = "okay";
dr_mode = "otg";
- nvidia,vbus-gpio = <&gpio
108 0>; /* gpio PN4, USB_VBUS_EN0 */
+ nvidia,vbus-gpio = <&gpio
TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
};
usb@7d008000 {
status = "okay";
};
usb@7d008000 {
status = "okay";
- nvidia,vbus-gpio = <&gpio
109 0>; /* gpio PN5, USB_VBUS_EN1 */
+ nvidia,vbus-gpio = <&gpio
TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
};
};
+
+ 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>;
+ };
+ };
+
};
};