ARM: tegra: remove "0, " from DT unit addresses

[u-boot] / arch / arm / dts / tegra30-tamonten.dtsi

diff --git a/arch/arm/dts/tegra30-tamonten.dtsi b/arch/arm/dts/tegra30-tamonten.dtsi
index 50d5762311e16ad1374849754ad292c51ece64fc..75c0f42d919f06ac692b90197a2d2fa09b733ef1 100644 (file)
--- a/arch/arm/dts/tegra30-tamonten.dtsi
+++ b/arch/arm/dts/tegra30-tamonten.dtsi
@@ -8,15 +8,19 @@
                reg = <0x80000000 0x40000000>;
        };
 
+       chosen {
+               stdout-path = &uartd;
+       };
+
        aliases {
                i2c0 = "/i2c@7000c000";
                i2c1 = "/i2c@7000c700";
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000d000";
-               sdhci0 = "/sdhci@78000600";
-               sdhci1 = "/sdhci@78000400";
-               sdhci2 = "/sdhci@78000000";
+               mmc0 = "/sdhci@78000600";
+               mmc1 = "/sdhci@78000400";
+               mmc2 = "/sdhci@78000000";
                usb0 = "/usb@7d008000";
        };
 
@@ -51,8 +55,8 @@
 
        /* SD slot on the base board */
        sdhci@78000400 {
-               cd-gpios = <&gpio 69 1>; /* gpio PI5 */
-               wp-gpios = <&gpio 67 0>; /* gpio PI3 */
+               cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
+               wp-gpios = <&gpio TEGRA_GPIO(I, 3) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
@@ -60,6 +64,7 @@
        sdhci@78000600 {
                status = "okay";
                bus-width = <8>;
+               non-removable;
        };
 
        usb@7d008000 {