diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 12:22:47 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 12:22:47 -0700 |
| commit | 7b2a428a33411dd9d79ee836b6e72fad2dbbb365 (patch) | |
| tree | c2b11f6d0e6dac7dce21ad4f9c593a712dc29c8b /arch/arm/mach-sunxi/sunxi.c | |
| parent | b40abaf07fa19c5aa3e649369ed8e0f9df1d2eda (diff) | |
| parent | 5ba1657ecdee507df4adcd05b533d09e9934fc11 (diff) | |
Merge tag 'sunxi-core-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/soc
Merge "Allwinner core additions for 3.17" from Maxime Ripard:
Nothing very fancy here, only the introduction from the new Allwinner A23 SoC.
* tag 'sunxi-core-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: sunxi: select MFD_SUN6I_PRCM when sun8i arch support is enabled
ARM: sunxi: Add earlyprintk support using R_UART (sun6i/sun8i)
ARM: sunxi: Introduce Allwinner A23 support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-sunxi/sunxi.c')
| -rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 3f9587bb51f6..4d09469320c8 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c @@ -53,3 +53,12 @@ static const char * const sun7i_board_dt_compat[] = { DT_MACHINE_START(SUN7I_DT, "Allwinner sun7i (A20) Family") .dt_compat = sun7i_board_dt_compat, MACHINE_END + +static const char * const sun8i_board_dt_compat[] = { + "allwinner,sun8i-a23", + NULL, +}; + +DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i (A23) Family") + .dt_compat = sun8i_board_dt_compat, +MACHINE_END |