brcmfmac: read extended capabilities of ChipCommon core

This is an extra bitfield with info about some present hardware.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
index 55952d43dfb59b8061ffd168311b757ada61c08f..f4a4d00cb4a2622d725aca6d70e2eee31c26466a 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
@@ -1025,6 +1025,9 @@ static int brcmf_chip_setup(struct brcmf_chip_priv *chip)
        /* get chipcommon capabilites */
        pub->cc_caps = chip->ops->read32(chip->ctx,
                                         CORE_CC_REG(base, capabilities));
+       pub->cc_caps_ext = chip->ops->read32(chip->ctx,
+                                            CORE_CC_REG(base,
+                                                        capabilities_ext));
 
        /* get pmu caps & rev */
        if (pub->cc_caps & CC_CAP_PMU) {

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
index f6b5feea23d20508abf4fc0e6670adf51b966d33..cb9145f1786a11992f710ff41939be37e1ce0ef2 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
@@ -27,6 +27,7 @@
  * @chip: chip identifier.
  * @chiprev: chip revision.
  * @cc_caps: chipcommon core capabilities.
+ * @cc_caps_ext: chipcommon core extended capabilities.
  * @pmucaps: PMU capabilities.
  * @pmurev: PMU revision.
  * @rambase: RAM base address (only applicable for ARM CR4 chips).
@@ -38,6 +39,7 @@ struct brcmf_chip {
        u32 chip;
        u32 chiprev;
        u32 cc_caps;
+       u32 cc_caps_ext;
        u32 pmucaps;
        u32 pmurev;
        u32 rambase;