diff options
author | Franky Lin <frankyl@broadcom.com> | 2011-12-08 18:06:40 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-12-13 15:31:20 -0500 |
commit | ffb2756511a90091185e9be0652cc10eee0890d0 (patch) | |
tree | e0024b772df2aeef02b22efc035f1739ebc7a67b /drivers/net/wireless/brcm80211/brcmfmac | |
parent | ce2d7d7e8fd88191f5d1c92a8b33aeb0cb12ea34 (diff) |
brcm80211: fmac: remove drive strength code for unsupported chips
bcm4325 and bcm4336 are not supported by brcmfmac. Remove the
drive strength setting code specific for these chips.
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | 52 |
1 files changed, 2 insertions, 50 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c index d299059a2815..a6048d78d294 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | |||
@@ -59,40 +59,8 @@ struct sdiod_drive_str { | |||
59 | u8 strength; /* Pad Drive Strength in mA */ | 59 | u8 strength; /* Pad Drive Strength in mA */ |
60 | u8 sel; /* Chip-specific select value */ | 60 | u8 sel; /* Chip-specific select value */ |
61 | }; | 61 | }; |
62 | /* SDIO Drive Strength to sel value table for PMU Rev 1 */ | ||
63 | static const struct sdiod_drive_str sdiod_drive_strength_tab1[] = { | ||
64 | { | ||
65 | 4, 0x2}, { | ||
66 | 2, 0x3}, { | ||
67 | 1, 0x0}, { | ||
68 | 0, 0x0} | ||
69 | }; | ||
70 | /* SDIO Drive Strength to sel value table for PMU Rev 2, 3 */ | ||
71 | static const struct sdiod_drive_str sdiod_drive_strength_tab2[] = { | ||
72 | { | ||
73 | 12, 0x7}, { | ||
74 | 10, 0x6}, { | ||
75 | 8, 0x5}, { | ||
76 | 6, 0x4}, { | ||
77 | 4, 0x2}, { | ||
78 | 2, 0x1}, { | ||
79 | 0, 0x0} | ||
80 | }; | ||
81 | /* SDIO Drive Strength to sel value table for PMU Rev 8 (1.8V) */ | ||
82 | static const struct sdiod_drive_str sdiod_drive_strength_tab3[] = { | ||
83 | { | ||
84 | 32, 0x7}, { | ||
85 | 26, 0x6}, { | ||
86 | 22, 0x5}, { | ||
87 | 16, 0x4}, { | ||
88 | 12, 0x3}, { | ||
89 | 8, 0x2}, { | ||
90 | 4, 0x1}, { | ||
91 | 0, 0x0} | ||
92 | }; | ||
93 | |||
94 | /* SDIO Drive Strength to sel value table for PMU Rev 11 (1.8V) */ | 62 | /* SDIO Drive Strength to sel value table for PMU Rev 11 (1.8V) */ |
95 | static const struct sdiod_drive_str sdiod_drvstr_tab4_1v8[] = { | 63 | static const struct sdiod_drive_str sdiod_drvstr_tab1_1v8[] = { |
96 | {32, 0x6}, | 64 | {32, 0x6}, |
97 | {26, 0x7}, | 65 | {26, 0x7}, |
98 | {22, 0x4}, | 66 | {22, 0x4}, |
@@ -598,24 +566,8 @@ brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev, | |||
598 | return; | 566 | return; |
599 | 567 | ||
600 | switch (SDIOD_DRVSTR_KEY(ci->chip, ci->pmurev)) { | 568 | switch (SDIOD_DRVSTR_KEY(ci->chip, ci->pmurev)) { |
601 | case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 1): | ||
602 | str_tab = (struct sdiod_drive_str *)&sdiod_drive_strength_tab1; | ||
603 | str_mask = 0x30000000; | ||
604 | str_shift = 28; | ||
605 | break; | ||
606 | case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 2): | ||
607 | case SDIOD_DRVSTR_KEY(BCM4325_CHIP_ID, 3): | ||
608 | str_tab = (struct sdiod_drive_str *)&sdiod_drive_strength_tab2; | ||
609 | str_mask = 0x00003800; | ||
610 | str_shift = 11; | ||
611 | break; | ||
612 | case SDIOD_DRVSTR_KEY(BCM4336_CHIP_ID, 8): | ||
613 | str_tab = (struct sdiod_drive_str *)&sdiod_drive_strength_tab3; | ||
614 | str_mask = 0x00003800; | ||
615 | str_shift = 11; | ||
616 | break; | ||
617 | case SDIOD_DRVSTR_KEY(BCM4330_CHIP_ID, 12): | 569 | case SDIOD_DRVSTR_KEY(BCM4330_CHIP_ID, 12): |
618 | str_tab = (struct sdiod_drive_str *)&sdiod_drvstr_tab4_1v8; | 570 | str_tab = (struct sdiod_drive_str *)&sdiod_drvstr_tab1_1v8; |
619 | str_mask = 0x00003800; | 571 | str_mask = 0x00003800; |
620 | str_shift = 11; | 572 | str_shift = 11; |
621 | break; | 573 | break; |