Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 87912e5c225641dfc2f17e84e98464b831d01d41..8986a91a6f31b82c2ef81f7b7a9b4c425425a9a6 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -1005,7 +1005,7 @@ choice
                  via SCIFA4 on Renesas SH-Mobile AG5 (SH73A0).
 
        config DEBUG_S3C_UART0
-               depends on PLAT_SAMSUNG
+               depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
                select DEBUG_S3C64XX_UART if ARCH_S3C64XX
@@ -1017,7 +1017,7 @@ choice
                  by the boot-loader before use.
 
        config DEBUG_S3C_UART1
-               depends on PLAT_SAMSUNG
+               depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
                select DEBUG_S3C64XX_UART if ARCH_S3C64XX
@@ -1029,7 +1029,7 @@ choice
                  by the boot-loader before use.
 
        config DEBUG_S3C_UART2
-               depends on PLAT_SAMSUNG
+               depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
                select DEBUG_S3C64XX_UART if ARCH_S3C64XX
@@ -1041,7 +1041,7 @@ choice
                  by the boot-loader before use.
 
        config DEBUG_S3C_UART3
-               depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210)
+               depends on ARCH_EXYNOS || ARCH_S5PV210
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C64XX_UART if ARCH_S3C64XX
                select DEBUG_S5PV210_UART if ARCH_S5PV210
@@ -1086,6 +1086,14 @@ choice
                  on SA-11x0 UART ports. The kernel will check for the first
                  enabled UART in a sequence 3-1-2.
 
+       config DEBUG_SD5203_UART
+               bool "Hisilicon SD5203 Debug UART"
+               depends on ARCH_SD5203
+               select DEBUG_UART_8250
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on SD5203 UART.
+
        config DEBUG_SOCFPGA_UART0
                depends on ARCH_SOCFPGA
                bool "Use SOCFPGA UART0 for low-level debug"
@@ -1497,6 +1505,16 @@ config DEBUG_S3C64XX_UART
 config DEBUG_S5PV210_UART
        bool
 
+config DEBUG_S3C_UART
+       depends on DEBUG_S3C2410_UART || DEBUG_S3C24XX_UART || \
+                  DEBUG_S3C64XX_UART ||  DEBUG_S5PV210_UART || \
+                  DEBUG_EXYNOS_UART
+       int
+       default "0" if DEBUG_S3C_UART0
+       default "1" if DEBUG_S3C_UART1
+       default "2" if DEBUG_S3C_UART2
+       default "3" if DEBUG_S3C_UART3
+
 config DEBUG_OMAP2PLUS_UART
        bool
        depends on ARCH_OMAP2PLUS
@@ -1650,6 +1668,7 @@ config DEBUG_UART_PHYS
        default 0x11006000 if DEBUG_MT6589_UART0
        default 0x11009000 if DEBUG_MT8135_UART3
        default 0x16000000 if DEBUG_INTEGRATOR
+       default 0x1600d000 if DEBUG_SD5203_UART
        default 0x18000300 if DEBUG_BCM_5301X
        default 0x18000400 if DEBUG_BCM_HR2
        default 0x18010000 if DEBUG_SIRFATLAS7_UART0
@@ -1852,7 +1871,7 @@ config DEBUG_UART_VIRT
        default 0xfec60000 if DEBUG_SIRFPRIMA2_UART1
        default 0xfec90000 if DEBUG_RK32_UART2
        default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
-       default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
+       default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_SD5203_UART
        default 0xfed60000 if DEBUG_RK29_UART0
        default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
        default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3