diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2014-01-04 09:49:44 +0000 |
|---|---|---|
| committer | Zoltan Herpai <wigyori@uid0.hu> | 2014-01-04 09:49:44 +0000 |
| commit | 4a314d1805dcdca8041fd86431689c5437f3c10e (patch) | |
| tree | a9b4180908e24166de8ddd04405c5e41b512a984 /target/linux | |
| parent | 6b61e7786cb628939f7ee7c464eb186d525e0ab0 (diff) | |
| download | upstream-4a314d1805dcdca8041fd86431689c5437f3c10e.tar.gz upstream-4a314d1805dcdca8041fd86431689c5437f3c10e.tar.bz2 upstream-4a314d1805dcdca8041fd86431689c5437f3c10e.zip | |
sunxi: remove sun6i/7i split for now
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 39187
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/sunxi/patches-3.12/120-split-dt-for-sun6i-sun7i.patch | 56 |
1 files changed, 0 insertions, 56 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 deleted file mode 100644 index 439f7d99a1..0000000000 --- a/target/linux/sunxi/patches-3.12/120-split-dt-for-sun6i-sun7i.patch +++ /dev/null @@ -1,56 +0,0 @@ -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 - |