diff options
| author | Luciano Coelho <coelho@ti.com> | 2012-05-10 05:14:16 -0400 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-06-05 08:58:46 -0400 |
| commit | 5add82edd14d9bf051e06588ac65c7e2182bd330 (patch) | |
| tree | 837e7e8bef199dac0caeeb2e03e8626b071a4c87 /drivers | |
| parent | 8334271882b46e4bc15337ed27428be121156165 (diff) | |
wl18xx: add power limit reference value to mac_and_phy settings
With more recent PHY firmware versions (>8.1.0.0.116), we need to use
the correct value for the pwr_limit_reference_11_abg parameter when
setting the mac_and_phy options.
For now we use a hardcoded 0xc8 as the value. This will be moved to
the configuration binary when it gets implemented.
Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ti/wl18xx/conf.h | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/ti/wl18xx/main.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ti/wl18xx/conf.h b/drivers/net/wireless/ti/wl18xx/conf.h index a6058fb86e7f..ffad302b6cb7 100644 --- a/drivers/net/wireless/ti/wl18xx/conf.h +++ b/drivers/net/wireless/ti/wl18xx/conf.h | |||
| @@ -43,6 +43,7 @@ struct wl18xx_conf_phy { | |||
| 43 | u8 primary_clock_setting_time; | 43 | u8 primary_clock_setting_time; |
| 44 | u8 clock_valid_on_wake_up; | 44 | u8 clock_valid_on_wake_up; |
| 45 | u8 secondary_clock_setting_time; | 45 | u8 secondary_clock_setting_time; |
| 46 | u8 pwr_limit_reference_11_abg; | ||
| 46 | }; | 47 | }; |
| 47 | 48 | ||
| 48 | struct wl18xx_priv_conf { | 49 | struct wl18xx_priv_conf { |
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c index 07955984face..ab3dd118f7de 100644 --- a/drivers/net/wireless/ti/wl18xx/main.c +++ b/drivers/net/wireless/ti/wl18xx/main.c | |||
| @@ -501,6 +501,7 @@ static struct wl18xx_priv_conf wl18xx_default_priv_conf = { | |||
| 501 | .enable_clpc = 0x00, | 501 | .enable_clpc = 0x00, |
| 502 | .enable_tx_low_pwr_on_siso_rdl = 0x00, | 502 | .enable_tx_low_pwr_on_siso_rdl = 0x00, |
| 503 | .rx_profile = 0x00, | 503 | .rx_profile = 0x00, |
| 504 | .pwr_limit_reference_11_abg = 0xc8, | ||
| 504 | }, | 505 | }, |
| 505 | }; | 506 | }; |
| 506 | 507 | ||
| @@ -726,6 +727,8 @@ static void wl18xx_set_mac_and_phy(struct wl1271 *wl) | |||
| 726 | phy->clock_valid_on_wake_up; | 727 | phy->clock_valid_on_wake_up; |
| 727 | params.secondary_clock_setting_time = | 728 | params.secondary_clock_setting_time = |
| 728 | phy->secondary_clock_setting_time; | 729 | phy->secondary_clock_setting_time; |
| 730 | params.pwr_limit_reference_11_abg = | ||
| 731 | phy->pwr_limit_reference_11_abg; | ||
| 729 | 732 | ||
| 730 | params.board_type = priv->board_type; | 733 | params.board_type = priv->board_type; |
| 731 | 734 | ||