aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2009-06-12 07:15:33 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 14:57:45 -0400
commit27797d68f70b28e77e6d183910dc7b3d7505105d (patch)
tree4715a30fad061a32173c6974f4196263e330928d /drivers/net
parent0d1c38398fa8cd478a229b4428fb511f813376e8 (diff)
wl12xx: add support for new WL1271 chip revision
This patch adds the code that recognizes the new WL1271 chip revision (PG 2.0). Full support for this chip is not yet implemented and support for WL1271 PG 1.0 is not guaranteed anymore. Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/wl12xx/main.c7
-rw-r--r--drivers/net/wireless/wl12xx/wl12xx.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 950c4257f421..73232db2b466 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -196,6 +196,13 @@ static int wl12xx_chip_wakeup(struct wl12xx *wl)
196 196
197 break; 197 break;
198 case CHIP_ID_1271_PG10: 198 case CHIP_ID_1271_PG10:
199 wl12xx_warning("chip id 0x%x (1271 PG10) support is obsolete",
200 wl->chip.id);
201 break;
202 case CHIP_ID_1271_PG20:
203 wl12xx_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)",
204 wl->chip.id);
205 break;
199 case CHIP_ID_1251_PG10: 206 case CHIP_ID_1251_PG10:
200 case CHIP_ID_1251_PG11: 207 case CHIP_ID_1251_PG11:
201 default: 208 default:
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 32f62a699b2a..c1d00c01f7d3 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -412,5 +412,6 @@ int wl12xx_plt_stop(struct wl12xx *wl);
412#define CHIP_ID_1251_PG11 (0x7020101) 412#define CHIP_ID_1251_PG11 (0x7020101)
413#define CHIP_ID_1251_PG12 (0x7030101) 413#define CHIP_ID_1251_PG12 (0x7030101)
414#define CHIP_ID_1271_PG10 (0x4030101) 414#define CHIP_ID_1271_PG10 (0x4030101)
415#define CHIP_ID_1271_PG20 (0x4030111)
415 416
416#endif 417#endif