diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-03-10 10:56:30 -0400 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-08-16 17:19:24 -0400 |
commit | 2d7945100b1ade1de73ddc397c17d0c40b278fb4 (patch) | |
tree | 78e581906b80f7aa2c449a30a762f05ba6662efd /arch/arm/mach-sunxi | |
parent | 29d3d373e2a780b6e818f296ece6cc29742bc11f (diff) |
ARM: sunxi: Add the Allwinner A31 compatible to the machine definition
The Allwinner A31 is a quad-Cortex-A7 based SoC, which shares a lot of
IPs with the previous SoCs from Allwinner, like the PIO, I2C, UARTs,
timers, watchdog IPs, but also differs by dropping the WEMAC ethernet
controller and most notably dropping the in-house IRQ controller in
favor of a ARM GIC one.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/mach-sunxi')
-rw-r--r-- | arch/arm/mach-sunxi/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 5b045e302b43..3ab2f65f8a50 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig | |||
@@ -10,3 +10,5 @@ config ARCH_SUNXI | |||
10 | select SPARSE_IRQ | 10 | select SPARSE_IRQ |
11 | select SUN4I_TIMER | 11 | select SUN4I_TIMER |
12 | select PINCTRL_SUNXI | 12 | select PINCTRL_SUNXI |
13 | select ARM_GIC | ||
14 | select HAVE_SMP | ||
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 38a3c55527c8..11326d9f13da 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c | |||
@@ -96,6 +96,7 @@ static const char * const sunxi_board_dt_compat[] = { | |||
96 | "allwinner,sun4i-a10", | 96 | "allwinner,sun4i-a10", |
97 | "allwinner,sun5i-a10s", | 97 | "allwinner,sun5i-a10s", |
98 | "allwinner,sun5i-a13", | 98 | "allwinner,sun5i-a13", |
99 | "allwinner,sun6i-a31", | ||
99 | NULL, | 100 | NULL, |
100 | }; | 101 | }; |
101 | 102 | ||