Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 219821
b: refs/heads/master
c: e5c4536
h: refs/heads/master
i:
  219819: 5de6983
v: v3
  • Loading branch information
Jason Cooper authored and Greg Kroah-Hartman committed Sep 14, 2010
1 parent becb222 commit 257a191
Show file tree
Hide file tree
Showing 9 changed files with 97 additions and 133 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 621458221781e3e943c56e1978614604cee3beaf
refs/heads/master: e5c4536fa4643ba15c06373f87e7a7e3080b8045
16 changes: 8 additions & 8 deletions trunk/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1857,17 +1857,17 @@ wlc_lcnphy_tx_iqlo_cal(phy_info_t *pi,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000
};

uint16 commands_fullcal[] =
{ 0x8434, 0x8334, 0x8084, 0x8267, 0x8056, 0x8234 };
uint16 commands_fullcal[] = {
0x8434, 0x8334, 0x8084, 0x8267, 0x8056, 0x8234 };

uint16 commands_recal[] =
{ 0x8434, 0x8334, 0x8084, 0x8267, 0x8056, 0x8234 };
uint16 commands_recal[] = {
0x8434, 0x8334, 0x8084, 0x8267, 0x8056, 0x8234 };

uint16 command_nums_fullcal[] =
{ 0x7a97, 0x7a97, 0x7a97, 0x7a87, 0x7a87, 0x7b97 };
uint16 command_nums_fullcal[] = {
0x7a97, 0x7a97, 0x7a97, 0x7a87, 0x7a87, 0x7b97 };

uint16 command_nums_recal[] =
{ 0x7a97, 0x7a97, 0x7a97, 0x7a87, 0x7a87, 0x7b97 };
uint16 command_nums_recal[] = {
0x7a97, 0x7a97, 0x7a97, 0x7a87, 0x7a87, 0x7b97 };
uint16 *command_nums = command_nums_fullcal;

