| Message ID | Pine.LNX.4.64.0810120058190.4965@axis700.grange |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
>>>>> "Guennadi" == Guennadi Liakhovetski <lg@denx.de> writes: Guennadi> LAN92{5,7,8} chips from SMSC are register compatible with Guennadi> LAN911{5,6,7,8} controllers, and only add support for HP Guennadi> Auto-MDIX. LAN9218 doesn't have an external MII interface. Guennadi> Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
From: Peter Korsgaard <jacmet@sunsite.dk> Date: Sun, 12 Oct 2008 09:54:08 +0200 > >>>>> "Guennadi" == Guennadi Liakhovetski <lg@denx.de> writes: > > Guennadi> LAN92{5,7,8} chips from SMSC are register compatible with > Guennadi> LAN911{5,6,7,8} controllers, and only add support for HP > Guennadi> Auto-MDIX. LAN9218 doesn't have an external MII interface. > > Guennadi> Signed-off-by: Guennadi Liakhovetski <lg@denx.de> > > Acked-by: Peter Korsgaard <jacmet@sunsite.dk> Applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index dbc51e9..22a0d14 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -685,8 +685,10 @@ static void smc911x_phy_detect(struct net_device *dev) * PHY#1 to PHY#31, and then PHY#0 last. */ switch(lp->version) { - case 0x115: - case 0x117: + case CHIP_9115: + case CHIP_9117: + case CHIP_9215: + case CHIP_9217: cfg = SMC_GET_HW_CFG(lp); if (cfg & HW_CFG_EXT_PHY_DET_) { cfg &= ~HW_CFG_PHY_CLK_SEL_; diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index 2abfc28..bf6240f 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h @@ -666,10 +666,13 @@ smc_pxa_dma_outsl(struct smc911x_local *lp, u_long physaddr, #define LAN911X_INTERNAL_PHY_ID (0x0007C000) /* Chip ID values */ -#define CHIP_9115 0x115 -#define CHIP_9116 0x116 -#define CHIP_9117 0x117 -#define CHIP_9118 0x118 +#define CHIP_9115 0x0115 +#define CHIP_9116 0x0116 +#define CHIP_9117 0x0117 +#define CHIP_9118 0x0118 +#define CHIP_9215 0x115A +#define CHIP_9217 0x117A +#define CHIP_9218 0x118A struct chip_id { u16 id; @@ -681,6 +684,9 @@ static const struct chip_id chip_ids[] = { { CHIP_9116, "LAN9116" }, { CHIP_9117, "LAN9117" }, { CHIP_9118, "LAN9118" }, + { CHIP_9215, "LAN9215" }, + { CHIP_9217, "LAN9217" }, + { CHIP_9218, "LAN9218" }, { 0, NULL }, };
LAN92{5,7,8} chips from SMSC are register compatible with LAN911{5,6,7,8} controllers, and only add support for HP Auto-MDIX. LAN9218 doesn't have an external MII interface. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> --- still against 2.6.27, this time without style and DBG() changes. drivers/net/smc911x.c | 6 ++++-- drivers/net/smc911x.h | 14 ++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-)