From: Rafał Miłecki <zajec5@gmail.com>
Date: Wed, 17 Nov 2010 18:52:13 +0000 (+0100)
Subject: ssb: drop BCM4328 hack for SPROM revision
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a76a574ca9ce7c05791cee42f000f2a42c687837;p=linux-beck.git

ssb: drop BCM4328 hack for SPROM revision

This hacks leads to incorrect SPROM parsing for me and reading for example MAC
as: 00:00:00:54:00:00. Michael G. who introduced this confirmed it is not
needed anymore.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Tested-by: Michael Gerdau <mgd@qata.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index b5343ac37ee5..f52966305e05 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -580,10 +580,6 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
 		 * Always extract r1. */
 		out->revision = 1;
 		ssb_dprintk(KERN_DEBUG PFX "SPROM treated as revision %d\n", out->revision);
-	} else if (bus->chip_id == 0x4321) {
-		/* the BCM4328 has a chipid == 0x4321 and a rev 4 SPROM */
-		out->revision = 4;
-		ssb_dprintk(KERN_DEBUG PFX "SPROM treated as revision %d\n", out->revision);
 	}
 
 	switch (out->revision) {