Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249322
b: refs/heads/master
c: 683d069
h: refs/heads/master
v: v3
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed May 3, 2011
1 parent a1b2ee1 commit 099ef18
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 27302e8fa2d05f9aafa09a096da181dd02cc12ea
refs/heads/master: 683d06921d7a7e75e310fd2d579ffdc8c6e88e27
16 changes: 10 additions & 6 deletions trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,10 @@ si_pmu_spuravoid_pllupdate(si_t *sih, chipcregs_t *cc, u8 spuravoid)
case BCM43236_CHIP_ID:
case BCM43238_CHIP_ID:

/* BCM5357 needs to touch PLL1_PLLCTL[02], so offset PLL0_PLLCTL[02] by 6 */
/*
* BCM5357 needs to touch PLL1_PLLCTL[02],
* so offset PLL0_PLLCTL[02] by 6
*/
phypll_offset = (sih->chip == BCM5357_CHIP_ID) ? 6 : 0;

/* RMW only the P1 divider */
Expand Down Expand Up @@ -821,10 +824,12 @@ si_pmu_spuravoid_pllupdate(si_t *sih, chipcregs_t *cc, u8 spuravoid)
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL5);
W_REG(&cc->pllcontrol_data, 0x88888854);

if (spuravoid == 1) { /* spur_avoid ON, enable 41/82/164Mhz clock mode */
if (spuravoid == 1) {
/* spur_avoid ON, so enable 41/82/164Mhz clock mode */
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL2);
W_REG(&cc->pllcontrol_data, 0x05201828);
} else { /* enable 40/80/160Mhz clock mode */
} else {
/* enable 40/80/160Mhz clock mode */
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL2);
W_REG(&cc->pllcontrol_data, 0x05001828);
}
Expand All @@ -847,11 +852,10 @@ si_pmu_spuravoid_pllupdate(si_t *sih, chipcregs_t *cc, u8 spuravoid)
W_REG(&cc->pllcontrol_data, 0x88888825);

W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL3);
if (spuravoid == 1) {
if (spuravoid == 1)
W_REG(&cc->pllcontrol_data, 0x00EC4EC4);
} else {
else
W_REG(&cc->pllcontrol_data, 0x00762762);
}

tmp = PCTL_PLL_PLLCTL_UPD;
break;
Expand Down

0 comments on commit 099ef18

Please sign in to comment.