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>

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 950c4257f421026fb6a915462eed959e8989fc1f..73232db2b4662c4b821c6ad73c6e5ea44b680337 100644 (file)
--- 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)
 
                break;
        case CHIP_ID_1271_PG10:
+               wl12xx_warning("chip id 0x%x (1271 PG10) support is obsolete",
+                              wl->chip.id);
+               break;
+       case CHIP_ID_1271_PG20:
+               wl12xx_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)",
+                            wl->chip.id);
+               break;
        case CHIP_ID_1251_PG10:
        case CHIP_ID_1251_PG11:
        default:

diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 32f62a699b2a901d17d1a4e370ab8c8585f14ea7..c1d00c01f7d30448507871d5b6d25dae8d3ed57e 100644 (file)
--- 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);
 #define CHIP_ID_1251_PG11                 (0x7020101)
 #define CHIP_ID_1251_PG12                 (0x7030101)
 #define CHIP_ID_1271_PG10                 (0x4030101)
+#define CHIP_ID_1271_PG20                 (0x4030111)
 
 #endif