diff options
-rw-r--r-- | drivers/net/wireless/wl12xx/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/sdio_test.c | 5 |
3 files changed, 15 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig index 692ebff38fc8..35ce7b0f4a60 100644 --- a/drivers/net/wireless/wl12xx/Kconfig +++ b/drivers/net/wireless/wl12xx/Kconfig | |||
@@ -3,7 +3,7 @@ menuconfig WL12XX_MENU | |||
3 | depends on MAC80211 && EXPERIMENTAL | 3 | depends on MAC80211 && EXPERIMENTAL |
4 | ---help--- | 4 | ---help--- |
5 | This will enable TI wl12xx driver support for the following chips: | 5 | This will enable TI wl12xx driver support for the following chips: |
6 | wl1271 and wl1273. | 6 | wl1271, wl1273, wl1281 and wl1283. |
7 | The drivers make use of the mac80211 stack. | 7 | The drivers make use of the mac80211 stack. |
8 | 8 | ||
9 | config WL12XX | 9 | config WL12XX |
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 9a7ca6524d20..0b9d41f14b28 100644 --- 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) | |||
1007 | if (ret < 0) | 1007 | if (ret < 0) |
1008 | goto out; | 1008 | goto out; |
1009 | break; | 1009 | break; |
1010 | case CHIP_ID_1283_PG20: | ||
1011 | wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1283 PG20)", | ||
1012 | wl->chip.id); | ||
1013 | |||
1014 | ret = wl1271_setup(wl); | ||
1015 | if (ret < 0) | ||
1016 | goto out; | ||
1017 | break; | ||
1018 | case CHIP_ID_1283_PG10: | ||
1010 | default: | 1019 | default: |
1011 | wl1271_warning("unsupported chip id: 0x%x", wl->chip.id); | 1020 | wl1271_warning("unsupported chip id: 0x%x", wl->chip.id); |
1012 | ret = -ENODEV; | 1021 | ret = -ENODEV; |
diff --git a/drivers/net/wireless/wl12xx/sdio_test.c b/drivers/net/wireless/wl12xx/sdio_test.c index c02c87046615..968249a4da39 100644 --- 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) | |||
293 | wl1271_notice("chip id 0x%x (1271 PG20)", | 293 | wl1271_notice("chip id 0x%x (1271 PG20)", |
294 | wl->chip.id); | 294 | wl->chip.id); |
295 | break; | 295 | break; |
296 | case CHIP_ID_1283_PG20: | ||
297 | wl1271_notice("chip id 0x%x (1283 PG20)", | ||
298 | wl->chip.id); | ||
299 | break; | ||
300 | case CHIP_ID_1283_PG10: | ||
296 | default: | 301 | default: |
297 | wl1271_warning("unsupported chip id: 0x%x", wl->chip.id); | 302 | wl1271_warning("unsupported chip id: 0x%x", wl->chip.id); |
298 | return -ENODEV; | 303 | return -ENODEV; |