Merge tag 'v3.11-rockchip-basics' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc

From Heiko Stuebner:

Adds basic support for Rockchip Cortex-A9 SoCs.

* tag 'v3.11-rockchip-basics' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm: add basic support for Rockchip RK3066a boards
  arm: add debug uarts for rockchip rk29xx and rk3xxx series
  arm: Add basic clocks for Rockchip rk3066a SoCs
  clocksource: dw_apb_timer_of: use clocksource_of_init
  clocksource: dw_apb_timer_of: select DW_APB_TIMER
  clocksource: dw_apb_timer_of: add clock-handling
  clocksource: dw_apb_timer_of: enable the use the clocksource as sched clock

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 34 insertions, 0 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 394d2a4064e1..ab95f07e1541 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -399,6 +399,13 @@ choice
                   their output to the standard serial port on the RealView
                   PB1176 platform.
 
+        config DEBUG_ROCKCHIP_UART
+                bool "Kernel low-level debugging messages via Rockchip UART"
+                depends on ARCH_ROCKCHIP
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Rockchip based platforms.
+
         config DEBUG_S3C_UART0
                 depends on PLAT_SAMSUNG
                 select DEBUG_EXYNOS_UART if ARCH_EXYNOS
@@ -643,6 +650,32 @@ endchoice
 
 choice
         prompt "Low-level debug console UART"
+        depends on DEBUG_ROCKCHIP_UART
+
+        config DEBUG_RK29_UART0
+                bool "RK29 UART0"
+
+        config DEBUG_RK29_UART1
+                bool "RK29 UART1"
+
+        config DEBUG_RK29_UART2
+                bool "RK29 UART2"
+
+        config DEBUG_RK3X_UART0
+                bool "RK3X UART0"
+
+        config DEBUG_RK3X_UART1
+                bool "RK3X UART1"
+
+        config DEBUG_RK3X_UART2
+                bool "RK3X UART2"
+
+        config DEBUG_RK3X_UART3
+                bool "RK3X UART3"
+endchoice
+
+choice
+        prompt "Low-level debug console UART"
         depends on DEBUG_LL && DEBUG_TEGRA_UART
 
         config TEGRA_DEBUG_UART_AUTO_ODMDATA
@@ -697,6 +730,7 @@ config DEBUG_LL_INCLUDE
         default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
         default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \
                                  DEBUG_MMP_UART3
+        default "debug/rockchip.S" if DEBUG_ROCKCHIP_UART
         default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
         default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
         default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1