summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sunxi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-20 17:34:33 +0400
committerArnd Bergmann <arnd@arndb.de>2013-06-20 17:34:33 +0400
commit46a3b0aa93a99de341e0ee0d8ecede3843780835 (patch)
tree3b85bf926123025fa6c5d10afdad7ad687f39829 /arch/arm/mach-sunxi
parent025304a517dce66b270f89a5d6a82191dd3838c6 (diff)
parent81265dfb1ccba0941e54a61c2473befe8c09edc0 (diff)
downloadlinux-46a3b0aa93a99de341e0ee0d8ecede3843780835.tar.xz
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 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/irqchip.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
@@ -110,6 +109,7 @@ static void __init sunxi_dt_init(void)
static const char * const sunxi_board_dt_compat[] = {
"allwinner,sun4i-a10",
+ "allwinner,sun5i-a10s",
"allwinner,sun5i-a13",
NULL,
};
@@ -117,7 +117,6 @@ static const char * const sunxi_board_dt_compat[] = {
DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
.init_machine = sunxi_dt_init,
.map_io = sunxi_map_io,
- .init_irq = irqchip_init,
.init_time = sunxi_timer_init,
.dt_compat = sunxi_board_dt_compat,
MACHINE_END