Skip to content

Commit

Permalink
staging: brcm80211: remove use of si_* functions from wlc_phy_lcn.c
Browse files Browse the repository at this point in the history
The source file used si_alp_clock to determine crystal frequency.
It now uses the si_pmu_alp_clock call instead to remove dependency from
siutils functionality.

Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed May 3, 2011
1 parent da065a5 commit 7754116
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
Original file line number Diff line number Diff line change
Expand Up @@ -5053,7 +5053,7 @@ bool wlc_phy_attach_lcnphy(phy_info_t *pi)
pi->hwpwrctrl_capable = true;
}

pi->xtalfreq = si_alp_clock(pi->sh->sih);
pi->xtalfreq = si_pmu_alp_clock(pi->sh->sih);
pi_lcn->lcnphy_papd_rxGnCtrl_init = 0;

pi->pi_fptr.init = wlc_phy_init_lcnphy;
Expand Down
3 changes: 3 additions & 0 deletions drivers/staging/brcm80211/util/hndpmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,9 @@ u32 si_pmu_alp_clock(si_t *sih)
#ifdef BCMDBG
char chn[8];
#endif
/* bail out with default */
if (!PMUCTL_ENAB(sih))
return clock;

/* Remember original core before switch to chipc */
origidx = si_coreidx(sih);
Expand Down

0 comments on commit 7754116

Please sign in to comment.