diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-11-17 10:03:04 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-12-29 23:03:16 +0100 |
| commit | 10b302a297aee952949423aaec0749b757f34950 (patch) | |
| tree | 20aaebfdd309d55c2140910ca1b08abcc21862a2 | |
| parent | 2c6b473bfabdca1be95612543d7b31376df30caa (diff) | |
| download | linux-10b302a297aee952949423aaec0749b757f34950.tar.bz2 | |
ARM: sun4i: dt: Move the aliases to the DTSI
The aliases are shared across boards are really belong to the DTSI.
Move them there.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10.dtsi | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index eb4d73b6a090..d4b081d6a167 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -18,10 +18,6 @@ model = "Mele A1000"; compatible = "mele,a1000", "allwinner,sun4i-a10"; - aliases { - serial0 = &uart0; - }; - soc@01c00000 { emac: ethernet@01c0b000 { pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index 425a7db898c5..f1c77e0ff44c 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -17,11 +17,6 @@ model = "Cubietech Cubieboard"; compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10"; - aliases { - serial0 = &uart0; - serial1 = &uart1; - }; - chosen { bootargs = "earlyprintk console=ttyS0,115200"; }; diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 3ba2b4675f03..0adbbe347646 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -17,6 +17,8 @@ aliases { ethernet0 = &emac; + serial0 = &uart0; + serial1 = &uart1; }; cpus { |