ARM: tegra: colibri_t20: move aliases from module to carrier board

Move RTC aliases from module to carrier board to be more in-line with
all our other device trees.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts
index 57f16c0e9917ed0ac85e75432b2563e205767797..496b96e229d211aaa415bed888a686c342f87624 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri-iris.dts
+++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts
@@ -8,6 +8,8 @@
        compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20";
 
        aliases {
+               rtc0 = "/i2c@7000d000/tps6586x@34";
+               rtc1 = "/rtc@7000e000";
                serial0 = &uarta;
                serial1 = &uartd;
        };

diff --git a/arch/arm/boot/dts/tegra20-colibri.dtsi b/arch/arm/boot/dts/tegra20-colibri.dtsi
index e7b9ab09908a1af6212cb9c59d9f2136849c1427..ad2676b3cd5b6cf3ebe2647736146e231f7fa810 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri.dtsi
@@ -5,11 +5,6 @@
        model = "Toradex Colibri T20 256/512 MB";
        compatible = "toradex,colibri_t20-512", "nvidia,tegra20";
 
-       aliases {
-               rtc0 = "/i2c@7000d000/tps6586x@34";
-               rtc1 = "/rtc@7000e000";
-       };
-
        memory@0 {
                /*
                 * Set memory to 256 MB to be safe as this could be used on