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

[oweals/u-boot.git] / arch / arm / dts / tegra124-nyan-big.dts

diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts
index 20e0be30e980d9b92bd5f0a60eaebfa00248b80c..f1c97052a847e648e5ca2aecaadaa5dd33c73c12 100644 (file)
--- a/arch/arm/dts/tegra124-nyan-big.dts
+++ b/arch/arm/dts/tegra124-nyan-big.dts
@@ -8,17 +8,16 @@
 
        aliases {
                console = &uarta;
-               stdout-path = &uarta;
                i2c0 = "/i2c@7000d000";
                i2c1 = "/i2c@7000c000";
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
                i2c5 = "/i2c@7000d100";
-               rtc0 = "/i2c@0,7000d000/pmic@40";
-               rtc1 = "/rtc@0,7000e000";
-               sdhci0 = "/sdhci@700b0600";
-               sdhci1 = "/sdhci@700b0400";
+               rtc0 = "/i2c@7000d000/pmic@40";
+               rtc1 = "/rtc@7000e000";
+               mmc0 = "/sdhci@700b0600";
+               mmc1 = "/sdhci@700b0400";
                spi0 = "/spi@7000d400";
                spi1 = "/spi@7000da00";
                usb0 = "/usb@7d000000";
@@ -26,10 +25,12 @@
                usb2 = "/usb@7d004000";
        };
 
+       chosen {
+               stdout-path = &uarta;
+       };
+
        host1x@50000000 {
-               u-boot,dm-pre-reloc;
                dc@54200000 {
-                       u-boot,dm-pre-reloc;
                        display-timings {
                                timing@0 {
                                        clock-frequency = <69500000>;
@@ -58,7 +59,7 @@
                ddc-i2c-bus = <&dpaux>;
        };
 
-       sdhci@0,700b0400 { /* SD Card on this bus */
+       sdhci@700b0400 { /* SD Card on this bus */
                wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
        };
 
@@ -69,7 +70,7 @@
                nvidia,model = "GoogleNyanBig";
        };
 
-       pinmux@0,70000868 {
+       pinmux@70000868 {
                pinctrl-names = "default";
                pinctrl-0 = <&pinmux_default>;