Merge tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...

[cascardo/linux.git] / arch / arm / Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 8f90595..e43b838 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -582,7 +582,7 @@ choice
                  on Rockchip based platforms.
 
        config DEBUG_RK3X_UART0
-               bool "Kernel low-level debugging messages via Rockchip RK3X UART0"
+               bool "Kernel low-level debugging messages via Rockchip RK30/RK31 UART0"
                depends on ARCH_ROCKCHIP
                select DEBUG_UART_8250
                help
@@ -590,7 +590,7 @@ choice
                  on Rockchip based platforms.
 
        config DEBUG_RK3X_UART1
-               bool "Kernel low-level debugging messages via Rockchip RK3X UART1"
+               bool "Kernel low-level debugging messages via Rockchip RK30/RK31 UART1"
                depends on ARCH_ROCKCHIP
                select DEBUG_UART_8250
                help
@@ -598,7 +598,7 @@ choice
                  on Rockchip based platforms.
 
        config DEBUG_RK3X_UART2
-               bool "Kernel low-level debugging messages via Rockchip RK3X UART2"
+               bool "Kernel low-level debugging messages via Rockchip RK30/RK31 UART2"
                depends on ARCH_ROCKCHIP
                select DEBUG_UART_8250
                help
@@ -606,64 +606,60 @@ choice
                  on Rockchip based platforms.
 
        config DEBUG_RK3X_UART3
-               bool "Kernel low-level debugging messages via Rockchip RK3X UART3"
+               bool "Kernel low-level debugging messages via Rockchip RK30/RK31 UART3"
                depends on ARCH_ROCKCHIP
                select DEBUG_UART_8250
                help
                  Say Y here if you want kernel low-level debugging support
                  on Rockchip based platforms.
 
+       config DEBUG_RK32_UART2
+               bool "Kernel low-level debugging messages via Rockchip RK32 UART2"
+               depends on ARCH_ROCKCHIP
+               select DEBUG_UART_8250
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on Rockchip RK32xx based platforms.
+
        config DEBUG_S3C_UART0
                depends on PLAT_SAMSUNG
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
-               bool "Use S3C UART 0 for low-level debug"
+               bool "Use Samsung S3C UART 0 for low-level debug"
                help
                  Say Y here if you want the debug print routines to direct
                  their output to UART 0. The port must have been initialised
                  by the boot-loader before use.
 
-                 The uncompressor code port configuration is now handled
-                 by CONFIG_S3C_LOWLEVEL_UART_PORT.
-
        config DEBUG_S3C_UART1
                depends on PLAT_SAMSUNG
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
-               bool "Use S3C UART 1 for low-level debug"
+               bool "Use Samsung S3C UART 1 for low-level debug"
                help
                  Say Y here if you want the debug print routines to direct
                  their output to UART 1. The port must have been initialised
                  by the boot-loader before use.
 
-                 The uncompressor code port configuration is now handled
-                 by CONFIG_S3C_LOWLEVEL_UART_PORT.
-
        config DEBUG_S3C_UART2
                depends on PLAT_SAMSUNG
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
-               bool "Use S3C UART 2 for low-level debug"
+               bool "Use Samsung S3C UART 2 for low-level debug"
                help
                  Say Y here if you want the debug print routines to direct
                  their output to UART 2. The port must have been initialised
                  by the boot-loader before use.
 
-                 The uncompressor code port configuration is now handled
-                 by CONFIG_S3C_LOWLEVEL_UART_PORT.
-
        config DEBUG_S3C_UART3
                depends on PLAT_SAMSUNG && ARCH_EXYNOS
                select DEBUG_EXYNOS_UART
-               bool "Use S3C UART 3 for low-level debug"
+               bool "Use Samsung S3C UART 3 for low-level debug"
                help
                  Say Y here if you want the debug print routines to direct
                  their output to UART 3. The port must have been initialised
                  by the boot-loader before use.
 
-                 The uncompressor code port configuration is now handled
-                 by CONFIG_S3C_LOWLEVEL_UART_PORT.
-
        config DEBUG_S3C2410_UART0
                depends on ARCH_S3C24XX
                select DEBUG_S3C2410_UART
@@ -1096,6 +1092,7 @@ config DEBUG_UART_PHYS
        default 0xf991e000 if DEBUG_QCOM_UARTDM
        default 0xfcb00000 if DEBUG_HI3620_UART
        default 0xfe800000 if ARCH_IOP32X
+       default 0xff690000 if DEBUG_RK32_UART2
        default 0xffc02000 if DEBUG_SOCFPGA_UART
        default 0xffd82340 if ARCH_IOP13XX
        default 0xfff36000 if DEBUG_HIGHBANK_UART
@@ -1152,6 +1149,7 @@ config DEBUG_UART_VIRT
        default 0xfec02000 if DEBUG_SOCFPGA_UART
        default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE
        default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
+       default 0xfec90000 if DEBUG_RK32_UART2
        default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
        default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
        default 0xfed12000 if ARCH_KIRKWOOD
@@ -1186,7 +1184,7 @@ config DEBUG_UART_8250_WORD
                ARCH_KEYSTONE || \
                DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \
                DEBUG_DAVINCI_DA8XX_UART2 || \
-               DEBUG_BCM_KONA_UART
+               DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2
 
 config DEBUG_UART_8250_FLOW_CONTROL
        bool "Enable flow control for 8250 UART"