6 files changed, 15 insertions, 25 deletions

diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index f31c6698419c..cb6d85d7ff43 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -14,8 +14,8 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/hardware/dec21285.h>
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 7d7f576da202..9be11b0963f2 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -628,7 +628,7 @@ config SERIAL_MPSC_CONSOLE
 
 config SERIAL_PXA
         bool "PXA serial port support"
-        depends on ARM && ARCH_PXA
+        depends on ARCH_PXA || ARCH_MMP
         select SERIAL_CORE
         help
           If you have a machine based on an Intel XScale PXA2xx CPU you
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index 459f3420a429..80e76426131d 100644
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -38,9 +38,9 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/hardware/clps7111.h>
 
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index a50954612b60..9f460b175c50 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -1129,7 +1129,7 @@ static int serial_imx_probe(struct platform_device *pdev)
         sport->timer.function = imx_timeout;
         sport->timer.data     = (unsigned long)sport;
 
-        sport->clk = clk_get(&pdev->dev, "uart_clk");
+        sport->clk = clk_get(&pdev->dev, "uart");
         if (IS_ERR(sport->clk)) {
                 ret = PTR_ERR(sport->clk);
                 goto unmap;
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index f6e3b86bb0be..a48a8a13d87b 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -43,13 +43,7 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/clk.h>
-
-#include <asm/io.h>
-#include <mach/hardware.h>
-#include <asm/irq.h>
-#include <mach/pxa-regs.h>
-#include <mach/regs-uart.h>
-
+#include <linux/io.h>
 
 struct uart_pxa_port {
         struct uart_port        port;
@@ -491,7 +485,7 @@ serial_pxa_set_termios(struct uart_port *port, struct ktermios *termios,
          * Ensure the port will be enabled.
          * This is required especially for serial console.
          */
-        up->ier |= IER_UUE;
+        up->ier |= UART_IER_UUE;
 
         /*
          * Update the per-port timeout.
@@ -784,19 +778,15 @@ static int serial_pxa_probe(struct platform_device *dev)
         sport->port.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
         sport->port.uartclk = clk_get_rate(sport->clk);
 
-        /*
-         * Is it worth keeping this?
-         */
-        if (mmres->start == __PREG(FFUART))
-                sport->name = "FFUART";
-        else if (mmres->start == __PREG(BTUART))
-                sport->name = "BTUART";
-        else if (mmres->start == __PREG(STUART))
-                sport->name = "STUART";
-        else if (mmres->start == __PREG(HWUART))
-                sport->name = "HWUART";
-        else
+        switch (dev->id) {
+        case 0: sport->name = "FFUART"; break;
+        case 1: sport->name = "BTUART"; break;
+        case 2: sport->name = "STUART"; break;
+        case 3: sport->name = "HWUART"; break;
+        default:
                 sport->name = "???";
+                break;
+        }
 
         sport->port.membase = ioremap(mmres->start, mmres->end - mmres->start + 1);
         if (!sport->port.membase) {
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index b24a25ea6bc5..94530f01521e 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -36,8 +36,8 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <mach/hardware.h>
 #include <asm/mach/serial_sa1100.h>