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
/
tegra30-colibri.dts
diff --git
a/arch/arm/dts/tegra30-colibri.dts
b/arch/arm/dts/tegra30-colibri.dts
index dd6009af47cbef4ae3430229e775d8282cfe008a..36533dc840a31acbd4d461d95c93d314f41b223c 100644
(file)
--- a/
arch/arm/dts/tegra30-colibri.dts
+++ b/
arch/arm/dts/tegra30-colibri.dts
@@
-16,6
+16,7
@@
i2c2 = "/i2c@7000c700";
sdhci0 = "/sdhci@78000600";
sdhci1 = "/sdhci@78000200";
i2c2 = "/i2c@7000c700";
sdhci0 = "/sdhci@78000600";
sdhci1 = "/sdhci@78000200";
+ spi0 = "/spi@7000d400";
usb0 = "/usb@7d000000";
usb1 = "/usb@7d004000"; /* on module only, for ASIX */
usb2 = "/usb@7d008000";
usb0 = "/usb@7d000000";
usb1 = "/usb@7d004000"; /* on module only, for ASIX */
usb2 = "/usb@7d008000";
@@
-26,8
+27,10
@@
reg = <0x80000000 0x40000000>;
};
reg = <0x80000000 0x40000000>;
};
- /* GEN1_I2C: I2C_SDA/SCL on SODIMM pin 194/196 (e.g. RTC on carrier
- board) */
+ /*
+ * GEN1_I2C: I2C_SDA/SCL on SODIMM pin 194/196 (e.g. RTC on carrier
+ * board)
+ */
i2c@7000c000 {
status = "okay";
clock-frequency = <100000>;
i2c@7000c000 {
status = "okay";
clock-frequency = <100000>;
@@
-43,8
+46,10
@@
clock-frequency = <100000>;
};
clock-frequency = <100000>;
};
- /* PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and
- touch screen controller */
+ /*
+ * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and
+ * touch screen controller
+ */
i2c@7000d000 {
status = "okay";
clock-frequency = <100000>;
i2c@7000d000 {
status = "okay";
clock-frequency = <100000>;
@@
-59,7
+64,7
@@
sdhci@78000200 {
status = "okay";
bus-width = <4>;
sdhci@78000200 {
status = "okay";
bus-width = <4>;
- cd-gpios = <&gpio
23 1>; /* PC7,
MMCD */
+ cd-gpios = <&gpio
TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /*
MMCD */
};
sdhci@78000600 {
};
sdhci@78000600 {
@@
-78,12
+83,14
@@
usb@7d004000 {
status = "okay";
phy_type = "utmi";
usb@7d004000 {
status = "okay";
phy_type = "utmi";
- nvidia,vbus-gpio = <&gpio 234 0>; /* PDD2, VBUS_LAN */
+ /* VBUS_LAN */
+ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 2) GPIO_ACTIVE_HIGH>;
};
/* EHCI instance 2: USB3_DP/N -> USBH_P/N */
usb@7d008000 {
status = "okay";
};
/* EHCI instance 2: USB3_DP/N -> USBH_P/N */
usb@7d008000 {
status = "okay";
- nvidia,vbus-gpio = <&gpio 178 1>; /* PW2, USBH_PEN */
+ /* USBH_PEN */
+ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
};
};
};
};