diff options
| author | Yair Shapira <yair.shapira@ti.com> | 2012-11-27 01:44:43 -0500 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-12-04 10:01:39 -0500 |
| commit | d88949b7def1e982871406f3ad3efa361ffa6ffc (patch) | |
| tree | 78dc35e9d513293f1e4a9a1d3b2b54af1908c927 /drivers/net/wireless/ti/wl18xx/main.c | |
| parent | ec4f4b76a622822d5d47e99bf4062fc308a7d424 (diff) | |
wl18xx: support 2nd set of mac/phy tx-power params
First set (low, medium and high TX power values) is used
for STA-HP background role. The 2nd set is used for other roles.
Update other mac/phy parameters according to new FW.
Signed-off-by: Yair Shapira <yair.shapira@ti.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Conflicts:
drivers/net/wireless/ti/wl18xx/main.c
Diffstat (limited to 'drivers/net/wireless/ti/wl18xx/main.c')
| -rw-r--r-- | drivers/net/wireless/ti/wl18xx/main.c | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c index 3588e340634a..a45ecffef01a 100644 --- a/drivers/net/wireless/ti/wl18xx/main.c +++ b/drivers/net/wireless/ti/wl18xx/main.c | |||
| @@ -523,14 +523,37 @@ static struct wl18xx_priv_conf wl18xx_default_priv_conf = { | |||
| 523 | .enable_clpc = 0x00, | 523 | .enable_clpc = 0x00, |
| 524 | .enable_tx_low_pwr_on_siso_rdl = 0x00, | 524 | .enable_tx_low_pwr_on_siso_rdl = 0x00, |
| 525 | .rx_profile = 0x00, | 525 | .rx_profile = 0x00, |
| 526 | .pwr_limit_reference_11_abg = 0xc8, | 526 | .pwr_limit_reference_11_abg = 0x64, |
| 527 | .pwr_limit_reference_11p = 0xc8, | 527 | .per_chan_pwr_limit_arr_11abg = { |
| 528 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 529 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 530 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 531 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 532 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 533 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 534 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 535 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 536 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 537 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 538 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 539 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 540 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 541 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 542 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 543 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, | ||
| 544 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, | ||
| 545 | .pwr_limit_reference_11p = 0x64, | ||
| 546 | .per_chan_pwr_limit_arr_11p = { 0xff, 0xff, 0xff, 0xff, | ||
| 547 | 0xff, 0xff, 0xff }, | ||
| 528 | .psat = 0, | 548 | .psat = 0, |
| 529 | .low_power_val = 0x00, | 549 | .low_power_val = 0x08, |
| 530 | .med_power_val = 0x0a, | 550 | .med_power_val = 0x12, |
| 531 | .high_power_val = 0x11, | 551 | .high_power_val = 0x18, |
| 552 | .low_power_val_2nd = 0x05, | ||
| 553 | .med_power_val_2nd = 0x0a, | ||
| 554 | .high_power_val_2nd = 0x14, | ||
| 532 | .external_pa_dc2dc = 0, | 555 | .external_pa_dc2dc = 0, |
| 533 | .number_of_assembled_ant2_4 = 1, | 556 | .number_of_assembled_ant2_4 = 2, |
| 534 | .number_of_assembled_ant5 = 1, | 557 | .number_of_assembled_ant5 = 1, |
| 535 | .tx_rf_margin = 1, | 558 | .tx_rf_margin = 1, |
| 536 | }, | 559 | }, |