aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sunxi/sunxi.c
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-08-11 08:35:08 -0400
committerMaxime Ripard <maxime.ripard@free-electrons.com>2013-09-27 12:34:24 -0400
commit91a319779cb3a871d48e39cccf6cc72348eb1512 (patch)
treeecb561e040f31c1973ebb02b39792599d3c3952b /arch/arm/mach-sunxi/sunxi.c
parent272b98c6455f00884f0350f775c5342358ebb73f (diff)
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>
Diffstat (limited to 'arch/arm/mach-sunxi/sunxi.c')
-rw-r--r--arch/arm/mach-sunxi/sunxi.c24
1 files changed, 22 insertions, 2 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index e79fb3469341..e0641dd7aebb 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -133,8 +133,6 @@ static const char * const sunxi_board_dt_compat[] = {
133 "allwinner,sun4i-a10", 133 "allwinner,sun4i-a10",
134 "allwinner,sun5i-a10s", 134 "allwinner,sun5i-a10s",
135 "allwinner,sun5i-a13", 135 "allwinner,sun5i-a13",
136 "allwinner,sun6i-a31",
137 "allwinner,sun7i-a20",
138 NULL, 136 NULL,
139}; 137};
140 138
@@ -143,3 +141,25 @@ DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
143 .init_time = sunxi_timer_init, 141 .init_time = sunxi_timer_init,
144 .dt_compat = sunxi_board_dt_compat, 142 .dt_compat = sunxi_board_dt_compat,
145MACHINE_END 143MACHINE_END
144
145static const char * const sun6i_board_dt_compat[] = {
146 "allwinner,sun6i-a31",
147 NULL,
148};
149
150DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
151 .init_machine = sunxi_dt_init,
152 .init_time = sunxi_timer_init,
153 .dt_compat = sun6i_board_dt_compat,
154MACHINE_END
155
156static const char * const sun7i_board_dt_compat[] = {
157 "allwinner,sun7i-a20",
158 NULL,
159};
160
161DT_MACHINE_START(SUN7I_DT, "Allwinner sun7i (A20) Family")
162 .init_machine = sunxi_dt_init,
163 .init_time = sunxi_timer_init,
164 .dt_compat = sun7i_board_dt_compat,
165MACHINE_END