uint16 *start_coeffs = NULL, *cal_cmds = NULL, cal_type, diq_start;
Expand Down
89 changes: 43 additions & 46 deletions trunk/drivers/staging/brcm80211/phy/wlc_phy_n.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14073,10 +14073,10 @@ static uint32 nphy_tpc_5GHz_txgain_HiPwrEPA[] = {

static uint8 ant_sw_ctrl_tbl_rev8_2o3[] = { 0x14, 0x18 };
static uint8 ant_sw_ctrl_tbl_rev8[] = { 0x4, 0x8, 0x4, 0x8, 0x11, 0x12 };
static uint8 ant_sw_ctrl_tbl_rev8_2057v7_core0[] =
{ 0x09, 0x0a, 0x15, 0x16, 0x09, 0x0a };
static uint8 ant_sw_ctrl_tbl_rev8_2057v7_core1[] =
{ 0x09, 0x0a, 0x09, 0x0a, 0x15, 0x16 };
static uint8 ant_sw_ctrl_tbl_rev8_2057v7_core0[] = {
0x09, 0x0a, 0x15, 0x16, 0x09, 0x0a };
static uint8 ant_sw_ctrl_tbl_rev8_2057v7_core1[] = {
0x09, 0x0a, 0x09, 0x0a, 0x15, 0x16 };

static bool wlc_phy_chan2freq_nphy(phy_info_t *pi, uint channel, int *f,
chan_info_nphy_radio2057_t **t0,
Expand Down Expand Up @@ -16075,10 +16075,10 @@ static void wlc_phy_workarounds_nphy(phy_info_t *pi)
if ((NREV_GE(pi->pubpi.phy_rev, 4))
&& (chan_freq_range == WL_CHAN_FREQ_RANGE_2G)) {

uint16 auxadc_vmid[] =
{ 0xa2, 0xb4, 0xb4, 0x270 };
uint16 auxadc_gain[] =
{ 0x02, 0x02, 0x02, 0x00 };
uint16 auxadc_vmid[] = {
0xa2, 0xb4, 0xb4, 0x270 };
uint16 auxadc_gain[] = {
0x02, 0x02, 0x02, 0x00 };

wlc_phy_table_write_nphy(pi,
NPHY_TBL_ID_AFECTRL, 4,
Expand Down Expand Up @@ -16371,42 +16371,42 @@ static void wlc_phy_workarounds_nphy_gainctrl(phy_info_t *pi)
int8 lna2A_gain_db_rev5[] = { -7, 0, 4, 8 };
int8 lna2A_gain_db_rev6[] = { -7, 0, 4, 8 };
int8 *lna2_gain_db = NULL;
int8 tiaG_gain_db[] =
{ 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A };
int8 tiaA_gain_db[] =
{ 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13 };
int8 tiaA_gain_db_rev4[] =
{ 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
int8 tiaA_gain_db_rev5[] =
{ 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
int8 tiaA_gain_db_rev6[] =
{ 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
int8 tiaG_gain_db[] = {
0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A };
int8 tiaA_gain_db[] = {
0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13 };
int8 tiaA_gain_db_rev4[] = {
0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
int8 tiaA_gain_db_rev5[] = {
0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
int8 tiaA_gain_db_rev6[] = {
0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
int8 *tia_gain_db;
int8 tiaG_gainbits[] =
{ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 };
int8 tiaA_gainbits[] =
{ 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06 };
int8 tiaA_gainbits_rev4[] =
{ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
int8 tiaA_gainbits_rev5[] =
{ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
int8 tiaA_gainbits_rev6[] =
{ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
int8 tiaG_gainbits[] = {
0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 };
int8 tiaA_gainbits[] = {
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06 };
int8 tiaA_gainbits_rev4[] = {
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
int8 tiaA_gainbits_rev5[] = {
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
int8 tiaA_gainbits_rev6[] = {
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
int8 *tia_gainbits;
int8 lpf_gain_db[] = { 0x00, 0x06, 0x0c, 0x12, 0x12, 0x12 };
int8 lpf_gainbits[] = { 0x00, 0x01, 0x02, 0x03, 0x03, 0x03 };
uint16 rfseqG_init_gain[] = { 0x613f, 0x613f, 0x613f, 0x613f };
uint16 rfseqG_init_gain_rev4[] = { 0x513f, 0x513f, 0x513f, 0x513f };
uint16 rfseqG_init_gain_rev5[] = { 0x413f, 0x413f, 0x413f, 0x413f };
uint16 rfseqG_init_gain_rev5_elna[] =
{ 0x013f, 0x013f, 0x013f, 0x013f };
uint16 rfseqG_init_gain_rev5_elna[] = {
0x013f, 0x013f, 0x013f, 0x013f };
uint16 rfseqG_init_gain_rev6[] = { 0x513f, 0x513f };
uint16 rfseqG_init_gain_rev6_224B0[] = { 0x413f, 0x413f };
uint16 rfseqG_init_gain_rev6_elna[] = { 0x113f, 0x113f };
uint16 rfseqA_init_gain[] = { 0x516f, 0x516f, 0x516f, 0x516f };
uint16 rfseqA_init_gain_rev4[] = { 0x614f, 0x614f, 0x614f, 0x614f };
uint16 rfseqA_init_gain_rev4_elna[] =
{ 0x314f, 0x314f, 0x314f, 0x314f };
uint16 rfseqA_init_gain_rev4_elna[] = {
0x314f, 0x314f, 0x314f, 0x314f };
uint16 rfseqA_init_gain_rev5[] = { 0x714f, 0x714f, 0x714f, 0x714f };
uint16 rfseqA_init_gain_rev6[] = { 0x714f, 0x714f };
uint16 *rfseq_init_gain;
Expand Down Expand Up @@ -16967,8 +16967,8 @@ static void wlc_phy_workarounds_nphy_gainctrl_2057_rev5(phy_info_t *pi)
int8 lna1_gain_db[] = { 8, 13, 17, 22 };
int8 lna2_gain_db[] = { -2, 7, 11, 15 };
int8 tia_gain_db[] = { -4, -1, 2, 5, 5, 5, 5, 5, 5, 5 };
int8 tia_gainbits[] =
{ 0x0, 0x01, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 };
int8 tia_gainbits[] = {
0x0, 0x01, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 };

mod_phy_reg(pi, 0x1c, (0x1 << 13), (1 << 13));
mod_phy_reg(pi, 0x32, (0x1 << 13), (1 << 13));
Expand Down Expand Up @@ -17091,8 +17091,8 @@ static void wlc_phy_workarounds_nphy_gainctrl_2057_rev6(phy_info_t *pi)
if ((freq <= 5080) || (freq == 5825)) {

int8 lna1A_gain_db_rev7[] = { 11, 16, 20, 24 };
int8 lna1A_gain_db_2_rev7[] =
{ 11, 17, 22, 25 };
int8 lna1A_gain_db_2_rev7[] = {
11, 17, 22, 25 };
int8 lna2A_gain_db_rev7[] = { -1, 6, 10, 14 };

crsminu_th = 0x3e;
Expand All @@ -17102,8 +17102,8 @@ static void wlc_phy_workarounds_nphy_gainctrl_2057_rev6(phy_info_t *pi)
} else if ((freq >= 5500) && (freq <= 5700)) {

int8 lna1A_gain_db_rev7[] = { 11, 17, 21, 25 };
int8 lna1A_gain_db_2_rev7[] =
{ 12, 18, 22, 26 };
int8 lna1A_gain_db_2_rev7[] = {
12, 18, 22, 26 };
int8 lna2A_gain_db_rev7[] = { 1, 8, 12, 16 };

crsminu_th = 0x45;
Expand All @@ -17116,8 +17116,8 @@ static void wlc_phy_workarounds_nphy_gainctrl_2057_rev6(phy_info_t *pi)
} else {

int8 lna1A_gain_db_rev7[] = { 12, 18, 22, 26 };
int8 lna1A_gain_db_2_rev7[] =
{ 12, 18, 22, 26 };
int8 lna1A_gain_db_2_rev7[] = {
12, 18, 22, 26 };
int8 lna2A_gain_db_rev7[] = { -1, 6, 10, 14 };

crsminu_th = 0x41;
Expand Down Expand Up @@ -22843,8 +22843,7 @@ static void wlc_phy_txcal_radio_setup_nphy(phy_info_t *pi)
core, TX_SSI_MUX, 0x4);
if (!
(pi->
internal_tx_iqlo_cal_tapoff_intpa_nphy))
{
internal_tx_iqlo_cal_tapoff_intpa_nphy)) {

WRITE_RADIO_REG3(pi, RADIO_2057,
TX, core,
Expand Down Expand Up @@ -22877,8 +22876,7 @@ static void wlc_phy_txcal_radio_setup_nphy(phy_info_t *pi)
0x06);
if (!
(pi->
internal_tx_iqlo_cal_tapoff_intpa_nphy))
{
internal_tx_iqlo_cal_tapoff_intpa_nphy)) {

WRITE_RADIO_REG3(pi, RADIO_2057,
TX, core,
Expand Down Expand Up @@ -28187,8 +28185,7 @@ static bool BCMATTACHFN(wlc_phy_txpwr_srom_read_nphy) (phy_info_t *pi)
(NPHY_SROM_TEMPSHIFT + NPHY_SROM_MAXTEMPOFFSET)) {
pi->phy_tempsense_offset = NPHY_SROM_MAXTEMPOFFSET;
} else if (pi->phy_tempsense_offset < (NPHY_SROM_TEMPSHIFT +
NPHY_SROM_MINTEMPOFFSET))
{
NPHY_SROM_MINTEMPOFFSET)) {
pi->phy_tempsense_offset = NPHY_SROM_MINTEMPOFFSET;
} else {
pi->phy_tempsense_offset -= NPHY_SROM_TEMPSHIFT;
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/brcm80211/sys/wlc_bmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1490,8 +1490,8 @@ wlc_bmac_mhf(wlc_hw_info_t *wlc_hw, uint8 idx, uint16 mask, uint16 val,
int bands)
{
uint16 save;
uint16 addr[MHFMAX] =
{ M_HOST_FLAGS1, M_HOST_FLAGS2, M_HOST_FLAGS3, M_HOST_FLAGS4,
uint16 addr[MHFMAX] = {
M_HOST_FLAGS1, M_HOST_FLAGS2, M_HOST_FLAGS3, M_HOST_FLAGS4,
M_HOST_FLAGS5
};
wlc_hwband_t *band;
Expand Down Expand Up @@ -1569,8 +1569,8 @@ uint16 wlc_bmac_mhf_get(wlc_hw_info_t *wlc_hw, uint8 idx, int bands)
static void wlc_write_mhf(wlc_hw_info_t *wlc_hw, uint16 *mhfs)
{
uint8 idx;
uint16 addr[] =
{ M_HOST_FLAGS1, M_HOST_FLAGS2, M_HOST_FLAGS3, M_HOST_FLAGS4,
uint16 addr[] = {
M_HOST_FLAGS1, M_HOST_FLAGS2, M_HOST_FLAGS3, M_HOST_FLAGS4,
M_HOST_FLAGS5
};

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/sys/wlc_channel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -971,8 +971,8 @@ static void wlc_channels_commit(wlc_cm_info_t *wlc_cm)
mboolset(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
WL_ERROR(("wl%d: %s: no valid channel for \"%s\" nbands %d bandlocked %d\n", wlc->pub->unit, __func__, wlc_cm->country_abbrev, NBANDS(wlc), wlc->bandlocked));
} else
if (mboolisset(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE))
{
if (mboolisset(wlc->pub->radio_disabled,
WL_RADIO_COUNTRY_DISABLE)) {
/* country/locale with valid channel, clear the radio disable bit */
mboolclr(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ static bool in_send_q = FALSE;
#define wme_shmemacindex(ac) wme_ac2fifo[ac]

#ifdef BCMDBG
static const char *fifo_names[] =
{ "AC_BK", "AC_BE", "AC_VI", "AC_VO", "BCMC", "ATIM" };
static const char *fifo_names[] = {
"AC_BK", "AC_BE", "AC_VI", "AC_VO", "BCMC", "ATIM" };
const char *aci_names[] = { "AC_BE", "AC_BK", "AC_VI", "AC_VO" };
#endif

Expand Down
15 changes: 5 additions & 10 deletions trunk/drivers/staging/brcm80211/util/bcmsrom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,7 @@ static const char BCMATTACHDATA(vstr_manfid)[] = "manfid=0x%x";
static const char BCMATTACHDATA(vstr_prodid)[] = "prodid=0x%x";
#ifdef BCMSDIO
static const char BCMATTACHDATA(vstr_sdmaxspeed)[] = "sdmaxspeed=%d";
static const char BCMATTACHDATA(vstr_sdmaxblk)[][13] =
{
static const char BCMATTACHDATA(vstr_sdmaxblk)[][13] = {
"sdmaxblk0=%d", "sdmaxblk1=%d", "sdmaxblk2=%d"};
#endif
static const char BCMATTACHDATA(vstr_regwindowsz)[] = "regwindowsz=%d";
Expand All @@ -271,22 +270,18 @@ static const char BCMATTACHDATA(vstr_aa5g)[] = "aa5g=0x%x";
static const char BCMATTACHDATA(vstr_ag)[] = "ag%d=0x%x";
static const char BCMATTACHDATA(vstr_cc)[] = "cc=%d";
static const char BCMATTACHDATA(vstr_opo)[] = "opo=%d";
static const char BCMATTACHDATA(vstr_pa0b)[][9] =
{
static const char BCMATTACHDATA(vstr_pa0b)[][9] = {
"pa0b0=%d", "pa0b1=%d", "pa0b2=%d"};

static const char BCMATTACHDATA(vstr_pa0itssit)[] = "pa0itssit=%d";
static const char BCMATTACHDATA(vstr_pa0maxpwr)[] = "pa0maxpwr=%d";
static const char BCMATTACHDATA(vstr_pa1b)[][9] =
{
static const char BCMATTACHDATA(vstr_pa1b)[][9] = {
"pa1b0=%d", "pa1b1=%d", "pa1b2=%d"};

static const char BCMATTACHDATA(vstr_pa1lob)[][11] =
{
static const char BCMATTACHDATA(vstr_pa1lob)[][11] = {
"pa1lob0=%d", "pa1lob1=%d", "pa1lob2=%d"};

static const char BCMATTACHDATA(vstr_pa1hib)[][11] =
{
static const char BCMATTACHDATA(vstr_pa1hib)[][11] = {
"pa1hib0=%d", "pa1hib1=%d", "pa1hib2=%d"};

static const char BCMATTACHDATA(vstr_pa1itssit)[] = "pa1itssit=%d";
Expand Down
Loading

0 comments on commit 257a191

Please sign in to comment.