diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-23 20:19:36 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-23 20:19:36 +0300 |
| commit | fc1f61f1c0b71a1c21123502c99712ad5b7d8e79 (patch) | |
| tree | 7e64ddc156c1cf34e95b667ffc6277378f758c32 /arch/arm | |
| parent | 5462b10af11d0b334fe37883998e0f38b14127bb (diff) | |
| parent | bef6229f36c1c2ddae186f4e328c2359c1dad18d (diff) | |
| download | linux-fc1f61f1c0b71a1c21123502c99712ad5b7d8e79.tar.xz | |
Merge tag 'sunxi-core-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/soc
Allwinner core changes for 4.4
Add support for the Allwinner R8 SoC used in the CHIP.
* tag 'sunxi-core-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: sunxi: Add R8 support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 65bab2876343..8583a9ca86bd 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c @@ -26,10 +26,11 @@ static const char * const sunxi_board_dt_compat[] = { "allwinner,sun4i-a10", "allwinner,sun5i-a10s", "allwinner,sun5i-a13", + "allwinner,sun5i-r8", NULL, }; -DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") +DT_MACHINE_START(SUNXI_DT, "Allwinner sun4i/sun5i Families") .dt_compat = sunxi_board_dt_compat, .init_late = sunxi_dt_cpufreq_init, MACHINE_END |