Merge SSB driver from tree at bu3sch.de, pulled 24/6

[openwrt.git] / target / linux / brcm47xx-2.6 / patches-2.6.22 / 230-ssb_arch_setup.patch

diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/230-ssb_arch_setup.patch b/target/linux/brcm47xx-2.6/patches-2.6.22/230-ssb_arch_setup.patch
new file mode 100644 (file)
index 0000000..8e97364
--- /dev/null
+++ b/target/linux/brcm47xx-2.6/patches-2.6.22/230-ssb_arch_setup.patch
@@ -0,0 +1,33 @@
+Index: linux-2.6.22-rc5/arch/mips/bcm947xx/setup.c
+===================================================================
+--- linux-2.6.22-rc5.orig/arch/mips/bcm947xx/setup.c   2007-06-24 19:51:21.000000000 +0100
++++ linux-2.6.22-rc5/arch/mips/bcm947xx/setup.c        2007-06-24 20:26:12.000000000 +0100
+@@ -107,13 +107,27 @@
+               sprom->r1.et1phyaddr = simple_strtoul(s, NULL, 10);
+ }
+ 
++static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariants *iv)
++{
++      char *s;
++      
++      // TODO
++      //iv->boardinfo.vendor = 
++      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);
++      return 0;
++}
++
+ void __init plat_mem_setup(void)
+ {
+       int i, err;
+       char *s;
+       struct ssb_mipscore *mcore;
+ 
+-      err = ssb_bus_ssbbus_register(&ssb, SSB_ENUM_BASE, bcm47xx_fill_sprom);
++      err = ssb_bus_ssbbus_register(&ssb, SSB_ENUM_BASE, bcm47xx_get_invariants);
+       if (err) {
+               const char *msg = "Failed to initialize SSB bus (err %d)\n";
+               cfe_printk(msg, err); /* Make sure the message gets out of the box. */