ixp4xx: Updated patches to include all upstream-merged ixp4xx patches

[openwrt.git] / target / linux / brcm47xx / files / arch / mips / bcm947xx / setup.c

diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
index 7801348..41d7b0b 100644 (file)
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
+++ b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
@@ -2,7 +2,7 @@
  *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
  *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
  *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
  *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
  *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
  *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>

- *  Copyright (C) 2006 Michael Buesch
+ *  Copyright (C) 2006-2008 Michael Buesch <mb@bu3sch.de>

  *
  *  This program is free software; you can redistribute  it and/or modify it
  *  under  the terms of  the GNU General  Public License as published by the
  *
  *  This program is free software; you can redistribute  it and/or modify it
  *  under  the terms of  the GNU General  Public License as published by the


@@ -38,6 +38,7 @@
 #include <asm/cfe.h>
 #include <linux/pm.h>
 #include <linux/ssb/ssb.h>
 #include <asm/cfe.h>
 #include <linux/pm.h>
 #include <linux/ssb/ssb.h>

+#include <linux/ssb/ssb_embedded.h>

 
 #include <nvram.h>
 
 
 #include <nvram.h>
 


@@ -46,6 +47,20 @@ extern void bcm47xx_time_init(void);
 
 struct ssb_bus ssb;
 
 
 struct ssb_bus ssb;
 

+
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+       int err;
+
+       err = ssb_pcibios_plat_dev_init(dev);
+       if (err) {
+               printk(KERN_ALERT "PCI: Failed to init device %s\n",
+                      pci_name(dev));
+       }
+
+       return err;
+}
+

 static void bcm47xx_machine_restart(char *command)
 {
        printk(KERN_ALERT "Please stand by while rebooting the system...\n");
 static void bcm47xx_machine_restart(char *command)
 {
        printk(KERN_ALERT "Please stand by while rebooting the system...\n");


@@ -55,7 +70,8 @@ static void bcm47xx_machine_restart(char *command)
         */
 
        /* Set the watchdog timer to reset immediately */
         */
 
        /* Set the watchdog timer to reset immediately */

-       ssb_chipco_watchdog_timer_set(&ssb.chipco, 1);
+       if (ssb_watchdog_timer_set(&ssb, 1))
+               printk(KERN_EMERG "SSB watchdog-triggered reboot failed!\n");

        while (1)
                cpu_relax();
 }
        while (1)
                cpu_relax();
 }


@@ -64,7 +80,8 @@ static void bcm47xx_machine_halt(void)
 {
        /* Disable interrupts and watchdog and spin forever */
        local_irq_disable();
 {
        /* Disable interrupts and watchdog and spin forever */
        local_irq_disable();

-       ssb_chipco_watchdog_timer_set(&ssb.chipco, 0);
+       if (ssb_watchdog_timer_set(&ssb, 0))
+               printk(KERN_EMERG "Failed to disable SSB watchdog!\n");

        while (1)
                cpu_relax();
 }
        while (1)
                cpu_relax();
 }


@@ -87,38 +104,77 @@ static void e_aton(char *str, char *dest)
 }
 
 static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
 }
 
 static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)

