From: Olof Johansson Date: Wed, 21 Jan 2015 22:26:53 +0000 (-0800) Subject: Merge tag 'atlas7-lldebug-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0766c17fb97b1d11abed452b923a7460e8b64dce;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge tag 'atlas7-lldebug-for-3.20' of git://git./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 --- 0766c17fb97b1d11abed452b923a7460e8b64dce diff --cc arch/arm/Kconfig.debug index 7bd1bbccc43c,0c2e6cd399b6..78ff56665ef1 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@@ -1393,9 -1397,11 +1413,12 @@@ config DEBUG_UART_VIR default 0xfeb30c00 if DEBUG_KEYSTONE_UART0 default 0xfeb31000 if DEBUG_KEYSTONE_UART1 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 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE 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