diff options
author | Igal Chernobelsky <igalc@ti.com> | 2013-09-09 05:24:32 -0400 |
---|---|---|
committer | Luciano Coelho <luciano.coelho@intel.com> | 2013-10-23 02:47:38 -0400 |
commit | 50e4c905a0c782b8a5717ed0d907c53d82c16ce2 (patch) | |
tree | bf0c5fe981e29a779ad6dbac418fecff383bf5b9 /drivers/net/wireless/ti/wl18xx/main.c | |
parent | a1b13b9ad3759dca24c6b721ee026c540a4e6564 (diff) |
wl18xx: default config alignment with phy defaults
Driver default config is aligned with phy default parameters.
Now that RDL1_3 has 2 antennas defined by default we need to explicitly
define ht.mode to HT_MODE_WIDE to have SISO40 as default.
Signed-off-by: Yair Shapira <yair.shapira@ti.com>
Signed-off-by: Igal Chernobelsky <igalc@ti.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/ti/wl18xx/main.c')
-rw-r--r-- | drivers/net/wireless/ti/wl18xx/main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c index d0daca1d23bc..b48d01db3ef4 100644 --- a/drivers/net/wireless/ti/wl18xx/main.c +++ b/drivers/net/wireless/ti/wl18xx/main.c | |||
@@ -505,7 +505,7 @@ static struct wlcore_conf wl18xx_conf = { | |||
505 | 505 | ||
506 | static struct wl18xx_priv_conf wl18xx_default_priv_conf = { | 506 | static struct wl18xx_priv_conf wl18xx_default_priv_conf = { |
507 | .ht = { | 507 | .ht = { |
508 | .mode = HT_MODE_DEFAULT, | 508 | .mode = HT_MODE_WIDE, |
509 | }, | 509 | }, |
510 | .phy = { | 510 | .phy = { |
511 | .phy_standalone = 0x00, | 511 | .phy_standalone = 0x00, |
@@ -516,7 +516,7 @@ static struct wl18xx_priv_conf wl18xx_default_priv_conf = { | |||
516 | .auto_detect = 0x00, | 516 | .auto_detect = 0x00, |
517 | .dedicated_fem = FEM_NONE, | 517 | .dedicated_fem = FEM_NONE, |
518 | .low_band_component = COMPONENT_3_WAY_SWITCH, | 518 | .low_band_component = COMPONENT_3_WAY_SWITCH, |
519 | .low_band_component_type = 0x04, | 519 | .low_band_component_type = 0x05, |
520 | .high_band_component = COMPONENT_2_WAY_SWITCH, | 520 | .high_band_component = COMPONENT_2_WAY_SWITCH, |
521 | .high_band_component_type = 0x09, | 521 | .high_band_component_type = 0x09, |
522 | .tcxo_ldo_voltage = 0x00, | 522 | .tcxo_ldo_voltage = 0x00, |
@@ -556,15 +556,15 @@ static struct wl18xx_priv_conf wl18xx_default_priv_conf = { | |||
556 | .per_chan_pwr_limit_arr_11p = { 0xff, 0xff, 0xff, 0xff, | 556 | .per_chan_pwr_limit_arr_11p = { 0xff, 0xff, 0xff, 0xff, |
557 | 0xff, 0xff, 0xff }, | 557 | 0xff, 0xff, 0xff }, |
558 | .psat = 0, | 558 | .psat = 0, |
559 | .low_power_val = 0x08, | ||
560 | .med_power_val = 0x12, | ||
561 | .high_power_val = 0x18, | ||
562 | .low_power_val_2nd = 0x05, | ||
563 | .med_power_val_2nd = 0x0a, | ||
564 | .high_power_val_2nd = 0x14, | ||
565 | .external_pa_dc2dc = 0, | 559 | .external_pa_dc2dc = 0, |
566 | .number_of_assembled_ant2_4 = 2, | 560 | .number_of_assembled_ant2_4 = 2, |
567 | .number_of_assembled_ant5 = 1, | 561 | .number_of_assembled_ant5 = 1, |
562 | .low_power_val = 0xff, | ||
563 | .med_power_val = 0xff, | ||
564 | .high_power_val = 0xff, | ||
565 | .low_power_val_2nd = 0xff, | ||
566 | .med_power_val_2nd = 0xff, | ||
567 | .high_power_val_2nd = 0xff, | ||
568 | .tx_rf_margin = 1, | 568 | .tx_rf_margin = 1, |
569 | }, | 569 | }, |
570 | }; | 570 | }; |