ARM: debug: provide PL01x debug uart phys/virt address configuration options

Move the definition of the UART register addresses out of the platform
specific header files into the Kconfig files.

Acked-by: Ryan Mallon <rmallon@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

9 files changed, 7 insertions, 111 deletions

diff --git a/arch/arm/include/asm/hardware/debug-pl01x.S b/arch/arm/include/asm/hardware/debug-pl01x.S
index f9fd083eff63..9d1e286cecfd 100644
--- a/arch/arm/include/asm/hardware/debug-pl01x.S
+++ b/arch/arm/include/asm/hardware/debug-pl01x.S
@@ -12,6 +12,13 @@
 */
 #include <linux/amba/serial.h>
 
+#ifdef CONFIG_DEBUG_UART_PHYS
+                .macro  addruart, rp, rv, tmp
+                ldr     \rp, =CONFIG_DEBUG_UART_PHYS
+                ldr     \rv, =CONFIG_DEBUG_UART_VIRT
+                .endm
+#endif
+
                 .macro  senduart,rd,rx
                 strb    \rd, [\rx, #UART01x_DR]
                 .endm
diff --git a/arch/arm/include/debug/bcm2835.S b/arch/arm/include/debug/bcm2835.S
index aed9199bd847..726e06942933 100644
--- a/arch/arm/include/debug/bcm2835.S
+++ b/arch/arm/include/debug/bcm2835.S
@@ -10,13 +10,4 @@
  * published by the Free Software Foundation.
  *
  */
-
-#define BCM2835_DEBUG_PHYS 0x20201000
-#define BCM2835_DEBUG_VIRT 0xf0201000
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rp, =BCM2835_DEBUG_PHYS
-        ldr     \rv, =BCM2835_DEBUG_VIRT
-        .endm
-
 #include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/cns3xxx.S b/arch/arm/include/debug/cns3xxx.S
index d04c150baa1c..2d5fb519df2b 100644
--- a/arch/arm/include/debug/cns3xxx.S
+++ b/arch/arm/include/debug/cns3xxx.S
@@ -9,11 +9,4 @@
  * it under the terms of the GNU General Public License, Version 2, as
  * published by the Free Software Foundation.
  */
-
-                .macro  addruart,rp,rv,tmp
-                mov     \rp, #0x00009000
-                orr     \rv, \rp, #0xf0000000   @ virtual base
-                orr     \rp, \rp, #0x10000000
-                .endm
-
 #include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/highbank.S b/arch/arm/include/debug/highbank.S
index 8cad4322a5a2..3c6f63ff0d37 100644
--- a/arch/arm/include/debug/highbank.S
+++ b/arch/arm/include/debug/highbank.S
@@ -8,10 +8,4 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
-                .macro  addruart,rp,rv,tmp
-                ldr     \rv, =0xfee36000
-                ldr     \rp, =0xfff36000
-                .endm
-
 #include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/mxs.S b/arch/arm/include/debug/mxs.S
index d86951551ca1..8a10ed264b0f 100644
--- a/arch/arm/include/debug/mxs.S
+++ b/arch/arm/include/debug/mxs.S
@@ -10,18 +10,4 @@
  * published by the Free Software Foundation.
  *
  */
-
-#ifdef CONFIG_DEBUG_IMX23_UART
-#define UART_PADDR      0x80070000
-#elif defined (CONFIG_DEBUG_IMX28_UART)
-#define UART_PADDR      0x80074000
-#endif
-
-#define UART_VADDR      0xfe100000
-
-                .macro  addruart, rp, rv, tmp
-                ldr     \rp, =UART_PADDR        @ physical
-                ldr     \rv, =UART_VADDR        @ virtual
-                .endm
-
 #include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/nomadik.S b/arch/arm/include/debug/nomadik.S
index 735417922ce2..a6d238eba216 100644
--- a/arch/arm/include/debug/nomadik.S
+++ b/arch/arm/include/debug/nomadik.S
@@ -9,12 +9,4 @@
  * published by the Free Software Foundation.
  *
 */
-
-                .macro  addruart, rp, rv, tmp
-                mov     \rp, #0x00100000
-                add     \rp, \rp, #0x000fb000
-                add     \rv, \rp, #0xf0000000   @ virtual base
-                add     \rp, \rp, #0x10000000   @ physical base address
-                .endm
-
 #include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/nspire.S b/arch/arm/include/debug/nspire.S
index 9c2fbeceedd0..fc17e50cc6d4 100644
--- a/arch/arm/include/debug/nspire.S
+++ b/arch/arm/include/debug/nspire.S
@@ -8,14 +8,4 @@
  * published by the Free Software Foundation.
  *
  */
-#ifdef CONFIG_DEBUG_NSPIRE_CX_UART
-#define NSPIRE_EARLY_UART_PHYS_BASE        0x90020000
-#define NSPIRE_EARLY_UART_VIRT_BASE        0xfee20000
-
-.macro  addruart, rp, rv, tmp
-        ldr \rp, =(NSPIRE_EARLY_UART_PHYS_BASE)         @ physical base address
-        ldr \rv, =(NSPIRE_EARLY_UART_VIRT_BASE)         @ virtual base address
-.endm
-
 #include <asm/hardware/debug-pl01x.S>
-#endif
diff --git a/arch/arm/include/debug/u300.S b/arch/arm/include/debug/u300.S
index 6f04f08a203c..58b9d6286cd4 100644
--- a/arch/arm/include/debug/u300.S
+++ b/arch/arm/include/debug/u300.S
@@ -4,15 +4,4 @@
  * Debugging macro include header.
  * Author: Linus Walleij <linus.walleij@stericsson.com>
  */
-#define U300_SLOW_PER_PHYS_BASE         0xc0010000
-#define U300_SLOW_PER_VIRT_BASE         0xff000000
-
-        .macro  addruart, rp, rv, tmp
-        /* If we move the address using MMU, use this. */
-        ldr     \rp,      = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address
-        ldr     \rv,      = U300_SLOW_PER_VIRT_BASE @ MMU on, virtual address
-        orr     \rp, \rp, #0x00003000
-        orr     \rv, \rv, #0x00003000
-        .endm
-
 #include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/vexpress.S b/arch/arm/include/debug/vexpress.S
index acafb229e2b6..114bf4cc6ea1 100644
--- a/arch/arm/include/debug/vexpress.S
+++ b/arch/arm/include/debug/vexpress.S
@@ -48,50 +48,4 @@
                 .endm
 
 #include <asm/hardware/debug-pl01x.S>
-
-#elif defined(CONFIG_DEBUG_VEXPRESS_UART0_CA9)
-
-                .macro  addruart,rp,rv,tmp
-                mov     \rp, #DEBUG_LL_UART_OFFSET
-                orr     \rv, \rp, #DEBUG_LL_VIRT_BASE
-                orr     \rp, \rp, #DEBUG_LL_PHYS_BASE
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
-
-#elif defined(CONFIG_DEBUG_VEXPRESS_UART0_RS1)
-
-                .macro  addruart,rp,rv,tmp
-                mov     \rp, #DEBUG_LL_UART_OFFSET_RS1
-                orr     \rv, \rp, #DEBUG_LL_VIRT_BASE
-                orr     \rp, \rp, #DEBUG_LL_PHYS_BASE_RS1
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
-
-#elif defined(CONFIG_DEBUG_VEXPRESS_UART0_CRX)
-
-                .macro  addruart,rp,tmp,tmp2
-                ldr     \rp, =DEBUG_LL_UART_PHYS_CRX
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
-
-#else /* CONFIG_DEBUG_LL_UART_NONE */
-
-                .macro  addruart, rp, rv, tmp
-                /* Safe dummy values */
-                mov     \rp, #0
-                mov     \rv, #DEBUG_LL_VIRT_BASE
-                .endm
-
-                .macro  senduart,rd,rx
-                .endm
-
-                .macro  waituart,rd,rx
-                .endm
-
-                .macro  busyuart,rd,rx
-                .endm
-
 #endif