1 files changed, 15 insertions, 5 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index edaf62737bc2..b11ad54f8d17 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -590,7 +590,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
@@ -598,7 +598,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
@@ -606,7 +606,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
@@ -614,13 +614,21 @@ 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
@@ -1110,6 +1118,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
@@ -1167,6 +1176,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 0xfed60000 if DEBUG_RK29_UART0
@@ -1200,7 +1210,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"