MIPS: Alchemy: get rid of superfluous UART definitions

Remove unused uart bit definitions and base macros.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 21 insertions, 23 deletions

diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c
index 5a9a4f9eba2e..195e5b3e8b41 100644
--- a/arch/mips/alchemy/common/platform.c
+++ b/arch/mips/alchemy/common/platform.c
@@ -20,38 +20,36 @@
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
 #include <asm/mach-au1x00/au1100_mmc.h>
 
-#define PORT(_base, _irq)                               \
-        {                                               \
-                .iobase         = _base,                \
-                .membase        = (void __iomem *)_base,\
-                .mapbase        = CPHYSADDR(_base),     \
-                .irq            = _irq,                 \
-                .regshift       = 2,                    \
-                .iotype         = UPIO_AU,              \
-                .flags          = UPF_SKIP_TEST         \
+#define PORT(_base, _irq)                                       \
+        {                                                       \
+                .mapbase        = _base,                        \
+                .irq            = _irq,                         \
+                .regshift       = 2,                            \
+                .iotype         = UPIO_AU,                      \
+                .flags          = UPF_SKIP_TEST | UPF_IOREMAP   \
         }
 
 static struct plat_serial8250_port au1x00_uart_data[] = {
 #if defined(CONFIG_SERIAL_8250_AU1X00)
 #if defined(CONFIG_SOC_AU1000)
-        PORT(UART0_ADDR, AU1000_UART0_INT),
-        PORT(UART1_ADDR, AU1000_UART1_INT),
-        PORT(UART2_ADDR, AU1000_UART2_INT),
-        PORT(UART3_ADDR, AU1000_UART3_INT),
+        PORT(UART0_PHYS_ADDR, AU1000_UART0_INT),
+        PORT(UART1_PHYS_ADDR, AU1000_UART1_INT),
+        PORT(UART2_PHYS_ADDR, AU1000_UART2_INT),
+        PORT(UART3_PHYS_ADDR, AU1000_UART3_INT),
 #elif defined(CONFIG_SOC_AU1500)
-        PORT(UART0_ADDR, AU1500_UART0_INT),
-        PORT(UART3_ADDR, AU1500_UART3_INT),
+        PORT(UART0_PHYS_ADDR, AU1500_UART0_INT),
+        PORT(UART3_PHYS_ADDR, AU1500_UART3_INT),
 #elif defined(CONFIG_SOC_AU1100)
-        PORT(UART0_ADDR, AU1100_UART0_INT),
-        PORT(UART1_ADDR, AU1100_UART1_INT),
-        PORT(UART3_ADDR, AU1100_UART3_INT),
+        PORT(UART0_PHYS_ADDR, AU1100_UART0_INT),
+        PORT(UART1_PHYS_ADDR, AU1100_UART1_INT),
+        PORT(UART3_PHYS_ADDR, AU1100_UART3_INT),
 #elif defined(CONFIG_SOC_AU1550)
-        PORT(UART0_ADDR, AU1550_UART0_INT),
-        PORT(UART1_ADDR, AU1550_UART1_INT),
-        PORT(UART3_ADDR, AU1550_UART3_INT),
+        PORT(UART0_PHYS_ADDR, AU1550_UART0_INT),
+        PORT(UART1_PHYS_ADDR, AU1550_UART1_INT),
+        PORT(UART3_PHYS_ADDR, AU1550_UART3_INT),
 #elif defined(CONFIG_SOC_AU1200)
-        PORT(UART0_ADDR, AU1200_UART0_INT),
-        PORT(UART1_ADDR, AU1200_UART1_INT),
+        PORT(UART0_PHYS_ADDR, AU1200_UART0_INT),
+        PORT(UART1_PHYS_ADDR, AU1200_UART1_INT),
 #endif
 #endif  /* CONFIG_SERIAL_8250_AU1X00 */
         { },