diff options
| author | Shahar Levi <shahar_levi@ti.com> | 2011-03-06 16:32:09 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-04-19 16:19:48 +0300 |
| commit | 49d750ca14cd49e76ab039b33b5a621e0a92b9fd (patch) | |
| tree | b3507ef118e00c21a077204c3c0a0f9b760482c7 /drivers/net/wireless/wl12xx/init.c | |
| parent | a81159edf8d64011933df177ec42f82d7896a0c7 (diff) | |
| download | kernel_samsung_smdk4412-49d750ca14cd49e76ab039b33b5a621e0a92b9fd.zip kernel_samsung_smdk4412-49d750ca14cd49e76ab039b33b5a621e0a92b9fd.tar.gz kernel_samsung_smdk4412-49d750ca14cd49e76ab039b33b5a621e0a92b9fd.tar.bz2 | |
wl12xx: 1281/1283 support - New radio structs and functions
New general and radio parameters structures and functions.
Implemented as separate functions due to auto-detection
between wl127x and wl128x.
Signed-off-by: Shahar Levi <shahar_levi@ti.com>
Reviewed-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/init.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/init.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c index 34c4108..2dbc083 100644 --- a/drivers/net/wireless/wl12xx/init.c +++ b/drivers/net/wireless/wl12xx/init.c @@ -322,9 +322,11 @@ static int wl1271_sta_hw_init(struct wl1271 *wl) { int ret; - ret = wl1271_cmd_ext_radio_parms(wl); - if (ret < 0) - return ret; + if (wl->chip.id != CHIP_ID_1283_PG20) { + ret = wl1271_cmd_ext_radio_parms(wl); + if (ret < 0) + return ret; + } /* PS config */ ret = wl1271_acx_config_ps(wl); @@ -533,11 +535,17 @@ int wl1271_hw_init(struct wl1271 *wl) int ret, i; bool is_ap = (wl->bss_type == BSS_TYPE_AP_BSS); - ret = wl1271_cmd_general_parms(wl); + if (wl->chip.id == CHIP_ID_1283_PG20) + ret = wl128x_cmd_general_parms(wl); + else + ret = wl1271_cmd_general_parms(wl); if (ret < 0) return ret; - ret = wl1271_cmd_radio_parms(wl); + if (wl->chip.id == CHIP_ID_1283_PG20) + ret = wl128x_cmd_radio_parms(wl); + else + ret = wl1271_cmd_radio_parms(wl); if (ret < 0) return ret; |