3 files changed, 27 insertions, 1 deletions

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 422ebea96a64..4506e405c8f3 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -450,6 +450,18 @@ static unsigned int mem32_serial_in(struct uart_port *p, int offset)
         return readl(p->membase + offset);
 }
 
+static void mem32be_serial_out(struct uart_port *p, int offset, int value)
+{
+        offset = offset << p->regshift;
+        iowrite32be(value, p->membase + offset);
+}
+
+static unsigned int mem32be_serial_in(struct uart_port *p, int offset)
+{
+        offset = offset << p->regshift;
+        return ioread32be(p->membase + offset);
+}
+
 static unsigned int io_serial_in(struct uart_port *p, int offset)
 {
         offset = offset << p->regshift;
@@ -488,6 +500,11 @@ static void set_io_from_upio(struct uart_port *p)
                 p->serial_out = mem32_serial_out;
                 break;
 
+        case UPIO_MEM32BE:
+                p->serial_in = mem32be_serial_in;
+                p->serial_out = mem32be_serial_out;
+                break;
+
 #if defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_SERIAL_8250_RT288X)
         case UPIO_AU:
                 p->serial_in = au_serial_in;
@@ -513,6 +530,7 @@ serial_port_out_sync(struct uart_port *p, int offset, int value)
         switch (p->iotype) {
         case UPIO_MEM:
         case UPIO_MEM32:
+        case UPIO_MEM32BE:
         case UPIO_AU:
                 p->serial_out(p, offset, value);
                 p->serial_in(p, UART_LCR);      /* safe, no side-effects */
@@ -2748,6 +2766,7 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
         case UPIO_AU:
         case UPIO_TSI:
         case UPIO_MEM32:
+        case UPIO_MEM32BE:
         case UPIO_MEM:
                 if (!port->mapbase)
                         break;
@@ -2784,6 +2803,7 @@ static void serial8250_release_std_resource(struct uart_8250_port *up)
         case UPIO_AU:
         case UPIO_TSI:
         case UPIO_MEM32:
+        case UPIO_MEM32BE:
         case UPIO_MEM:
                 if (!port->mapbase)
                         break;
diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c
index 8e119682266a..6c0fd8b9d1c3 100644
--- a/drivers/tty/serial/8250/8250_early.c
+++ b/drivers/tty/serial/8250/8250_early.c
@@ -42,6 +42,8 @@ unsigned int __weak __init serial8250_early_in(struct uart_port *port, int offse
                 return readb(port->membase + offset);
         case UPIO_MEM32:
                 return readl(port->membase + (offset << 2));
+        case UPIO_MEM32BE:
+                return ioread32be(port->membase + (offset << 2));
         case UPIO_PORT:
                 return inb(port->iobase + offset);
         default:
@@ -58,6 +60,9 @@ void __weak __init serial8250_early_out(struct uart_port *port, int offset, int
         case UPIO_MEM32:
                 writel(value, port->membase + (offset << 2));
                 break;
+        case UPIO_MEM32BE:
+                iowrite32be(value, port->membase + (offset << 2));
+                break;
         case UPIO_PORT:
                 outb(value, port->iobase + offset);
                 break;
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index aa00154c4a6d..5b73afb9f9f3 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -116,7 +116,8 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
                         port->iotype = UPIO_MEM;
                         break;
                 case 4:
-                        port->iotype = UPIO_MEM32;
+                        port->iotype = of_device_is_big_endian(np) ?
+                                       UPIO_MEM32BE : UPIO_MEM32;
                         break;
                 default:
                         dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n",