target/linux/generic/patches-3.9/020-ssb_update.patch

   1 --- a/drivers/ssb/driver_chipcommon.c
   2 +++ b/drivers/ssb/driver_chipcommon.c
   3 @@ -354,7 +354,7 @@ void ssb_chipcommon_init(struct ssb_chip
   4
   5         if (cc->dev->id.revision >= 11)
   6                 cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
   7 -       ssb_dprintk(KERN_INFO PFX "chipcommon status is 0x%x\n", cc->status);
   8 +       ssb_dbg("chipcommon status is 0x%x\n", cc->status);
   9
  10         if (cc->dev->id.revision >= 20) {
  11                 chipco_write32(cc, SSB_CHIPCO_GPIOPULLUP, 0);
  12 --- a/drivers/ssb/driver_chipcommon_pmu.c
  13 +++ b/drivers/ssb/driver_chipcommon_pmu.c
  14 @@ -110,8 +110,8 @@ static void ssb_pmu0_pllinit_r0(struct s
  15                 return;
  16         }
  17
  18 -       ssb_printk(KERN_INFO PFX "Programming PLL to %u.%03u MHz\n",
  19 -                  (crystalfreq / 1000), (crystalfreq % 1000));
  20 +       ssb_info("Programming PLL to %u.%03u MHz\n",
  21 +                crystalfreq / 1000, crystalfreq % 1000);
  22
  23         /* First turn the PLL off. */
  24         switch (bus->chip_id) {
  25 @@ -138,7 +138,7 @@ static void ssb_pmu0_pllinit_r0(struct s
  26         }
  27         tmp = chipco_read32(cc, SSB_CHIPCO_CLKCTLST);
  28         if (tmp & SSB_CHIPCO_CLKCTLST_HAVEHT)
  29 -               ssb_printk(KERN_EMERG PFX "Failed to turn the PLL off!\n");
  30 +               ssb_emerg("Failed to turn the PLL off!\n");
  31
  32         /* Set PDIV in PLL control 0. */
  33         pllctl = ssb_chipco_pll_read(cc, SSB_PMU0_PLLCTL0);
  34 @@ -249,8 +249,8 @@ static void ssb_pmu1_pllinit_r0(struct s
  35                 return;
  36         }
  37
  38 -       ssb_printk(KERN_INFO PFX "Programming PLL to %u.%03u MHz\n",
  39 -                  (crystalfreq / 1000), (crystalfreq % 1000));
  40 +       ssb_info("Programming PLL to %u.%03u MHz\n",
  41 +                crystalfreq / 1000, crystalfreq % 1000);
  42
  43         /* First turn the PLL off. */
  44         switch (bus->chip_id) {
  45 @@ -275,7 +275,7 @@ static void ssb_pmu1_pllinit_r0(struct s
  46         }
  47         tmp = chipco_read32(cc, SSB_CHIPCO_CLKCTLST);
  48         if (tmp & SSB_CHIPCO_CLKCTLST_HAVEHT)
  49 -               ssb_printk(KERN_EMERG PFX "Failed to turn the PLL off!\n");
  50 +               ssb_emerg("Failed to turn the PLL off!\n");
  51
  52         /* Set p1div and p2div. */
  53         pllctl = ssb_chipco_pll_read(cc, SSB_PMU1_PLLCTL0);
  54 @@ -349,9 +349,8 @@ static void ssb_pmu_pll_init(struct ssb_
  55         case 43222:
  56                 break;
  57         default:
  58 -               ssb_printk(KERN_ERR PFX
  59 -                          "ERROR: PLL init unknown for device %04X\n",
  60 -                          bus->chip_id);
  61 +               ssb_err("ERROR: PLL init unknown for device %04X\n",
  62 +                       bus->chip_id);
  63         }
  64  }
  65
  66 @@ -472,9 +471,8 @@ static void ssb_pmu_resources_init(struc
  67                 max_msk = 0xFFFFF;
  68                 break;
  69         default:
  70 -               ssb_printk(KERN_ERR PFX
  71 -                          "ERROR: PMU resource config unknown for device %04X\n",
  72 -                          bus->chip_id);
  73 +               ssb_err("ERROR: PMU resource config unknown for device %04X\n",
  74 +                       bus->chip_id);
  75         }
  76
  77         if (updown_tab) {
  78 @@ -526,8 +524,8 @@ void ssb_pmu_init(struct ssb_chipcommon
  79         pmucap = chipco_read32(cc, SSB_CHIPCO_PMU_CAP);
  80         cc->pmu.rev = (pmucap & SSB_CHIPCO_PMU_CAP_REVISION);
  81
  82 -       ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
  83 -                   cc->pmu.rev, pmucap);
  84 +       ssb_dbg("Found rev %u PMU (capabilities 0x%08X)\n",
  85 +               cc->pmu.rev, pmucap);
  86
  87         if (cc->pmu.rev == 1)
  88                 chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
  89 @@ -638,9 +636,8 @@ u32 ssb_pmu_get_alp_clock(struct ssb_chi
  90         case 0x5354:
  91                 ssb_pmu_get_alp_clock_clk0(cc);
  92         default:
  93 -               ssb_printk(KERN_ERR PFX
  94 -                          "ERROR: PMU alp clock unknown for device %04X\n",
  95 -                          bus->chip_id);
  96 +               ssb_err("ERROR: PMU alp clock unknown for device %04X\n",
  97 +                       bus->chip_id);
  98                 return 0;
  99         }
 100  }
 101 @@ -654,9 +651,8 @@ u32 ssb_pmu_get_cpu_clock(struct ssb_chi
 102                 /* 5354 chip uses a non programmable PLL of frequency 240MHz */
 103                 return 240000000;
 104         default:
 105 -               ssb_printk(KERN_ERR PFX
 106 -                          "ERROR: PMU cpu clock unknown for device %04X\n",
 107 -                          bus->chip_id);
 108 +               ssb_err("ERROR: PMU cpu clock unknown for device %04X\n",
 109 +                       bus->chip_id);
 110                 return 0;
 111         }
 112  }
 113 @@ -669,9 +665,8 @@ u32 ssb_pmu_get_controlclock(struct ssb_
 114         case 0x5354:
 115                 return 120000000;
 116         default:
 117 -               ssb_printk(KERN_ERR PFX
 118 -                          "ERROR: PMU controlclock unknown for device %04X\n",
 119 -                          bus->chip_id);
 120 +               ssb_err("ERROR: PMU controlclock unknown for device %04X\n",
 121 +                       bus->chip_id);
 122                 return 0;
 123         }
 124  }
 125 @@ -692,8 +687,23 @@ void ssb_pmu_spuravoid_pllupdate(struct
 126                 pmu_ctl = SSB_CHIPCO_PMU_CTL_PLL_UPD;
 127                 break;
 128         case 43222:
 129 -               /* TODO: BCM43222 requires updating PLLs too */
 130 -               return;
 131 +               if (spuravoid == 1) {
 132 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL0, 0x11500008);
 133 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL1, 0x0C000C06);
 134 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x0F600a08);
 135 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL3, 0x00000000);
 136 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL4, 0x2001E920);
 137 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL5, 0x88888815);
 138 +               } else {
 139 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL0, 0x11100008);
 140 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL1, 0x0c000c06);
 141 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x03000a08);
 142 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL3, 0x00000000);
 143 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL4, 0x200005c0);
 144 +                       ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL5, 0x88888855);
 145 +               }
 146 +               pmu_ctl = SSB_CHIPCO_PMU_CTL_PLL_UPD;
 147 +               break;
 148         default:
 149                 ssb_printk(KERN_ERR PFX
 150                            "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",
 151 --- a/drivers/ssb/driver_mipscore.c
 152 +++ b/drivers/ssb/driver_mipscore.c
 153 @@ -167,21 +167,22 @@ static void set_irq(struct ssb_device *d
 154                 irqflag |= (ipsflag & ~ipsflag_irq_mask[irq]);
 155                 ssb_write32(mdev, SSB_IPSFLAG, irqflag);
 156         }
 157 -       ssb_dprintk(KERN_INFO PFX
 158 -                   "set_irq: core 0x%04x, irq %d => %d\n",
 159 -                   dev->id.coreid, oldirq+2, irq+2);
 160 +       ssb_dbg("set_irq: core 0x%04x, irq %d => %d\n",
 161 +               dev->id.coreid, oldirq+2, irq+2);
 162  }
 163
 164  static void print_irq(struct ssb_device *dev, unsigned int irq)
 165  {
 166 -       int i;
 167         static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
 168 -       ssb_dprintk(KERN_INFO PFX
 169 -               "core 0x%04x, irq :", dev->id.coreid);
 170 -       for (i = 0; i <= 6; i++) {
 171 -               ssb_dprintk(" %s%s", irq_name[i], i==irq?"*":" ");
 172 -       }
 173 -       ssb_dprintk("\n");
 174 +       ssb_dbg("core 0x%04x, irq : %s%s %s%s %s%s %s%s %s%s %s%s %s%s\n",
 175 +               dev->id.coreid,
 176 +               irq_name[0], irq == 0 ? "*" : " ",
 177 +               irq_name[1], irq == 1 ? "*" : " ",
 178 +               irq_name[2], irq == 2 ? "*" : " ",
 179 +               irq_name[3], irq == 3 ? "*" : " ",
 180 +               irq_name[4], irq == 4 ? "*" : " ",
 181 +               irq_name[5], irq == 5 ? "*" : " ",
 182 +               irq_name[6], irq == 6 ? "*" : " ");
 183  }
 184
 185  static void dump_irq(struct ssb_bus *bus)
 186 @@ -286,7 +287,7 @@ void ssb_mipscore_init(struct ssb_mipsco
 187         if (!mcore->dev)
 188                 return; /* We don't have a MIPS core */
 189
 190 -       ssb_dprintk(KERN_INFO PFX "Initializing MIPS core...\n");
 191 +       ssb_dbg("Initializing MIPS core...\n");
 192
 193         bus = mcore->dev->bus;
 194         hz = ssb_clockspeed(bus);
 195 @@ -334,7 +335,7 @@ void ssb_mipscore_init(struct ssb_mipsco
 196                         break;
 197                 }
 198         }
 199 -       ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
 200 +       ssb_dbg("after irq reconfiguration\n");
 201         dump_irq(bus);
 202
 203         ssb_mips_serial_init(mcore);
 204 --- a/drivers/ssb/driver_pcicore.c
 205 +++ b/drivers/ssb/driver_pcicore.c
 206 @@ -263,8 +263,7 @@ int ssb_pcicore_plat_dev_init(struct pci
 207                 return -ENODEV;
 208         }
 209
 210 -       ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
 211 -                  pci_name(d));
 212 +       ssb_info("PCI: Fixing up device %s\n", pci_name(d));
 213
 214         /* Fix up interrupt lines */
 215         d->irq = ssb_mips_irq(extpci_core->dev) + 2;
 216 @@ -285,12 +284,12 @@ static void ssb_pcicore_fixup_pcibridge(
 217         if (dev->bus->number != 0 || PCI_SLOT(dev->devfn) != 0)
 218                 return;
 219
 220 -       ssb_printk(KERN_INFO "PCI: Fixing up bridge %s\n", pci_name(dev));
 221 +       ssb_info("PCI: Fixing up bridge %s\n", pci_name(dev));
 222
 223         /* Enable PCI bridge bus mastering and memory space */
 224         pci_set_master(dev);
 225         if (pcibios_enable_device(dev, ~0) < 0) {
 226 -               ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n");
 227 +               ssb_err("PCI: SSB bridge enable failed\n");
 228                 return;
 229         }
 230
 231 @@ -299,8 +298,8 @@ static void ssb_pcicore_fixup_pcibridge(
 232
 233         /* Make sure our latency is high enough to handle the devices behind us */
 234         lat = 168;
 235 -       ssb_printk(KERN_INFO "PCI: Fixing latency timer of device %s to %u\n",
 236 -                  pci_name(dev), lat);
 237 +       ssb_info("PCI: Fixing latency timer of device %s to %u\n",
 238 +                pci_name(dev), lat);
 239         pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
 240  }
 241  DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_pcicore_fixup_pcibridge);
 242 @@ -323,7 +322,7 @@ static void ssb_pcicore_init_hostmode(st
 243                 return;
 244         extpci_core = pc;
 245
 246 -       ssb_dprintk(KERN_INFO PFX "PCIcore in host mode found\n");
 247 +       ssb_dbg("PCIcore in host mode found\n");
 248         /* Reset devices on the external PCI bus */
 249         val = SSB_PCICORE_CTL_RST_OE;
 250         val |= SSB_PCICORE_CTL_CLK_OE;
 251 @@ -338,7 +337,7 @@ static void ssb_pcicore_init_hostmode(st
 252         udelay(1); /* Assertion time demanded by the PCI standard */
 253
 254         if (pc->dev->bus->has_cardbus_slot) {
 255 -               ssb_dprintk(KERN_INFO PFX "CardBus slot detected\n");
 256 +               ssb_dbg("CardBus slot detected\n");
 257                 pc->cardbusmode = 1;
 258                 /* GPIO 1 resets the bridge */
 259                 ssb_gpio_out(pc->dev->bus, 1, 1);
 260 --- a/drivers/ssb/embedded.c
 261 +++ b/drivers/ssb/embedded.c
 262 @@ -57,9 +57,8 @@ int ssb_watchdog_register(struct ssb_bus
 263                                              bus->busnumber, &wdt,
 264                                              sizeof(wdt));
 265         if (IS_ERR(pdev)) {
 266 -               ssb_dprintk(KERN_INFO PFX
 267 -                           "can not register watchdog device, err: %li\n",
 268 -                           PTR_ERR(pdev));
 269 +               ssb_dbg("can not register watchdog device, err: %li\n",
 270 +                       PTR_ERR(pdev));
 271                 return PTR_ERR(pdev);
 272         }
 273
 274 --- a/drivers/ssb/main.c
 275 +++ b/drivers/ssb/main.c
 276 @@ -275,8 +275,8 @@ int ssb_devices_thaw(struct ssb_freeze_c
 277
 278                 err = sdrv->probe(sdev, &sdev->id);
 279                 if (err) {
 280 -                       ssb_printk(KERN_ERR PFX "Failed to thaw device %s\n",
 281 -                                  dev_name(sdev->dev));
 282 +                       ssb_err("Failed to thaw device %s\n",
 283 +                               dev_name(sdev->dev));
 284                         result = err;
 285                 }
 286                 ssb_device_put(sdev);
 287 @@ -447,10 +447,9 @@ void ssb_bus_unregister(struct ssb_bus *
 288
 289         err = ssb_gpio_unregister(bus);
 290         if (err == -EBUSY)
 291 -               ssb_dprintk(KERN_ERR PFX "Some GPIOs are still in use.\n");
 292 +               ssb_dbg("Some GPIOs are still in use\n");
 293         else if (err)
 294 -               ssb_dprintk(KERN_ERR PFX
 295 -                           "Can not unregister GPIO driver: %i\n", err);
 296 +               ssb_dbg("Can not unregister GPIO driver: %i\n", err);
 297
 298         ssb_buses_lock();
 299         ssb_devices_unregister(bus);
 300 @@ -497,8 +496,7 @@ static int ssb_devices_register(struct s
 301
 302                 devwrap = kzalloc(sizeof(*devwrap), GFP_KERNEL);
 303                 if (!devwrap) {
 304 -                       ssb_printk(KERN_ERR PFX
 305 -                                  "Could not allocate device\n");
 306 +                       ssb_err("Could not allocate device\n");
 307                         err = -ENOMEM;
 308                         goto error;
 309                 }
 310 @@ -537,9 +535,7 @@ static int ssb_devices_register(struct s
 311                 sdev->dev = dev;
 312                 err = device_register(dev);
 313                 if (err) {
 314 -                       ssb_printk(KERN_ERR PFX
 315 -                                  "Could not register %s\n",
 316 -                                  dev_name(dev));
 317 +                       ssb_err("Could not register %s\n", dev_name(dev));
 318                         /* Set dev to NULL to not unregister
 319                          * dev on error unwinding. */
 320                         sdev->dev = NULL;
 321 @@ -825,10 +821,9 @@ static int ssb_bus_register(struct ssb_b
 322         ssb_mipscore_init(&bus->mipscore);
 323         err = ssb_gpio_init(bus);
 324         if (err == -ENOTSUPP)
 325 -               ssb_dprintk(KERN_DEBUG PFX "GPIO driver not activated\n");
 326 +               ssb_dbg("GPIO driver not activated\n");
 327         else if (err)
 328 -               ssb_dprintk(KERN_ERR PFX
 329 -                          "Error registering GPIO driver: %i\n", err);
 330 +               ssb_dbg("Error registering GPIO driver: %i\n", err);
 331         err = ssb_fetch_invariants(bus, get_invariants);
 332         if (err) {
 333                 ssb_bus_may_powerdown(bus);
 334 @@ -878,11 +873,11 @@ int ssb_bus_pcibus_register(struct ssb_b
 335
 336         err = ssb_bus_register(bus, ssb_pci_get_invariants, 0);
 337         if (!err) {
 338 -               ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
 339 -                          "PCI device %s\n", dev_name(&host_pci->dev));
 340 +               ssb_info("Sonics Silicon Backplane found on PCI device %s\n",
 341 +                        dev_name(&host_pci->dev));
 342         } else {
 343 -               ssb_printk(KERN_ERR PFX "Failed to register PCI version"
 344 -                          " of SSB with error %d\n", err);
 345 +               ssb_err("Failed to register PCI version of SSB with error %d\n",
 346 +                       err);
 347         }
 348
 349         return err;
 350 @@ -903,8 +898,8 @@ int ssb_bus_pcmciabus_register(struct ss
 351
 352         err = ssb_bus_register(bus, ssb_pcmcia_get_invariants, baseaddr);
 353         if (!err) {
 354 -               ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
 355 -                          "PCMCIA device %s\n", pcmcia_dev->devname);
 356 +               ssb_info("Sonics Silicon Backplane found on PCMCIA device %s\n",
 357 +                        pcmcia_dev->devname);
 358         }
 359
 360         return err;
 361 @@ -925,8 +920,8 @@ int ssb_bus_sdiobus_register(struct ssb_
 362
 363         err = ssb_bus_register(bus, ssb_sdio_get_invariants, ~0);
 364         if (!err) {
 365 -               ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
 366 -                          "SDIO device %s\n", sdio_func_id(func));
 367 +               ssb_info("Sonics Silicon Backplane found on SDIO device %s\n",
 368 +                        sdio_func_id(func));
 369         }
 370
 371         return err;
 372 @@ -944,8 +939,8 @@ int ssb_bus_ssbbus_register(struct ssb_b
 373
 374         err = ssb_bus_register(bus, get_invariants, baseaddr);
 375         if (!err) {
 376 -               ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found at "
 377 -                          "address 0x%08lX\n", baseaddr);
 378 +               ssb_info("Sonics Silicon Backplane found at address 0x%08lX\n",
 379 +                        baseaddr);
 380         }
 381
 382         return err;
 383 @@ -1339,7 +1334,7 @@ out:
 384  #endif
 385         return err;
 386  error:
 387 -       ssb_printk(KERN_ERR PFX "Bus powerdown failed\n");
 388 +       ssb_err("Bus powerdown failed\n");
 389         goto out;
 390  }
 391  EXPORT_SYMBOL(ssb_bus_may_powerdown);
 392 @@ -1362,7 +1357,7 @@ int ssb_bus_powerup(struct ssb_bus *bus,
 393
 394         return 0;
 395  error:
 396 -       ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
 397 +       ssb_err("Bus powerup failed\n");
 398         return err;
 399  }
 400  EXPORT_SYMBOL(ssb_bus_powerup);
 401 @@ -1470,15 +1465,13 @@ static int __init ssb_modinit(void)
 402
 403         err = b43_pci_ssb_bridge_init();
 404         if (err) {
 405 -               ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge "
 406 -                          "initialization failed\n");
 407 +               ssb_err("Broadcom 43xx PCI-SSB-bridge initialization failed\n");
 408                 /* don't fail SSB init because of this */
 409                 err = 0;
 410         }
 411         err = ssb_gige_init();
 412         if (err) {
 413 -               ssb_printk(KERN_ERR "SSB Broadcom Gigabit Ethernet "
 414 -                          "driver initialization failed\n");
 415 +               ssb_err("SSB Broadcom Gigabit Ethernet driver initialization failed\n");
 416                 /* don't fail SSB init because of this */
 417                 err = 0;
 418         }
 419 --- a/drivers/ssb/pci.c
 420 +++ b/drivers/ssb/pci.c
 421 @@ -56,7 +56,7 @@ int ssb_pci_switch_coreidx(struct ssb_bu
 422         }
 423         return 0;
 424  error:
 425 -       ssb_printk(KERN_ERR PFX "Failed to switch to core %u\n", coreidx);
 426 +       ssb_err("Failed to switch to core %u\n", coreidx);
 427         return -ENODEV;
 428  }
 429
 430 @@ -67,10 +67,9 @@ int ssb_pci_switch_core(struct ssb_bus *
 431         unsigned long flags;
 432
 433  #if SSB_VERBOSE_PCICORESWITCH_DEBUG
 434 -       ssb_printk(KERN_INFO PFX
 435 -                  "Switching to %s core, index %d\n",
 436 -                  ssb_core_name(dev->id.coreid),
 437 -                  dev->core_index);
 438 +       ssb_info("Switching to %s core, index %d\n",
 439 +                ssb_core_name(dev->id.coreid),
 440 +                dev->core_index);
 441  #endif
 442
 443         spin_lock_irqsave(&bus->bar_lock, flags);
 444 @@ -231,6 +230,15 @@ static inline u8 ssb_crc8(u8 crc, u8 dat
 445         return t[crc ^ data];
 446  }
 447
 448 +static void sprom_get_mac(char *mac, const u16 *in)
 449 +{
 450 +       int i;
 451 +       for (i = 0; i < 3; i++) {
 452 +               *mac++ = in[i] >> 8;
 453 +               *mac++ = in[i];
 454 +       }
 455 +}
 456 +
 457  static u8 ssb_sprom_crc(const u16 *sprom, u16 size)
 458  {
 459         int word;
 460 @@ -278,7 +286,7 @@ static int sprom_do_write(struct ssb_bus
 461         u32 spromctl;
 462         u16 size = bus->sprom_size;
 463
 464 -       ssb_printk(KERN_NOTICE PFX "Writing SPROM. Do NOT turn off the power! Please stand by...\n");
 465 +       ssb_notice("Writing SPROM. Do NOT turn off the power! Please stand by...\n");
 466         err = pci_read_config_dword(pdev, SSB_SPROMCTL, &spromctl);
 467         if (err)
 468                 goto err_ctlreg;
 469 @@ -286,17 +294,17 @@ static int sprom_do_write(struct ssb_bus
 470         err = pci_write_config_dword(pdev, SSB_SPROMCTL, spromctl);
 471         if (err)
 472                 goto err_ctlreg;
 473 -       ssb_printk(KERN_NOTICE PFX "[ 0%%");
 474 +       ssb_notice("[ 0%%");
 475         msleep(500);
 476         for (i = 0; i < size; i++) {
 477                 if (i == size / 4)
 478 -                       ssb_printk("25%%");
 479 +                       ssb_cont("25%%");
 480                 else if (i == size / 2)
 481 -                       ssb_printk("50%%");
 482 +                       ssb_cont("50%%");
 483                 else if (i == (size * 3) / 4)
 484 -                       ssb_printk("75%%");
 485 +                       ssb_cont("75%%");
 486                 else if (i % 2)
 487 -                       ssb_printk(".");
 488 +                       ssb_cont(".");
 489                 writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
 490                 mmiowb();
 491                 msleep(20);
 492 @@ -309,12 +317,12 @@ static int sprom_do_write(struct ssb_bus
 493         if (err)
 494                 goto err_ctlreg;
 495         msleep(500);
 496 -       ssb_printk("100%% ]\n");
 497 -       ssb_printk(KERN_NOTICE PFX "SPROM written.\n");
 498 +       ssb_cont("100%% ]\n");
 499 +       ssb_notice("SPROM written\n");
 500
 501         return 0;
 502  err_ctlreg:
 503 -       ssb_printk(KERN_ERR PFX "Could not access SPROM control register.\n");
 504 +       ssb_err("Could not access SPROM control register.\n");
 505         return err;
 506  }
 507
 508 @@ -339,10 +347,23 @@ static s8 r123_extract_antgain(u8 sprom_
 509         return (s8)gain;
 510  }
 511
 512 +static void sprom_extract_r23(struct ssb_sprom *out, const u16 *in)
 513 +{
 514 +       SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 515 +       SPEX(opo, SSB_SPROM2_OPO, SSB_SPROM2_OPO_VALUE, 0);
 516 +       SPEX(pa1lob0, SSB_SPROM2_PA1LOB0, 0xFFFF, 0);
 517 +       SPEX(pa1lob1, SSB_SPROM2_PA1LOB1, 0xFFFF, 0);
 518 +       SPEX(pa1lob2, SSB_SPROM2_PA1LOB2, 0xFFFF, 0);
 519 +       SPEX(pa1hib0, SSB_SPROM2_PA1HIB0, 0xFFFF, 0);
 520 +       SPEX(pa1hib1, SSB_SPROM2_PA1HIB1, 0xFFFF, 0);
 521 +       SPEX(pa1hib2, SSB_SPROM2_PA1HIB2, 0xFFFF, 0);
 522 +       SPEX(maxpwr_ah, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_HI, 0);
 523 +       SPEX(maxpwr_al, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_LO,
 524 +            SSB_SPROM2_MAXP_A_LO_SHIFT);
 525 +}
 526 +
 527  static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
 528  {
 529 -       int i;
 530 -       u16 v;
 531         u16 loc[3];
 532
 533         if (out->revision == 3)                 /* rev 3 moved MAC */
 534 @@ -352,19 +373,10 @@ static void sprom_extract_r123(struct ss
 535                 loc[1] = SSB_SPROM1_ET0MAC;
 536                 loc[2] = SSB_SPROM1_ET1MAC;
 537         }
 538 -       for (i = 0; i < 3; i++) {
 539 -               v = in[SPOFF(loc[0]) + i];
 540 -               *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
 541 -       }
 542 +       sprom_get_mac(out->il0mac, &in[SPOFF(loc[0])]);
 543         if (out->revision < 3) {        /* only rev 1-2 have et0, et1 */
 544 -               for (i = 0; i < 3; i++) {
 545 -                       v = in[SPOFF(loc[1]) + i];
 546 -                       *(((__be16 *)out->et0mac) + i) = cpu_to_be16(v);
 547 -               }
 548 -               for (i = 0; i < 3; i++) {
 549 -                       v = in[SPOFF(loc[2]) + i];
 550 -                       *(((__be16 *)out->et1mac) + i) = cpu_to_be16(v);
 551 -               }
 552 +               sprom_get_mac(out->et0mac, &in[SPOFF(loc[1])]);
 553 +               sprom_get_mac(out->et1mac, &in[SPOFF(loc[2])]);
 554         }
 555         SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0);
 556         SPEX(et1phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1A,
 557 @@ -372,6 +384,7 @@ static void sprom_extract_r123(struct ss
 558         SPEX(et0mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0M, 14);
 559         SPEX(et1mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1M, 15);
 560         SPEX(board_rev, SSB_SPROM1_BINF, SSB_SPROM1_BINF_BREV, 0);
 561 +       SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
 562         if (out->revision == 1)
 563                 SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,
 564                      SSB_SPROM1_BINF_CCODE_SHIFT);
 565 @@ -398,8 +411,7 @@ static void sprom_extract_r123(struct ss
 566              SSB_SPROM1_ITSSI_A_SHIFT);
 567         SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0);
 568         SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0);
 569 -       if (out->revision >= 2)
 570 -               SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
 571 +
 572         SPEX(alpha2[0], SSB_SPROM1_CCODE, 0xff00, 8);
 573         SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0);
 574
 575 @@ -410,6 +422,8 @@ static void sprom_extract_r123(struct ss
 576         out->antenna_gain.a1 = r123_extract_antgain(out->revision, in,
 577                                                     SSB_SPROM1_AGAIN_A,
 578                                                     SSB_SPROM1_AGAIN_A_SHIFT);
 579 +       if (out->revision >= 2)
 580 +               sprom_extract_r23(out, in);
 581  }
 582
 583  /* Revs 4 5 and 8 have partially shared layout */
 584 @@ -454,23 +468,20 @@ static void sprom_extract_r458(struct ss
 585
 586  static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
 587  {
 588 -       int i;
 589 -       u16 v;
 590         u16 il0mac_offset;
 591
 592         if (out->revision == 4)
 593                 il0mac_offset = SSB_SPROM4_IL0MAC;
 594         else
 595                 il0mac_offset = SSB_SPROM5_IL0MAC;
 596 -       /* extract the MAC address */
 597 -       for (i = 0; i < 3; i++) {
 598 -               v = in[SPOFF(il0mac_offset) + i];
 599 -               *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
 600 -       }
 601 +
 602 +       sprom_get_mac(out->il0mac, &in[SPOFF(il0mac_offset)]);
 603 +
 604         SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0);
 605         SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,
 606              SSB_SPROM4_ETHPHY_ET1A_SHIFT);
 607         SPEX(board_rev, SSB_SPROM4_BOARDREV, 0xFFFF, 0);
 608 +       SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
 609         if (out->revision == 4) {
 610                 SPEX(alpha2[0], SSB_SPROM4_CCODE, 0xff00, 8);
 611                 SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0);
 612 @@ -530,7 +541,7 @@ static void sprom_extract_r45(struct ssb
 613  static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 614  {
 615         int i;
 616 -       u16 v, o;
 617 +       u16 o;
 618         u16 pwr_info_offset[] = {
 619                 SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
 620                 SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
 621 @@ -539,11 +550,10 @@ static void sprom_extract_r8(struct ssb_
 622                         ARRAY_SIZE(out->core_pwr_info));
 623
 624         /* extract the MAC address */
 625 -       for (i = 0; i < 3; i++) {
 626 -               v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
 627 -               *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
 628 -       }
 629 +       sprom_get_mac(out->il0mac, &in[SPOFF(SSB_SPROM8_IL0MAC)]);
 630 +
 631         SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0);
 632 +       SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
 633         SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
 634         SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
 635         SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
 636 @@ -743,7 +753,7 @@ static int sprom_extract(struct ssb_bus
 637         memset(out, 0, sizeof(*out));
 638
 639         out->revision = in[size - 1] & 0x00FF;
 640 -       ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
 641 +       ssb_dbg("SPROM revision %d detected\n", out->revision);
 642         memset(out->et0mac, 0xFF, 6);           /* preset et0 and et1 mac */
 643         memset(out->et1mac, 0xFF, 6);
 644
 645 @@ -752,7 +762,7 @@ static int sprom_extract(struct ssb_bus
 646                  * number stored in the SPROM.
 647                  * Always extract r1. */
 648                 out->revision = 1;
 649 -               ssb_dprintk(KERN_DEBUG PFX "SPROM treated as revision %d\n", out->revision);
 650 +               ssb_dbg("SPROM treated as revision %d\n", out->revision);
 651         }
 652
 653         switch (out->revision) {
 654 @@ -769,9 +779,8 @@ static int sprom_extract(struct ssb_bus
 655                 sprom_extract_r8(out, in);
 656                 break;
 657         default:
 658 -               ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
 659 -                          " revision %d detected. Will extract"
 660 -                          " v1\n", out->revision);
 661 +               ssb_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
 662 +                        out->revision);
 663                 out->revision = 1;
 664                 sprom_extract_r123(out, in);
 665         }
 666 @@ -791,7 +800,7 @@ static int ssb_pci_sprom_get(struct ssb_
 667         u16 *buf;
 668
 669         if (!ssb_is_sprom_available(bus)) {
 670 -               ssb_printk(KERN_ERR PFX "No SPROM available!\n");
 671 +               ssb_err("No SPROM available!\n");
 672                 return -ENODEV;
 673         }
 674         if (bus->chipco.dev) {  /* can be unavailable! */
 675 @@ -810,7 +819,7 @@ static int ssb_pci_sprom_get(struct ssb_
 676         } else {
 677                 bus->sprom_offset = SSB_SPROM_BASE1;
 678         }
 679 -       ssb_dprintk(KERN_INFO PFX "SPROM offset is 0x%x\n", bus->sprom_offset);
 680 +       ssb_dbg("SPROM offset is 0x%x\n", bus->sprom_offset);
 681
 682         buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
 683         if (!buf)
 684 @@ -835,18 +844,15 @@ static int ssb_pci_sprom_get(struct ssb_
 685                          * available for this device in some other storage */
 686                         err = ssb_fill_sprom_with_fallback(bus, sprom);
 687                         if (err) {
 688 -                               ssb_printk(KERN_WARNING PFX "WARNING: Using"
 689 -                                          " fallback SPROM failed (err %d)\n",
 690 -                                          err);
 691 +                               ssb_warn("WARNING: Using fallback SPROM failed (err %d)\n",
 692 +                                        err);
 693                         } else {
 694 -                               ssb_dprintk(KERN_DEBUG PFX "Using SPROM"
 695 -                                           " revision %d provided by"
 696 -                                           " platform.\n", sprom->revision);
 697 +                               ssb_dbg("Using SPROM revision %d provided by platform\n",
 698 +                                       sprom->revision);
 699                                 err = 0;
 700                                 goto out_free;
 701                         }
 702 -                       ssb_printk(KERN_WARNING PFX "WARNING: Invalid"
 703 -                                  " SPROM CRC (corrupt SPROM)\n");
 704 +                       ssb_warn("WARNING: Invalid SPROM CRC (corrupt SPROM)\n");
 705                 }
 706         }
 707         err = sprom_extract(bus, sprom, buf, bus->sprom_size);
 708 --- a/drivers/ssb/pcmcia.c
 709 +++ b/drivers/ssb/pcmcia.c
 710 @@ -143,7 +143,7 @@ int ssb_pcmcia_switch_coreidx(struct ssb
 711
 712         return 0;
 713  error:
 714 -       ssb_printk(KERN_ERR PFX "Failed to switch to core %u\n", coreidx);
 715 +       ssb_err("Failed to switch to core %u\n", coreidx);
 716         return err;
 717  }
 718
 719 @@ -153,10 +153,9 @@ int ssb_pcmcia_switch_core(struct ssb_bu
 720         int err;
 721
 722  #if SSB_VERBOSE_PCMCIACORESWITCH_DEBUG
 723 -       ssb_printk(KERN_INFO PFX
 724 -                  "Switching to %s core, index %d\n",
 725 -                  ssb_core_name(dev->id.coreid),
 726 -                  dev->core_index);
 727 +       ssb_info("Switching to %s core, index %d\n",
 728 +                ssb_core_name(dev->id.coreid),
 729 +                dev->core_index);
 730  #endif
 731
 732         err = ssb_pcmcia_switch_coreidx(bus, dev->core_index);
 733 @@ -192,7 +191,7 @@ int ssb_pcmcia_switch_segment(struct ssb
 734
 735         return 0;
 736  error:
 737 -       ssb_printk(KERN_ERR PFX "Failed to switch pcmcia segment\n");
 738 +       ssb_err("Failed to switch pcmcia segment\n");
 739         return err;
 740  }
 741
 742 @@ -549,44 +548,39 @@ static int ssb_pcmcia_sprom_write_all(st
 743         bool failed = 0;
 744         size_t size = SSB_PCMCIA_SPROM_SIZE;
 745
 746 -       ssb_printk(KERN_NOTICE PFX
 747 -                  "Writing SPROM. Do NOT turn off the power! "
 748 -                  "Please stand by...\n");
 749 +       ssb_notice("Writing SPROM. Do NOT turn off the power! Please stand by...\n");
 750         err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEEN);
 751         if (err) {
 752 -               ssb_printk(KERN_NOTICE PFX
 753 -                          "Could not enable SPROM write access.\n");
 754 +               ssb_notice("Could not enable SPROM write access\n");
 755                 return -EBUSY;
 756         }
 757 -       ssb_printk(KERN_NOTICE PFX "[ 0%%");
 758 +       ssb_notice("[ 0%%");
 759         msleep(500);
 760         for (i = 0; i < size; i++) {
 761                 if (i == size / 4)
 762 -                       ssb_printk("25%%");
 763 +                       ssb_cont("25%%");
 764                 else if (i == size / 2)
 765 -                       ssb_printk("50%%");
 766 +                       ssb_cont("50%%");
 767                 else if (i == (size * 3) / 4)
 768 -                       ssb_printk("75%%");
 769 +                       ssb_cont("75%%");
 770                 else if (i % 2)
 771 -                       ssb_printk(".");
 772 +                       ssb_cont(".");
 773                 err = ssb_pcmcia_sprom_write(bus, i, sprom[i]);
 774                 if (err) {
 775 -                       ssb_printk(KERN_NOTICE PFX
 776 -                                  "Failed to write to SPROM.\n");
 777 +                       ssb_notice("Failed to write to SPROM\n");
 778                         failed = 1;
 779                         break;
 780                 }
 781         }
 782         err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS);
 783         if (err) {
 784 -               ssb_printk(KERN_NOTICE PFX
 785 -                          "Could not disable SPROM write access.\n");
 786 +               ssb_notice("Could not disable SPROM write access\n");
 787                 failed = 1;
 788         }
 789         msleep(500);
 790         if (!failed) {
 791 -               ssb_printk("100%% ]\n");
 792 -               ssb_printk(KERN_NOTICE PFX "SPROM written.\n");
 793 +               ssb_cont("100%% ]\n");
 794 +               ssb_notice("SPROM written\n");
 795         }
 796
 797         return failed ? -EBUSY : 0;
 798 @@ -700,7 +694,7 @@ static int ssb_pcmcia_do_get_invariants(
 799         return -ENOSPC; /* continue with next entry */
 800
 801  error:
 802 -       ssb_printk(KERN_ERR PFX
 803 +       ssb_err(
 804                    "PCMCIA: Failed to fetch device invariants: %s\n",
 805                    error_description);
 806         return -ENODEV;
 807 @@ -722,7 +716,7 @@ int ssb_pcmcia_get_invariants(struct ssb
 808         res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE,
 809                                 ssb_pcmcia_get_mac, sprom);
 810         if (res != 0) {
 811 -               ssb_printk(KERN_ERR PFX
 812 +               ssb_err(
 813                         "PCMCIA: Failed to fetch MAC address\n");
 814                 return -ENODEV;
 815         }
 816 @@ -733,7 +727,7 @@ int ssb_pcmcia_get_invariants(struct ssb
 817         if ((res == 0) || (res == -ENOSPC))
 818                 return 0;
 819
 820 -       ssb_printk(KERN_ERR PFX
 821 +       ssb_err(
 822                         "PCMCIA: Failed to fetch device invariants\n");
 823         return -ENODEV;
 824  }
 825 @@ -843,6 +837,6 @@ int ssb_pcmcia_init(struct ssb_bus *bus)
 826
 827         return 0;
 828  error:
 829 -       ssb_printk(KERN_ERR PFX "Failed to initialize PCMCIA host device\n");
 830 +       ssb_err("Failed to initialize PCMCIA host device\n");
 831         return err;
 832  }
 833 --- a/drivers/ssb/scan.c
 834 +++ b/drivers/ssb/scan.c
 835 @@ -125,8 +125,7 @@ static u16 pcidev_to_chipid(struct pci_d
 836                 chipid_fallback = 0x4401;
 837                 break;
 838         default:
 839 -               ssb_printk(KERN_ERR PFX
 840 -                          "PCI-ID not in fallback list\n");
 841 +               ssb_err("PCI-ID not in fallback list\n");
 842         }
 843
 844         return chipid_fallback;
 845 @@ -152,8 +151,7 @@ static u8 chipid_to_nrcores(u16 chipid)
 846         case 0x4704:
 847                 return 9;
 848         default:
 849 -               ssb_printk(KERN_ERR PFX
 850 -                          "CHIPID not in nrcores fallback list\n");
 851 +               ssb_err("CHIPID not in nrcores fallback list\n");
 852         }
 853
 854         return 1;
 855 @@ -320,15 +318,13 @@ int ssb_bus_scan(struct ssb_bus *bus,
 856                         bus->chip_package = 0;
 857                 }
 858         }
 859 -       ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and "
 860 -                  "package 0x%02X\n", bus->chip_id, bus->chip_rev,
 861 -                  bus->chip_package);
 862 +       ssb_info("Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
 863 +                bus->chip_id, bus->chip_rev, bus->chip_package);
 864         if (!bus->nr_devices)
 865                 bus->nr_devices = chipid_to_nrcores(bus->chip_id);
 866         if (bus->nr_devices > ARRAY_SIZE(bus->devices)) {
 867 -               ssb_printk(KERN_ERR PFX
 868 -                          "More than %d ssb cores found (%d)\n",
 869 -                          SSB_MAX_NR_CORES, bus->nr_devices);
 870 +               ssb_err("More than %d ssb cores found (%d)\n",
 871 +                       SSB_MAX_NR_CORES, bus->nr_devices);
 872                 goto err_unmap;
 873         }
 874         if (bus->bustype == SSB_BUSTYPE_SSB) {
 875 @@ -370,8 +366,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
 876                         nr_80211_cores++;
 877                         if (nr_80211_cores > 1) {
 878                                 if (!we_support_multiple_80211_cores(bus)) {
 879 -                                       ssb_dprintk(KERN_INFO PFX "Ignoring additional "
 880 -                                                   "802.11 core\n");
 881 +                                       ssb_dbg("Ignoring additional 802.11 core\n");
 882                                         continue;
 883                                 }
 884                         }
 885 @@ -379,8 +374,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
 886                 case SSB_DEV_EXTIF:
 887  #ifdef CONFIG_SSB_DRIVER_EXTIF
 888                         if (bus->extif.dev) {
 889 -                               ssb_printk(KERN_WARNING PFX
 890 -                                          "WARNING: Multiple EXTIFs found\n");
 891 +                               ssb_warn("WARNING: Multiple EXTIFs found\n");
 892                                 break;
 893                         }
 894                         bus->extif.dev = dev;
 895 @@ -388,8 +382,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
 896                         break;
 897                 case SSB_DEV_CHIPCOMMON:
 898                         if (bus->chipco.dev) {
 899 -                               ssb_printk(KERN_WARNING PFX
 900 -                                          "WARNING: Multiple ChipCommon found\n");
 901 +                               ssb_warn("WARNING: Multiple ChipCommon found\n");
 902                                 break;
 903                         }
 904                         bus->chipco.dev = dev;
 905 @@ -398,8 +391,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
 906                 case SSB_DEV_MIPS_3302:
 907  #ifdef CONFIG_SSB_DRIVER_MIPS
 908                         if (bus->mipscore.dev) {
 909 -                               ssb_printk(KERN_WARNING PFX
 910 -                                          "WARNING: Multiple MIPS cores found\n");
 911 +                               ssb_warn("WARNING: Multiple MIPS cores found\n");
 912                                 break;
 913                         }
 914                         bus->mipscore.dev = dev;
 915 @@ -420,8 +412,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
 916                                 }
 917                         }
 918                         if (bus->pcicore.dev) {
 919 -                               ssb_printk(KERN_WARNING PFX
 920 -                                          "WARNING: Multiple PCI(E) cores found\n");
 921 +                               ssb_warn("WARNING: Multiple PCI(E) cores found\n");
 922                                 break;
 923                         }
 924                         bus->pcicore.dev = dev;
 925 --- a/drivers/ssb/sprom.c
 926 +++ b/drivers/ssb/sprom.c
 927 @@ -127,13 +127,13 @@ ssize_t ssb_attr_sprom_store(struct ssb_
 928                 goto out_kfree;
 929         err = ssb_devices_freeze(bus, &freeze);
 930         if (err) {
 931 -               ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
 932 +               ssb_err("SPROM write: Could not freeze all devices\n");
 933                 goto out_unlock;
 934         }
 935         res = sprom_write(bus, sprom);
 936         err = ssb_devices_thaw(&freeze);
 937         if (err)
 938 -               ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
 939 +               ssb_err("SPROM write: Could not thaw all devices\n");
 940  out_unlock:
 941         mutex_unlock(&bus->sprom_mutex);
 942  out_kfree:
 943 --- a/drivers/ssb/ssb_private.h
 944 +++ b/drivers/ssb/ssb_private.h
 945 @@ -9,16 +9,27 @@
 946  #define PFX    "ssb: "
 947
 948  #ifdef CONFIG_SSB_SILENT
 949 -# define ssb_printk(fmt, x...) do { /* nothing */ } while (0)
 950 +# define ssb_printk(fmt, ...)                                  \
 951 +       do { if (0) printk(fmt, ##__VA_ARGS__); } while (0)
 952  #else
 953 -# define ssb_printk            printk
 954 +# define ssb_printk(fmt, ...)                                  \
 955 +       printk(fmt, ##__VA_ARGS__)
 956  #endif /* CONFIG_SSB_SILENT */
 957
 958 +#define ssb_emerg(fmt, ...)    ssb_printk(KERN_EMERG PFX fmt, ##__VA_ARGS__)
 959 +#define ssb_err(fmt, ...)      ssb_printk(KERN_ERR PFX fmt, ##__VA_ARGS__)
 960 +#define ssb_warn(fmt, ...)     ssb_printk(KERN_WARNING PFX fmt, ##__VA_ARGS__)
 961 +#define ssb_notice(fmt, ...)   ssb_printk(KERN_NOTICE PFX fmt, ##__VA_ARGS__)
 962 +#define ssb_info(fmt, ...)     ssb_printk(KERN_INFO PFX fmt, ##__VA_ARGS__)
 963 +#define ssb_cont(fmt, ...)     ssb_printk(KERN_CONT fmt, ##__VA_ARGS__)
 964 +
 965  /* dprintk: Debugging printk; vanishes for non-debug compilation */
 966  #ifdef CONFIG_SSB_DEBUG
 967 -# define ssb_dprintk(fmt, x...)        ssb_printk(fmt , ##x)
 968 +# define ssb_dbg(fmt, ...)                                     \
 969 +       ssb_printk(KERN_DEBUG PFX fmt, ##__VA_ARGS__)
 970  #else
 971 -# define ssb_dprintk(fmt, x...)        do { /* nothing */ } while (0)
 972 +# define ssb_dbg(fmt, ...)                                     \
 973 +       do { if (0) printk(KERN_DEBUG PFX fmt, ##__VA_ARGS__); } while (0)
 974  #endif
 975
 976  #ifdef CONFIG_SSB_DEBUG
 977 --- a/include/linux/ssb/ssb.h
 978 +++ b/include/linux/ssb/ssb.h
 979 @@ -26,9 +26,9 @@ struct ssb_sprom_core_pwr_info {
 980
 981  struct ssb_sprom {
 982         u8 revision;
 983 -       u8 il0mac[6];           /* MAC address for 802.11b/g */
 984 -       u8 et0mac[6];           /* MAC address for Ethernet */
 985 -       u8 et1mac[6];           /* MAC address for 802.11a */
 986 +       u8 il0mac[6] __aligned(sizeof(u16));    /* MAC address for 802.11b/g */
 987 +       u8 et0mac[6] __aligned(sizeof(u16));    /* MAC address for Ethernet */
 988 +       u8 et1mac[6] __aligned(sizeof(u16));    /* MAC address for 802.11a */
 989         u8 et0phyaddr;          /* MII address for enet0 */
 990         u8 et1phyaddr;          /* MII address for enet1 */
 991         u8 et0mdcport;          /* MDIO for enet0 */
 992 @@ -340,13 +340,61 @@ enum ssb_bustype {
 993  #define SSB_BOARDVENDOR_DELL   0x1028  /* Dell */
 994  #define SSB_BOARDVENDOR_HP     0x0E11  /* HP */
 995  /* board_type */
 996 +#define SSB_BOARD_BCM94301CB   0x0406
 997 +#define SSB_BOARD_BCM94301MP   0x0407
 998 +#define SSB_BOARD_BU4309       0x040A
 999 +#define SSB_BOARD_BCM94309CB   0x040B
1000 +#define SSB_BOARD_BCM4309MP    0x040C
1001 +#define SSB_BOARD_BU4306       0x0416
1002  #define SSB_BOARD_BCM94306MP   0x0418
1003  #define SSB_BOARD_BCM4309G     0x0421
1004  #define SSB_BOARD_BCM4306CB    0x0417
1005 -#define SSB_BOARD_BCM4309MP    0x040C
1006 +#define SSB_BOARD_BCM94306PC   0x0425  /* pcmcia 3.3v 4306 card */
1007 +#define SSB_BOARD_BCM94306CBSG 0x042B  /* with SiGe PA */
1008 +#define SSB_BOARD_PCSG94306    0x042D  /* with SiGe PA */
1009 +#define SSB_BOARD_BU4704SD     0x042E  /* with sdram */
1010 +#define SSB_BOARD_BCM94704AGR  0x042F  /* dual 11a/11g Router */
1011 +#define SSB_BOARD_BCM94308MP   0x0430  /* 11a-only minipci */
1012 +#define SSB_BOARD_BU4318       0x0447
1013 +#define SSB_BOARD_CB4318       0x0448
1014 +#define SSB_BOARD_MPG4318      0x0449
1015  #define SSB_BOARD_MP4318       0x044A
1016 -#define SSB_BOARD_BU4306       0x0416
1017 -#define SSB_BOARD_BU4309       0x040A
1018 +#define SSB_BOARD_SD4318       0x044B
1019 +#define SSB_BOARD_BCM94306P    0x044C  /* with SiGe */
1020 +#define SSB_BOARD_BCM94303MP   0x044E
1021 +#define SSB_BOARD_BCM94306MPM  0x0450
1022 +#define SSB_BOARD_BCM94306MPL  0x0453
1023 +#define SSB_BOARD_PC4303       0x0454  /* pcmcia */
1024 +#define SSB_BOARD_BCM94306MPLNA        0x0457
1025 +#define SSB_BOARD_BCM94306MPH  0x045B
1026 +#define SSB_BOARD_BCM94306PCIV 0x045C
1027 +#define SSB_BOARD_BCM94318MPGH 0x0463
1028 +#define SSB_BOARD_BU4311       0x0464
1029 +#define SSB_BOARD_BCM94311MC   0x0465
1030 +#define SSB_BOARD_BCM94311MCAG 0x0466
1031 +/* 4321 boards */
1032 +#define SSB_BOARD_BU4321       0x046B
1033 +#define SSB_BOARD_BU4321E      0x047C
1034 +#define SSB_BOARD_MP4321       0x046C
1035 +#define SSB_BOARD_CB2_4321     0x046D
1036 +#define SSB_BOARD_CB2_4321_AG  0x0066
1037 +#define SSB_BOARD_MC4321       0x046E
1038 +/* 4325 boards */
1039 +#define SSB_BOARD_BCM94325DEVBU        0x0490
1040 +#define SSB_BOARD_BCM94325BGABU        0x0491
1041 +#define SSB_BOARD_BCM94325SDGWB        0x0492
1042 +#define SSB_BOARD_BCM94325SDGMDL       0x04AA
1043 +#define SSB_BOARD_BCM94325SDGMDL2      0x04C6
1044 +#define SSB_BOARD_BCM94325SDGMDL3      0x04C9
1045 +#define SSB_BOARD_BCM94325SDABGWBA     0x04E1
1046 +/* 4322 boards */
1047 +#define SSB_BOARD_BCM94322MC   0x04A4
1048 +#define SSB_BOARD_BCM94322USB  0x04A8  /* dualband */
1049 +#define SSB_BOARD_BCM94322HM   0x04B0
1050 +#define SSB_BOARD_BCM94322USB2D        0x04Bf  /* single band discrete front end */
1051 +/* 4312 boards */
1052 +#define SSB_BOARD_BU4312       0x048A
1053 +#define SSB_BOARD_BCM4312MCGSG 0x04B5
1054  /* chip_package */
1055  #define SSB_CHIPPACK_BCM4712S  1       /* Small 200pin 4712 */
1056  #define SSB_CHIPPACK_BCM4712M  2       /* Medium 225pin 4712 */
1057 --- a/include/linux/ssb/ssb_regs.h
1058 +++ b/include/linux/ssb/ssb_regs.h
1059 @@ -289,11 +289,11 @@
1060  #define  SSB_SPROM4_ETHPHY_ET1A_SHIFT  5
1061  #define  SSB_SPROM4_ETHPHY_ET0M                (1<<14) /* MDIO for enet0 */
1062  #define  SSB_SPROM4_ETHPHY_ET1M                (1<<15) /* MDIO for enet1 */
1063 -#define SSB_SPROM4_ANTAVAIL            0x005D  /* Antenna available bitfields */
1064 -#define  SSB_SPROM4_ANTAVAIL_A         0x00FF  /* A-PHY bitfield */
1065 -#define  SSB_SPROM4_ANTAVAIL_A_SHIFT   0
1066 -#define  SSB_SPROM4_ANTAVAIL_BG                0xFF00  /* B-PHY and G-PHY bitfield */
1067 -#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT  8
1068 +#define SSB_SPROM4_ANTAVAIL            0x005C  /* Antenna available bitfields */
1069 +#define  SSB_SPROM4_ANTAVAIL_BG                0x00FF  /* B-PHY and G-PHY bitfield */
1070 +#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT  0
1071 +#define  SSB_SPROM4_ANTAVAIL_A         0xFF00  /* A-PHY bitfield */
1072 +#define  SSB_SPROM4_ANTAVAIL_A_SHIFT   8
1073  #define SSB_SPROM4_AGAIN01             0x005E  /* Antenna Gain (in dBm Q5.2) */
1074  #define  SSB_SPROM4_AGAIN0             0x00FF  /* Antenna 0 */
1075  #define  SSB_SPROM4_AGAIN0_SHIFT       0