Merge branch 'master' of git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / arch / arm / dts / tegra210-p2371-2180.dts

diff --git a/arch/arm/dts/tegra210-p2371-2180.dts b/arch/arm/dts/tegra210-p2371-2180.dts
index aa18dd27ceafb5d14f4de835ea5e3a4ffcd8f7c5..649c163152e200df4f1bf3c13547b41b9495d196 100644 (file)
--- a/arch/arm/dts/tegra210-p2371-2180.dts
+++ b/arch/arm/dts/tegra210-p2371-2180.dts
@@ -11,17 +11,19 @@
        };
 
        aliases {
-               i2c0 = "/i2c@0,7000d000";
-               mmc0 = "/sdhci@0,700b0600";
-               mmc1 = "/sdhci@0,700b0000";
-               usb0 = "/usb@0,7d000000";
+               i2c0 = "/i2c@7000d000";
+               i2c2 = "/i2c@7000c400";
+               i2c3 = "/i2c@7000c500";
+               mmc0 = "/sdhci@700b0600";
+               mmc1 = "/sdhci@700b0000";
+               usb0 = "/usb@7d000000";
        };
 
        memory {
                reg = <0x0 0x80000000 0x0 0xc0000000>;
        };
 
-       pcie-controller@0,01003000 {
+       pcie@1003000 {
                status = "okay";
 
                pci@1,0 {
@@ -33,7 +35,7 @@
                };
        };
 
-       padctl@0,7009f000 {
+       padctl@7009f000 {
                pinctrl-0 = <&padctl_default>;
                pinctrl-names = "default";
 
@@ -71,7 +73,7 @@
                };
        };
 
-       sdhci@0,700b0000 {
+       sdhci@700b0000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
@@ -79,18 +81,28 @@
                bus-width = <4>;
        };
 
-       sdhci@0,700b0600 {
+       sdhci@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;
        };
 
-       i2c@0,7000d000 {
+       i2c@7000c400 {
                status = "okay";
                clock-frequency = <400000>;
        };
 
-       usb@0,7d000000 {
+       i2c@7000c500 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       i2c@7000d000 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       usb@7d000000 {
                status = "okay";
                dr_mode = "otg";
                nvidia,vbus-gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>;
@@ -109,3 +121,7 @@
                };
        };
 };
+
+&uarta {
+       status = "okay";
+};