aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sunxi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-20 09:34:33 -0400
committerArnd Bergmann <arnd@arndb.de>2013-06-20 09:34:33 -0400
commit46a3b0aa93a99de341e0ee0d8ecede3843780835 (patch)
tree3b85bf926123025fa6c5d10afdad7ad687f39829 /arch/arm/mach-sunxi
parent025304a517dce66b270f89a5d6a82191dd3838c6 (diff)
parent81265dfb1ccba0941e54a61c2473befe8c09edc0 (diff)
Merge tag 'sunxi-core-for-3.11-2' of git://github.com/mripard/linux into next/soc
From Maxime Ripard: Allwinner platform additions, take 2 Adds machine support for the Allwinner A10s SoC * tag 'sunxi-core-for-3.11-2' of git://github.com/mripard/linux: ARM: sunxi: Add Allwinner A10s machine compatible Depends on the sunxi/cleanup branch Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-sunxi')
-rw-r--r--arch/arm/mach-sunxi/sunxi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 706ce35396b8..a42d8743ba7f 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -14,7 +14,6 @@
14#include <linux/delay.h> 14#include <linux/delay.h>
15#include <linux/kernel.h> 15#include <linux/kernel.h>
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/irqchip.h>
18#include <linux/of_address.h> 17#include <linux/of_address.h>
19#include <linux/of_irq.h> 18#include <linux/of_irq.h>
20#include <linux/of_platform.h> 19#include <linux/of_platform.h>
@@ -110,6 +109,7 @@ static void __init sunxi_dt_init(void)
110 109
111static const char * const sunxi_board_dt_compat[] = { 110static const char * const sunxi_board_dt_compat[] = {
112 "allwinner,sun4i-a10", 111 "allwinner,sun4i-a10",
112 "allwinner,sun5i-a10s",
113 "allwinner,sun5i-a13", 113 "allwinner,sun5i-a13",
114 NULL, 114 NULL,
115}; 115};
@@ -117,7 +117,6 @@ static const char * const sunxi_board_dt_compat[] = {
117DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") 117DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
118 .init_machine = sunxi_dt_init, 118 .init_machine = sunxi_dt_init,
119 .map_io = sunxi_map_io, 119 .map_io = sunxi_map_io,
120 .init_irq = irqchip_init,
121 .init_time = sunxi_timer_init, 120 .init_time = sunxi_timer_init,
122 .dt_compat = sunxi_board_dt_compat, 121 .dt_compat = sunxi_board_dt_compat,
123MACHINE_END 122MACHINE_END