diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-09-02 13:08:30 +0300 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2018-09-26 17:52:26 +0300 |
| commit | 3c59cae79fbeb6d44e603a49d845428b8ef98718 (patch) | |
| tree | 84af95867e688a59b81b0a467ac341f569f59f1a | |
| parent | 4b601b9f1022bbd67decf8842a3dd86c850c5e83 (diff) | |
| download | linux-3c59cae79fbeb6d44e603a49d845428b8ef98718.tar.xz | |
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>
| -rw-r--r-- | arch/arm/boot/dts/tegra20-colibri-iris.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-colibri.dtsi | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts index 57f16c0e9917..496b96e229d2 100644 --- 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 e7b9ab09908a..ad2676b3cd5b 100644 --- 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 |