wl12xx: 1281/1283 support - enable chip support

Add support to wl128x chip via chip id

Signed-off-by: Shahar Levi <shahar_levi@ti.com>
Reviewed-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 692ebff38fc89ceb67e342a2f08c20f8f0284532..35ce7b0f4a609ad5eff9151bf37b4bf0979b5374 100644 (file)
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -3,7 +3,7 @@ menuconfig WL12XX_MENU
        depends on MAC80211 && EXPERIMENTAL
        ---help---
          This will enable TI wl12xx driver support for the following chips:
-         wl1271 and wl1273.
+         wl1271, wl1273, wl1281 and wl1283.
          The drivers make use of the mac80211 stack.
 
 config WL12XX

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 9a7ca6524d20f77509899abb14b10a4744287ba7..0b9d41f14b28825137c60362d4524ce665c2bf54 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1007,6 +1007,15 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)
                if (ret < 0)
                        goto out;
                break;
+       case CHIP_ID_1283_PG20:
+               wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1283 PG20)",
+                            wl->chip.id);
+
+               ret = wl1271_setup(wl);
+               if (ret < 0)
+                       goto out;
+               break;
+       case CHIP_ID_1283_PG10:
        default:
                wl1271_warning("unsupported chip id: 0x%x", wl->chip.id);
                ret = -ENODEV;

diff --git a/drivers/net/wireless/wl12xx/sdio_test.c b/drivers/net/wireless/wl12xx/sdio_test.c
index c02c870466154fa4d51dda1b747912044ee40b26..968249a4da3941f7b1b2a5ccc157ac2f94d94169 100644 (file)
--- a/drivers/net/wireless/wl12xx/sdio_test.c
+++ b/drivers/net/wireless/wl12xx/sdio_test.c
@@ -293,6 +293,11 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)
                wl1271_notice("chip id 0x%x (1271 PG20)",
                                wl->chip.id);
                break;
+       case CHIP_ID_1283_PG20:
+               wl1271_notice("chip id 0x%x (1283 PG20)",
+                               wl->chip.id);
+               break;
+       case CHIP_ID_1283_PG10:
        default:
                wl1271_warning("unsupported chip id: 0x%x", wl->chip.id);
                return -ENODEV;