1 From 10b302a297aee952949423aaec0749b757f34950 Mon Sep 17 00:00:00 2001
2 From: Maxime Ripard <maxime.ripard@free-electrons.com>
3 Date: Sun, 17 Nov 2013 10:03:04 +0100
4 Subject: [PATCH] ARM: sun4i: dt: Move the aliases to the DTSI
6 The aliases are shared across boards are really belong to the DTSI.
9 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
11 arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ----
12 arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 5 -----
13 arch/arm/boot/dts/sun4i-a10.dtsi | 2 ++
14 3 files changed, 2 insertions(+), 9 deletions(-)
16 diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
17 index eb4d73b..d4b081d 100644
18 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
19 +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
22 compatible = "mele,a1000", "allwinner,sun4i-a10";
29 emac: ethernet@01c0b000 {
30 pinctrl-names = "default";
31 diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
32 index 425a7db..f1c77e0 100644
33 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
34 +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
36 model = "Cubietech Cubieboard";
37 compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10";
45 bootargs = "earlyprintk console=ttyS0,115200";
47 diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
48 index 3ba2b46..0adbbe3 100644
49 --- a/arch/arm/boot/dts/sun4i-a10.dtsi
50 +++ b/arch/arm/boot/dts/sun4i-a10.dtsi