diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-09-01 10:52:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-03 09:49:06 +0200 |
| commit | da9ef6467871c8141cb13d094bbf10bc2df79065 (patch) | |
| tree | 5334cbe9c238e9cf296eb5fcfbf5bbe5b1d608f9 | |
| parent | fb11747bfeb0227bfbcce667c7e486b0440f78e4 (diff) | |
| download | barebox-da9ef6467871c8141cb13d094bbf10bc2df79065.tar.gz barebox-da9ef6467871c8141cb13d094bbf10bc2df79065.tar.xz | |
smc911x: update chip detection
Use linux kernel chip detection from 3.5
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/net/smc911x.c | 60 | ||||
| -rw-r--r-- | drivers/net/smc911x.h | 13 |
2 files changed, 34 insertions, 39 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 8528527549..7639a92873 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -47,29 +47,12 @@ struct smc911x_priv { void __iomem *base; int shift; + int generation; u32 (*reg_read)(struct smc911x_priv *priv, u32 reg); void (*reg_write)(struct smc911x_priv *priv, u32 reg, u32 val); }; -struct chip_id { - u16 id; - char *name; -}; - -static const struct chip_id chip_ids[] = { - { CHIP_9115, "LAN9115" }, - { CHIP_9116, "LAN9116" }, - { CHIP_9117, "LAN9117" }, - { CHIP_9118, "LAN9118" }, - { CHIP_9215, "LAN9215" }, - { CHIP_9216, "LAN9216" }, - { CHIP_9217, "LAN9217" }, - { CHIP_9218, "LAN9218" }, - { CHIP_9221, "LAN9221" }, - { 0, NULL }, -}; - #define DRIVERNAME "smc911x" #define __smc_shift(priv, reg) ((reg) << ((priv)->shift)) @@ -437,7 +420,7 @@ static int smc911x_probe(struct device_d *dev) struct eth_device *edev; struct smc911x_priv *priv; uint32_t val; - int i, is_32bit; + int is_32bit; struct smc911x_plat *pdata = dev->platform_data; priv = xzalloc(sizeof(*priv)); @@ -495,16 +478,41 @@ static int smc911x_probe(struct device_d *dev) return -ENODEV; } - val = smc911x_reg_read(priv, ID_REV) >> 16; - for(i = 0; chip_ids[i].id != 0; i++) { - if (chip_ids[i].id == val) break; - } - if (!chip_ids[i].id) { - dev_err(dev, "Unknown chip ID %04x\n", val); + val = smc911x_reg_read(priv, ID_REV); + switch (val & 0xFFFF0000) { + case 0x01180000: + case 0x01170000: + case 0x01160000: + case 0x01150000: + case 0x218A0000: + /* LAN911[5678] family */ + priv->generation = val & 0x0000FFFF; + break; + + case 0x118A0000: + case 0x117A0000: + case 0x116A0000: + case 0x115A0000: + /* LAN921[5678] family */ + priv->generation = 3; + break; + + case 0x92100000: + case 0x92110000: + case 0x92200000: + case 0x92210000: + /* LAN9210/LAN9211/LAN9220/LAN9221 */ + priv->generation = 4; + break; + + default: + dev_err(dev, "LAN911x not identified, idrev: 0x%08X\n", + val); return -ENODEV; } - dev_info(dev, "detected %s controller\n", chip_ids[i].name); + dev_info(dev, "LAN911x identified, idrev: 0x%08X, generation: %d\n", + val, priv->generation); edev = &priv->edev; edev->priv = priv; diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index d409247e6f..572c1f8fba 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h @@ -340,16 +340,3 @@ #define WUCSR_MPR 0x00000020 #define WUCSR_WAKE_EN 0x00000004 #define WUCSR_MPEN 0x00000002 - -/* Chip ID values */ -#define CHIP_9115 0x115 -#define CHIP_9116 0x116 -#define CHIP_9117 0x117 -#define CHIP_9118 0x118 -#define CHIP_9215 0x115a -#define CHIP_9216 0x116a -#define CHIP_9217 0x117a -#define CHIP_9218 0x118a -#define CHIP_9221 0x9221 - - |