ssb: Convert to use of the new SPROM structure

In disagreement with the SPROM specs, revision 3 devices appear to have
moved the MAC address.

Change ssb to handle the revision 4 SPROM, which is a different size.
This change in size is handled by adding a new variable to the ssb_sprom
struct and using it whenever possible. For those routines that do not
have access to this structure, a 'u16 size' argument is added.

The new PCI_ID for the BCM4328 is also added.

Testing of the Revision 4 SPROM, which is used on the BCM4328, was done
by Michael Gerdau <mgerdau@tiscali.de>.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 85a20546e827..9028ed5715a1 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -872,14 +872,22 @@ EXPORT_SYMBOL(ssb_clockspeed);
 
 static u32 ssb_tmslow_reject_bitmask(struct ssb_device *dev)
 {
+        u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV;
+
         /* The REJECT bit changed position in TMSLOW between
          * Backplane revisions. */
-        switch (ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV) {
+        switch (rev) {
         case SSB_IDLOW_SSBREV_22:
                 return SSB_TMSLOW_REJECT_22;
         case SSB_IDLOW_SSBREV_23:
                 return SSB_TMSLOW_REJECT_23;
+        case SSB_IDLOW_SSBREV_24:     /* TODO - find the proper REJECT bits */
+        case SSB_IDLOW_SSBREV_25:     /* same here */
+        case SSB_IDLOW_SSBREV_26:     /* same here */
+        case SSB_IDLOW_SSBREV_27:     /* same here */
+                return SSB_TMSLOW_REJECT_23;    /* this is a guess */
         default:
+                printk(KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev);
                 WARN_ON(1);
         }
         return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23);