diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-06-30 17:16:13 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-10 20:16:52 +0400 |
| commit | 1ef1a57de7078edc2504d156be606249cc32c199 (patch) | |
| tree | b48c953ec2da6c1931d7d1bacaff64abb7277a17 /drivers/net/wireless/brcm80211/brcmsmac/pmu.c | |
| parent | 780b9c4644616ff6f91a196ce95655effdd3a0ea (diff) | |
| download | linux-1ef1a57de7078edc2504d156be606249cc32c199.tar.xz | |
brcmsmac: use chip and package id constants from bcma
This patch depends on addin the chip IDs to bcma done in this commit in
my pending patch series for bcma.
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun Jun 3 18:17:57 2012 +0200
bcma: add constants for chip ids
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/pmu.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/pmu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pmu.c b/drivers/net/wireless/brcm80211/brcmsmac/pmu.c index 6b4344f1d2e3..7e9df566c733 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/pmu.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/pmu.c @@ -103,9 +103,9 @@ u16 si_pmu_fast_pwrup_delay(struct si_pub *sih) uint delay = PMU_MAX_TRANSITION_DLY; switch (ai_get_chip_id(sih)) { - case BCM43224_CHIP_ID: - case BCM43225_CHIP_ID: - case BCM4313_CHIP_ID: + case BCMA_CHIP_ID_BCM43224: + case BCMA_CHIP_ID_BCM43225: + case BCMA_CHIP_ID_BCM4313: delay = 3700; break; default: @@ -156,9 +156,9 @@ u32 si_pmu_alp_clock(struct si_pub *sih) return clock; switch (ai_get_chip_id(sih)) { - case BCM43224_CHIP_ID: - case BCM43225_CHIP_ID: - case BCM4313_CHIP_ID: + case BCMA_CHIP_ID_BCM43224: + case BCMA_CHIP_ID_BCM43225: + case BCMA_CHIP_ID_BCM4313: /* always 20Mhz */ clock = 20000 * 1000; break; |