83 lines
2.4 KiB
Diff
83 lines
2.4 KiB
Diff
From a41121d789e236fd637ab49beb5ce7b48763613a Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Sun, 18 Jul 2010 14:59:24 +0200
|
|
Subject: [PATCH 4/5] MIPS: BCM47xx: Setup and register serial early
|
|
|
|
Swap the first and second serial if console=ttyS1 was set.
|
|
Set it up and register it for early serial support.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
arch/mips/Kconfig | 1 -
|
|
arch/mips/bcm47xx/setup.c | 37 ++++++++++++++++++++++++++++++++++++-
|
|
2 files changed, 36 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/mips/Kconfig
|
|
+++ b/arch/mips/Kconfig
|
|
@@ -65,7 +65,6 @@ config BCM47XX
|
|
select SSB_B43_PCI_BRIDGE if PCI
|
|
select SSB_PCICORE_HOSTMODE if PCI
|
|
select GENERIC_GPIO
|
|
- select SYS_HAS_EARLY_PRINTK
|
|
select CFE
|
|
help
|
|
Support for BCM47XX based boards
|
|
--- 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
|
|
|
|
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;
|