aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-3.12/120-split-dt-for-sun6i-sun7i.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2013-11-14 23:12:52 +0000
committerZoltan Herpai <wigyori@uid0.hu>2013-11-14 23:12:52 +0000
commitf58bfd1df4e4a9b84a0e94691986c38bab6d8730 (patch)
tree9efce69525f7b07a108c03ba53b6721ebb1c8be2 /target/linux/sunxi/patches-3.12/120-split-dt-for-sun6i-sun7i.patch
parent2077361f128ff32dd6bb9fed7a4b3cd813863a9c (diff)
downloadupstream-f58bfd1df4e4a9b84a0e94691986c38bab6d8730.tar.gz
upstream-f58bfd1df4e4a9b84a0e94691986c38bab6d8730.tar.bz2
upstream-f58bfd1df4e4a9b84a0e94691986c38bab6d8730.zip
sunxi: rework target - update kernel to 3.12 - add patches for clocks, i2c, usb, sid, rtc - support common image for A10/A13/A20 - add support for a couple boards - most drivers are configured into the kernel as of now
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> SVN-Revision: 38811
Diffstat (limited to 'target/linux/sunxi/patches-3.12/120-split-dt-for-sun6i-sun7i.patch')
-rw-r--r--target/linux/sunxi/patches-3.12/120-split-dt-for-sun6i-sun7i.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-3.12/120-split-dt-for-sun6i-sun7i.patch b/target/linux/sunxi/patches-3.12/120-split-dt-for-sun6i-sun7i.patch
new file mode 100644
index 0000000000..439f7d99a1
--- /dev/null
+++ b/target/linux/sunxi/patches-3.12/120-split-dt-for-sun6i-sun7i.patch
@@ -0,0 +1,56 @@
+From eac8f640c624e83ef2ae267efc0769e086a64059 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sun, 11 Aug 2013 14:35:08 +0200
+Subject: [PATCH] ARM: sunxi: Split out the DT machines for sun6i and sun7i
+
+The A20 and A31 SMP code have a different way of bringing up a new core.
+This will prevent us from using the same set of smp_operations for the
+two SoCs family.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/mach-sunxi/sunxi.c | 24 ++++++++++++++++++++++--
+ 1 file changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
+index e79fb34..e0641dd 100644
+--- a/arch/arm/mach-sunxi/sunxi.c
++++ b/arch/arm/mach-sunxi/sunxi.c
+@@ -133,8 +133,6 @@ static void __init sunxi_dt_init(void)
+ "allwinner,sun4i-a10",
+ "allwinner,sun5i-a10s",
+ "allwinner,sun5i-a13",
+- "allwinner,sun6i-a31",
+- "allwinner,sun7i-a20",
+ NULL,
+ };
+
+@@ -143,3 +141,25 @@ static void __init sunxi_dt_init(void)
+ .init_time = sunxi_timer_init,
+ .dt_compat = sunxi_board_dt_compat,
+ MACHINE_END
++
++static const char * const sun6i_board_dt_compat[] = {
++ "allwinner,sun6i-a31",
++ NULL,
++};
++
++DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
++ .init_machine = sunxi_dt_init,
++ .init_time = sunxi_timer_init,
++ .dt_compat = sun6i_board_dt_compat,
++MACHINE_END
++
++static const char * const sun7i_board_dt_compat[] = {
++ "allwinner,sun7i-a20",
++ NULL,
++};
++
++DT_MACHINE_START(SUN7I_DT, "Allwinner sun7i (A20) Family")
++ .init_machine = sunxi_dt_init,
++ .init_time = sunxi_timer_init,
++ .dt_compat = sun7i_board_dt_compat,
++MACHINE_END
+--
+1.8.4
+