Merge tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[deliverable/linux.git] / drivers / net / wireless / brcm80211 / brcmfmac / chip.c

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
index ddae0b5e56eced02eed599d41decd62ab7b2e273..04d2ca0d87d60b11cd0a2ca0baac23867e700ed6 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
@@ -101,14 +101,7 @@
 /* ARM Cortex M3 core, ID 0x82a */
 #define BCM4329_CORE_ARM_BASE          0x18002000
 #define BCM4329_RAMSIZE                        0x48000
-
 /* bcm43143 */
-/* SDIO device core */
-#define BCM43143_CORE_BUS_BASE         0x18002000
-/* internal memory core */
-#define BCM43143_CORE_SOCRAM_BASE      0x18004000
-/* ARM Cortex M3 core, ID 0x82a */
-#define BCM43143_CORE_ARM_BASE         0x18003000
 #define BCM43143_RAMSIZE               0x70000
 
 #define CORE_SB(base, field) \
@@ -164,13 +157,6 @@ struct brcmf_core_priv {
        struct brcmf_chip_priv *chip;
 };
 
-/* ARM CR4 core specific control flag bits */
-#define ARMCR4_BCMA_IOCTL_CPUHALT      0x0020
-
-/* D11 core specific control flag bits */
-#define D11_BCMA_IOCTL_PHYCLOCKEN      0x0004
-#define D11_BCMA_IOCTL_PHYRESET                0x0008
-
 struct brcmf_chip_priv {
        struct brcmf_chip pub;
        const struct brcmf_buscore_ops *ops;
@@ -495,6 +481,7 @@ static void brcmf_chip_get_raminfo(struct brcmf_chip_priv *ci)
                ci->pub.ramsize = 0x48000;
                break;
        case BRCM_CC_4334_CHIP_ID:
+       case BRCM_CC_43340_CHIP_ID:
                ci->pub.ramsize = 0x80000;
                break;
        case BRCM_CC_4335_CHIP_ID: