Merge tag 'atlas7-lldebug-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/soc

Merge "CSR atlas7 debug ports for 3.20" from Barry Song:

add debug ports for CSRatlas7 SoC

Because Marco chip has never shipped to customers and has been replaced
by Atlas7, so we do the below
- drop Marco's debug port
- add debug ports for Atlas7

* tag 'atlas7-lldebug-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
  ARM: sirf: add two debug ports for CSRatlas7 SoC
  ARM: sirf: drop Marco low-level debug port

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 30 insertions, 7 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 7bd1bbccc43c..78ff56665ef1 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -931,16 +931,28 @@ choice
         config DEBUG_SIRFPRIMA2_UART1
                 bool "Kernel low-level debugging messages via SiRFprimaII UART1"
                 depends on ARCH_PRIMA2
+                select DEBUG_SIRFSOC_UART
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to the uart1 port on SiRFprimaII devices.
 
-        config DEBUG_SIRFMARCO_UART1
-                bool "Kernel low-level debugging messages via SiRFmarco UART1"
-                depends on ARCH_MARCO
+        config DEBUG_SIRFATLAS7_UART0
+                bool "Kernel low-level debugging messages via SiRFatlas7 UART0"
+                depends on ARCH_ATLAS7
+                select DEBUG_SIRFSOC_UART
                 help
                   Say Y here if you want the debug print routines to direct
-                  their output to the uart1 port on SiRFmarco devices.
+                  their output to the uart0 port on SiRFATLAS7 devices.The uart0
+                  is used on SiRFATLAS7 as a extra debug port.sometimes an extra
+                  debug port can be very useful.
+
+        config DEBUG_SIRFATLAS7_UART1
+                bool "Kernel low-level debugging messages via SiRFatlas7 UART1"
+                depends on ARCH_ATLAS7
+                select DEBUG_SIRFSOC_UART
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the uart1 port on SiRFATLAS7 devices.
 
         config STIH41X_DEBUG_ASC2
                 bool "Use StiH415/416 ASC2 UART for low-level debug"
@@ -1176,6 +1188,10 @@ config DEBUG_STI_UART
         bool
         depends on ARCH_STI
 
+config DEBUG_SIRFSOC_UART
+        bool
+        depends on ARCH_SIRF
+
 config DEBUG_LL_INCLUDE
         string
         default "debug/sa1100.S" if DEBUG_SA1100
@@ -1210,7 +1226,7 @@ config DEBUG_LL_INCLUDE
         default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
         default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART
         default "debug/s5pv210.S" if DEBUG_S5PV210_UART
-        default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
+        default "debug/sirf.S" if DEBUG_SIRFSOC_UART
         default "debug/sti.S" if DEBUG_STI_UART
         default "debug/tegra.S" if DEBUG_TEGRA_UART
         default "debug/ux500.S" if DEBUG_UX500_UART
@@ -1266,6 +1282,8 @@ config DEBUG_UART_PHYS
         default 0x11009000 if DEBUG_MT8135_UART3
         default 0x16000000 if ARCH_INTEGRATOR
         default 0x18000300 if DEBUG_BCM_5301X
+        default 0x18010000 if DEBUG_SIRFATLAS7_UART0
+        default 0x18020000 if DEBUG_SIRFATLAS7_UART1
         default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1
         default 0x20060000 if DEBUG_RK29_UART0
         default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
@@ -1292,6 +1310,7 @@ config DEBUG_UART_PHYS
         default 0x808c0000 if ARCH_EP93XX
         default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
         default 0xa9a00000 if DEBUG_MSM_UART
+        default 0xb0060000 if DEBUG_SIRFPRIMA2_UART1
         default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX
         default 0xc0013000 if DEBUG_U300_UART
         default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
@@ -1336,7 +1355,8 @@ config DEBUG_UART_PHYS
                 DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF2 || \
                 DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \
                 DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
-                DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART
+                DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \
+                DEBUG_SIRFSOC_UART
 
 config DEBUG_UART_VIRT
         hex "Virtual base address of debug UART"
@@ -1395,7 +1415,10 @@ config DEBUG_UART_VIRT
         default 0xfec02000 if DEBUG_SOCFPGA_UART
         default 0xfec12000 if DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE
         default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE
+        default 0xfec10000 if DEBUG_SIRFATLAS7_UART0
         default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
+        default 0xfec20000 if DEBUG_SIRFATLAS7_UART1
+        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
@@ -1415,7 +1438,7 @@ config DEBUG_UART_VIRT
         depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
                 DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
                 DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
-                DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART
+                DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || DEBUG_SIRFSOC_UART
 
 config DEBUG_UART_8250_SHIFT
         int "Register offset shift for the 8250 debug UART"