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>

3 files changed, 27 insertions, 0 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 8f90595069a1..3548612b0bfe 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -715,6 +715,14 @@ choice
                   Say Y here if you want kernel low-level debugging support
                   on Allwinner A1X based platforms on the UART1.
 
+        config DEBUG_SUNXI_R_UART
+                bool "Kernel low-level debugging messages via sunXi R_UART"
+                depends on MACH_SUN6I || MACH_SUN8I
+                select DEBUG_UART_8250
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Allwinner A31/A23 based platforms on the R_UART.
+
         config TEGRA_DEBUG_UART_AUTO_ODMDATA
                 bool "Kernel low-level debugging messages via Tegra UART via ODMDATA"
                 depends on ARCH_TEGRA
@@ -1043,6 +1051,7 @@ config DEBUG_UART_PHYS
         default 0x01c28400 if DEBUG_SUNXI_UART1
         default 0x01d0c000 if DEBUG_DAVINCI_DA8XX_UART1
         default 0x01d0d000 if DEBUG_DAVINCI_DA8XX_UART2
+        default 0x01f02800 if DEBUG_SUNXI_R_UART
         default 0x02530c00 if DEBUG_KEYSTONE_UART0
         default 0x02531000 if DEBUG_KEYSTONE_UART1
         default 0x03010fe0 if ARCH_RPC
@@ -1118,6 +1127,7 @@ config DEBUG_UART_VIRT
         default 0xf1600000 if ARCH_INTEGRATOR
         default 0xf1c28000 if DEBUG_SUNXI_UART0
         default 0xf1c28400 if DEBUG_SUNXI_UART1
+        default 0xf1f02800 if DEBUG_SUNXI_R_UART
         default 0xf2100000 if DEBUG_PXA_UART1
         default 0xf4090000 if ARCH_LPC32XX
         default 0xf4200000 if ARCH_GEMINI
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 0fbd4f156bfa..6434e3b62c13 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -35,4 +35,12 @@ config MACH_SUN7I
         select HAVE_ARM_ARCH_TIMER
         select SUN5I_HSTIMER
 
+config MACH_SUN8I
+        bool "Allwinner A23 (sun8i) SoCs support"
+        default ARCH_SUNXI
+        select ARCH_HAS_RESET_CONTROLLER
+        select ARM_GIC
+        select MFD_SUN6I_PRCM
+        select RESET_CONTROLLER
+
 endif
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