target/linux/brcm47xx/patches-2.6.22/230-ssb_arch_setup.patch

   1 Index: linux-2.6.22-rc5/arch/mips/bcm947xx/setup.c
   2 ===================================================================
   3 --- linux-2.6.22-rc5.orig/arch/mips/bcm947xx/setup.c    2007-06-24 19:51:21.000000000 +0100
   4 +++ linux-2.6.22-rc5/arch/mips/bcm947xx/setup.c 2007-06-24 20:26:12.000000000 +0100
   5 @@ -107,13 +107,27 @@
   6                 sprom->r1.et1phyaddr = simple_strtoul(s, NULL, 10);
   7  }
   8
   9 +static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariants *iv)
  10 +{
  11 +       char *s;
  12 +
  13 +       // TODO
  14 +       //iv->boardinfo.vendor =
  15 +       if ((s = nvram_get("boardtype")))
  16 +               iv->boardinfo.type = (u16)simple_strtoul(s, NULL, 0);
  17 +       if ((s = nvram_get("boardrev")))
  18 +               iv->boardinfo.rev = (u16)simple_strtoul(s, NULL, 0);
  19 +       bcm47xx_fill_sprom(&iv->sprom);
  20 +       return 0;
  21 +}
  22 +
  23  void __init plat_mem_setup(void)
  24  {
  25         int i, err;
  26         char *s;
  27         struct ssb_mipscore *mcore;
  28
  29 -       err = ssb_bus_ssbbus_register(&ssb, SSB_ENUM_BASE, bcm47xx_fill_sprom);
  30 +       err = ssb_bus_ssbbus_register(&ssb, SSB_ENUM_BASE, bcm47xx_get_invariants);
  31         if (err) {
  32                 const char *msg = "Failed to initialize SSB bus (err %d)\n";
  33                 cfe_printk(msg, err); /* Make sure the message gets out of the box. */