diff options
Diffstat (limited to 'drivers/net/wireless/brcm80211/include/chipcommon.h')
-rw-r--r-- | drivers/net/wireless/brcm80211/include/chipcommon.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/include/chipcommon.h b/drivers/net/wireless/brcm80211/include/chipcommon.h index f96834a7c055..d242333b7559 100644 --- a/drivers/net/wireless/brcm80211/include/chipcommon.h +++ b/drivers/net/wireless/brcm80211/include/chipcommon.h | |||
@@ -205,7 +205,7 @@ struct chipcregs { | |||
205 | u32 res_req_timer_sel; | 205 | u32 res_req_timer_sel; |
206 | u32 res_req_timer; | 206 | u32 res_req_timer; |
207 | u32 res_req_mask; | 207 | u32 res_req_mask; |
208 | u32 PAD; | 208 | u32 pmucapabilities_ext; /* 0x64c, pmurev >=15 */ |
209 | u32 chipcontrol_addr; /* 0x650 */ | 209 | u32 chipcontrol_addr; /* 0x650 */ |
210 | u32 chipcontrol_data; /* 0x654 */ | 210 | u32 chipcontrol_data; /* 0x654 */ |
211 | u32 regcontrol_addr; | 211 | u32 regcontrol_addr; |
@@ -214,7 +214,11 @@ struct chipcregs { | |||
214 | u32 pllcontrol_data; | 214 | u32 pllcontrol_data; |
215 | u32 pmustrapopt; /* 0x668, corerev >= 28 */ | 215 | u32 pmustrapopt; /* 0x668, corerev >= 28 */ |
216 | u32 pmu_xtalfreq; /* 0x66C, pmurev >= 10 */ | 216 | u32 pmu_xtalfreq; /* 0x66C, pmurev >= 10 */ |
217 | u32 PAD[100]; | 217 | u32 retention_ctl; /* 0x670, pmurev >= 15 */ |
218 | u32 PAD[3]; | ||
219 | u32 retention_grpidx; /* 0x680 */ | ||
220 | u32 retention_grpctl; /* 0x684 */ | ||
221 | u32 PAD[94]; | ||
218 | u16 sromotp[768]; | 222 | u16 sromotp[768]; |
219 | }; | 223 | }; |
220 | 224 | ||
@@ -276,6 +280,12 @@ struct chipcregs { | |||
276 | #define PCAP5_VC_SHIFT 22 | 280 | #define PCAP5_VC_SHIFT 22 |
277 | #define PCAP5_CC_MASK 0xf8000000 | 281 | #define PCAP5_CC_MASK 0xf8000000 |
278 | #define PCAP5_CC_SHIFT 27 | 282 | #define PCAP5_CC_SHIFT 27 |
283 | /* pmucapabilites_ext PMU rev >= 15 */ | ||
284 | #define PCAPEXT_SR_SUPPORTED_MASK (1 << 1) | ||
285 | /* retention_ctl PMU rev >= 15 */ | ||
286 | #define PMU_RCTL_MACPHY_DISABLE_MASK (1 << 26) | ||
287 | #define PMU_RCTL_LOGIC_DISABLE_MASK (1 << 27) | ||
288 | |||
279 | 289 | ||
280 | /* | 290 | /* |
281 | * Maximum delay for the PMU state transition in us. | 291 | * Maximum delay for the PMU state transition in us. |