linux-mips
[Top] [All Lists]

[PATCH 4/4] MIPS: BCM47xx: Setup and register serial early

To: ralf@linux-mips.org, linux-mips@linux-mips.org
Subject: [PATCH 4/4] MIPS: BCM47xx: Setup and register serial early
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 27 Jul 2010 22:12:46 +0200
Cc: Hauke Mehrtens <hauke@hauke-m.de>
In-reply-to: <1280261566-8247-1-git-send-email-hauke@hauke-m.de>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1280261566-8247-1-git-send-email-hauke@hauke-m.de>
Sender: linux-mips-bounce@linux-mips.org
Swap the first and second serial if console=ttyS1 was set.
Set it up and register it for early serial support.

This patch has been in OpenWRT for a long time.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 arch/mips/bcm47xx/setup.c |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 deletions(-)

diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 516ac89..a40d88e 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -28,6 +28,8 @@
 #include <linux/types.h>
 #include <linux/ssb/ssb.h>
 #include <linux/ssb/ssb_embedded.h>
+#include <linux/serial.h>
+#include <linux/serial_8250.h>
 #include <asm/bootinfo.h>
 #include <asm/reboot.h>
 #include <asm/time.h>
@@ -190,12 +192,45 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus,
 
 void __init plat_mem_setup(void)
 {
-       int err;
+       int i, err;
+       char buf[100];
+       struct ssb_mipscore *mcore;
 
        err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,
                                      bcm47xx_get_invariants);
        if (err)
                panic("Failed to initialize SSB bus (err %d)\n", err);
+       mcore = &ssb_bcm47xx.mipscore;
+
+       nvram_getenv("kernel_args", buf, sizeof(buf));
+       if (!strncmp(buf, "console=ttyS1", 13)) {
+               struct ssb_serial_port port;
+
+               printk(KERN_DEBUG "Swapping serial ports!\n");
+               /* swap serial ports */
+               memcpy(&port, &mcore->serial_ports[0], sizeof(port));
+               memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1],
+                      sizeof(port));
+               memcpy(&mcore->serial_ports[1], &port, sizeof(port));
+       }
+
+       for (i = 0; i < mcore->nr_serial_ports; i++) {
+               struct ssb_serial_port *port = &(mcore->serial_ports[i]);
+               struct uart_port s;
+
+               memset(&s, 0, sizeof(s));
+               s.line = i;
+               s.mapbase = (unsigned int) port->regs;
+               s.membase = port->regs;
+               s.irq = port->irq + 2;
+               s.uartclk = port->baud_base;
+               s.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
+               s.iotype = SERIAL_IO_MEM;
+               s.regshift = port->reg_shift;
+
+               early_serial_setup(&s);
+       }
+       printk(KERN_DEBUG "Serial init done.\n");
 
        _machine_restart = bcm47xx_machine_restart;
        _machine_halt = bcm47xx_machine_halt;
-- 
1.7.0.4


<Prev in Thread] Current Thread [Next in Thread>