-{
-       // TODO
-}
-
-static void bcm47xx_fill_sprom_nvram(struct ssb_sprom *sprom)

 {
        char *s;
 
 {
        char *s;
 

-       memset(sprom, 0, sizeof(struct ssb_sprom));
-       
-       sprom->revision = 3;
+       memset(sprom, 0xFF, sizeof(struct ssb_sprom));
+
+       sprom->revision = 1;
+       if ((s = nvram_get("il0macaddr")))
+               e_aton(s, sprom->il0mac);

        if ((s = nvram_get("et0macaddr")))
        if ((s = nvram_get("et0macaddr")))

-               e_aton(s, sprom->r1.et0mac);
+               e_aton(s, sprom->et0mac);

        if ((s = nvram_get("et1macaddr")))
        if ((s = nvram_get("et1macaddr")))

-               e_aton(s, sprom->r1.et1mac);
+               e_aton(s, sprom->et1mac);

        if ((s = nvram_get("et0phyaddr")))
        if ((s = nvram_get("et0phyaddr")))

-               sprom->r1.et0phyaddr = simple_strtoul(s, NULL, 10);
+               sprom->et0phyaddr = simple_strtoul(s, NULL, 0);

        if ((s = nvram_get("et1phyaddr")))
        if ((s = nvram_get("et1phyaddr")))

-               sprom->r1.et1phyaddr = simple_strtoul(s, NULL, 10);
+               sprom->et1phyaddr = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("et0mdcport")))
+               sprom->et0mdcport = !!simple_strtoul(s, NULL, 10);
+       if ((s = nvram_get("et1mdcport")))
+               sprom->et1mdcport = !!simple_strtoul(s, NULL, 10);
+       if ((s = nvram_get("pa0b0")))
+               sprom->pa0b0 = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("pa0b1")))
+               sprom->pa0b1 = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("pa0b2")))
+               sprom->pa0b2 = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("pa1b0")))
+               sprom->pa1b0 = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("pa1b1")))
+               sprom->pa1b1 = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("pa1b2")))
+               sprom->pa1b2 = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("wl0gpio0")))
+               sprom->gpio0 = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("wl0gpio1")))
+               sprom->gpio1 = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("wl0gpio2")))
+               sprom->gpio2 = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("wl0gpio3")))
+               sprom->gpio3 = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("pa0maxpwr")))
+               sprom->maxpwr_bg = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("pa1maxpwr")))
+               sprom->maxpwr_a = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("pa0itssit")))
+               sprom->itssi_bg = simple_strtoul(s, NULL, 0);
+       if ((s = nvram_get("pa1itssit")))
+               sprom->itssi_a = simple_strtoul(s, NULL, 0);
+       sprom->boardflags_lo = 0;
+       if ((s = nvram_get("boardflags")))
+               sprom->boardflags_lo = simple_strtoul(s, NULL, 0);
+       sprom->boardflags_hi = 0;
+       if ((s = nvram_get("boardflags2")))
+               sprom->boardflags_hi = simple_strtoul(s, NULL, 0);

 }
 
 static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariants *iv)
 {
        char *s;
 }
 
 static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariants *iv)
 {
        char *s;

-       
-       // TODO
-       //iv->boardinfo.vendor = 
+
+       iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;

        if ((s = nvram_get("boardtype")))
                iv->boardinfo.type = (u16)simple_strtoul(s, NULL, 0);
        if ((s = nvram_get("boardrev")))
                iv->boardinfo.rev = (u16)simple_strtoul(s, NULL, 0);
        if ((s = nvram_get("boardtype")))
                iv->boardinfo.type = (u16)simple_strtoul(s, NULL, 0);
        if ((s = nvram_get("boardrev")))
                iv->boardinfo.rev = (u16)simple_strtoul(s, NULL, 0);

+

        bcm47xx_fill_sprom(&iv->sprom);
        bcm47xx_fill_sprom(&iv->sprom);

+
+       if ((s = nvram_get("cardbus")))
+               iv->has_cardbus_slot = !!simple_strtoul(s, NULL, 10);
+

        return 0;
 }
 
        return 0;
 }
 


@@ -136,10 +192,6 @@ void __init plat_mem_setup(void)
        }
        mcore = &ssb.mipscore;
 
        }
        mcore = &ssb.mipscore;
 

-       /* FIXME: the nvram init depends on the ssb being fully initializes,
-        * can't use the fill_sprom callback yet! */
-       bcm47xx_fill_sprom_nvram(&ssb.sprom);
-       

        s = nvram_get("kernel_args");
        if (s && !strncmp(s, "console=ttyS1", 13)) {
                struct ssb_serial_port port;
        s = nvram_get("kernel_args");
        if (s && !strncmp(s, "console=ttyS1", 13)) {
                struct ssb_serial_port port;


@@ -158,7 +210,7 @@ void __init plat_mem_setup(void)
                memset(&s, 0, sizeof(s));
                s.line = i;
                s.membase = port->regs;
                memset(&s, 0, sizeof(s));
                s.line = i;
                s.membase = port->regs;

-               s.irq = port->irq + 2;//FIXME?
+               s.irq = port->irq + 2;

                s.uartclk = port->baud_base;
                s.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
                s.iotype = SERIAL_IO_MEM;
                s.uartclk = port->baud_base;
                s.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
                s.iotype = SERIAL_IO_MEM;


@@ -171,8 +223,24 @@ void __init plat_mem_setup(void)
        _machine_restart = bcm47xx_machine_restart;
        _machine_halt = bcm47xx_machine_halt;
        pm_power_off = bcm47xx_machine_halt;
        _machine_restart = bcm47xx_machine_restart;
        _machine_halt = bcm47xx_machine_halt;
        pm_power_off = bcm47xx_machine_halt;

+       board_time_init = bcm47xx_time_init;
+}
+
+static int __init bcm47xx_register_gpiodev(void)
+{
+       static struct resource res = {
+               .start = 0xFFFFFFFF,
+       };
+       struct platform_device *pdev;
+
+       pdev = platform_device_register_simple("GPIODEV", 0, &res, 1);
+       if (!pdev) {
+               printk(KERN_ERR "bcm47xx: GPIODEV init failed\n");
+               return -ENODEV;
+       }

 
 

-       board_time_init = bcm47xx_time_init;//FIXME move into ssb
+       return 0;

 }
 }

+device_initcall(bcm47xx_register_gpiodev);

 
 EXPORT_SYMBOL(ssb);
 
 EXPORT_SYMBOL(ssb);