target/linux/brcm47xx/patches-2.6.34/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch

   1 From 9be402f069cc259ad5795b77567d66c4e7f6bef6 Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Sun, 18 Jul 2010 14:59:24 +0200
   4 Subject: [PATCH 4/6] MIPS: BCM47xx: Setup and register serial early
   5
   6 Swap the first and second serial if console=ttyS1 was set.
   7 Set it up and register it for early serial support.
   8
   9 This patch has been in OpenWRT for a long time.
  10
  11 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  12 ---
  13  arch/mips/bcm47xx/setup.c |   39 ++++++++++++++++++++++++++++++++++++++-
  14  1 files changed, 38 insertions(+), 1 deletions(-)
  15
  16 --- a/arch/mips/bcm47xx/setup.c
  17 +++ b/arch/mips/bcm47xx/setup.c
  18 @@ -28,6 +28,8 @@
  19  #include <linux/types.h>
  20  #include <linux/ssb/ssb.h>
  21  #include <linux/ssb/ssb_embedded.h>
  22 +#include <linux/serial.h>
  23 +#include <linux/serial_8250.h>
  24  #include <asm/bootinfo.h>
  25  #include <asm/reboot.h>
  26  #include <asm/time.h>
  27 @@ -190,12 +192,47 @@ static int bcm47xx_get_invariants(struct
  28
  29  void __init plat_mem_setup(void)
  30  {
  31 -       int err;
  32 +       int i, err;
  33 +       char buf[100];
  34 +       struct ssb_mipscore *mcore;
  35
  36         err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,
  37                                       bcm47xx_get_invariants);
  38         if (err)
  39                 panic("Failed to initialize SSB bus (err %d)\n", err);
  40 +       mcore = &ssb_bcm47xx.mipscore;
  41 +
  42 +       if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0 ||
  43 +           cfe_getenv("kernel_args", buf, sizeof(buf)) >= 0) {
  44 +               if (strstr(buf, "console=ttyS1")) {
  45 +                       struct ssb_serial_port port;
  46 +
  47 +                       printk(KERN_DEBUG "Swapping serial ports!\n");
  48 +                       /* swap serial ports */
  49 +                       memcpy(&port, &mcore->serial_ports[0], sizeof(port));
  50 +                       memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1],
  51 +                              sizeof(port));
  52 +                       memcpy(&mcore->serial_ports[1], &port, sizeof(port));
  53 +               }
  54 +       }
  55 +
  56 +       for (i = 0; i < mcore->nr_serial_ports; i++) {
  57 +               struct ssb_serial_port *port = &(mcore->serial_ports[i]);
  58 +               struct uart_port s;
  59 +
  60 +               memset(&s, 0, sizeof(s));
  61 +               s.line = i;
  62 +               s.mapbase = (unsigned int) port->regs;
  63 +               s.membase = port->regs;
  64 +               s.irq = port->irq + 2;
  65 +               s.uartclk = port->baud_base;
  66 +               s.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
  67 +               s.iotype = SERIAL_IO_MEM;
  68 +               s.regshift = port->reg_shift;
  69 +
  70 +               early_serial_setup(&s);
  71 +       }
  72 +       printk(KERN_DEBUG "Serial init done.\n");
  73
  74         _machine_restart = bcm47xx_machine_restart;
  75         _machine_halt = bcm47xx_machine_halt;