diff options
| author | Zoltan HERPAI <wigyori@uid0.hu> | 2014-03-06 00:09:30 +0000 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2014-03-06 00:09:30 +0000 |
| commit | a8ab50ee77d004e4a00cd6280cc1b542e57054b1 (patch) | |
| tree | 0a2be71f002d9dd9084a172a72bef22388f0ca0e /target/linux/sunxi/patches-3.13/220-dt-sun4i-move-aliases-to-dtsi.patch | |
| parent | 8911fab5ade7400cdb42c43f884b4a10141c159e (diff) | |
| download | master-187ad058-a8ab50ee77d004e4a00cd6280cc1b542e57054b1.tar.gz master-187ad058-a8ab50ee77d004e4a00cd6280cc1b542e57054b1.tar.bz2 master-187ad058-a8ab50ee77d004e4a00cd6280cc1b542e57054b1.zip | |
sunxi: driver refresh for 3.13
- update gmac / mmc / usb / ahci drivers to follow mainline dev trees
- add driver for spi
- update clock support
- update a31 support
- move to new DT compats where appropriate
- re-order patchqueue where needed
- verified working a20 smp
- move most DTSes off files/
- update defconfig
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39782 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-3.13/220-dt-sun4i-move-aliases-to-dtsi.patch')
| -rw-r--r-- | target/linux/sunxi/patches-3.13/220-dt-sun4i-move-aliases-to-dtsi.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-3.13/220-dt-sun4i-move-aliases-to-dtsi.patch b/target/linux/sunxi/patches-3.13/220-dt-sun4i-move-aliases-to-dtsi.patch new file mode 100644 index 0000000000..6dc1f1c66f --- /dev/null +++ b/target/linux/sunxi/patches-3.13/220-dt-sun4i-move-aliases-to-dtsi.patch @@ -0,0 +1,62 @@ +From 10b302a297aee952949423aaec0749b757f34950 Mon Sep 17 00:00:00 2001 +From: Maxime Ripard <maxime.ripard@free-electrons.com> +Date: Sun, 17 Nov 2013 10:03:04 +0100 +Subject: [PATCH] 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> +--- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ---- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 5 ----- + 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 eb4d73b..d4b081d 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 425a7db..f1c77e0 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 3ba2b46..0adbbe3 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 { +-- +1.8.5.5 + |