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

[u-boot] / 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 a0f1d09bee58bc94411c9df839dd1adbf0dd47df..62f89d0f1a866ce6890ae8d3646e843008099c38 100644 (file)
--- a/arch/arm/dts/tegra124-nyan-big.dts
+++ b/arch/arm/dts/tegra124-nyan-big.dts
@@ -15,8 +15,8 @@
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
                i2c5 = "/i2c@7000d100";
-               rtc0 = "/i2c@0,7000d000/pmic@40";
-               rtc1 = "/rtc@0,7000e000";
+               rtc0 = "/i2c@7000d000/pmic@40";
+               rtc1 = "/rtc@7000e000";
                mmc0 = "/sdhci@700b0600";
                mmc1 = "/sdhci@700b0400";
                spi0 = "/spi@7000d400";
@@ -27,9 +27,7 @@
        };
 
        host1x@50000000 {
-               u-boot,dm-pre-reloc;
                dc@54200000 {
-                       u-boot,dm-pre-reloc;
                        display-timings {
                                timing@0 {
                                        clock-frequency = <69500000>;
@@ -58,7 +56,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 +67,7 @@
                nvidia,model = "GoogleNyanBig";
        };
 
-       pinmux@0,70000868 {
+       pinmux@70000868 {
                pinctrl-names = "default";
                pinctrl-0 = <&pinmux_default>;