diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2016-01-09 18:37:55 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2016-01-09 18:37:55 +0000 |
commit | 437dd4cacf0e424048022c45ba4721534872e6b4 (patch) | |
tree | a2272fe98f0ce454bb68dcdb71795f2885981e23 /package/kernel/mac80211/patches/336-0004-brcmfmac-assure-device-is-ready-for-download-after-b.patch | |
parent | b44228e69a372360adc6253c5ca09b68b51df58a (diff) | |
download | upstream-437dd4cacf0e424048022c45ba4721534872e6b4.tar.gz upstream-437dd4cacf0e424048022c45ba4721534872e6b4.tar.bz2 upstream-437dd4cacf0e424048022c45ba4721534872e6b4.zip |
mac80211: group brcmfmac patches into sets as they were sent
It doesn't change any single patch (or order), it only renames files.
This creates some place for more backports, as we were already using
398 prefix which left only 1 slot.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48163 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/336-0004-brcmfmac-assure-device-is-ready-for-download-after-b.patch')
-rw-r--r-- | package/kernel/mac80211/patches/336-0004-brcmfmac-assure-device-is-ready-for-download-after-b.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/336-0004-brcmfmac-assure-device-is-ready-for-download-after-b.patch b/package/kernel/mac80211/patches/336-0004-brcmfmac-assure-device-is-ready-for-download-after-b.patch new file mode 100644 index 0000000000..6b1dd8144f --- /dev/null +++ b/package/kernel/mac80211/patches/336-0004-brcmfmac-assure-device-is-ready-for-download-after-b.patch @@ -0,0 +1,61 @@ +From: Arend van Spriel <arend@broadcom.com> +Date: Wed, 11 Mar 2015 16:11:30 +0100 +Subject: [PATCH] brcmfmac: assure device is ready for download after + brcmf_chip_attach() + +Make the brcmf_chip_attach() function responsible for putting the +device in a state where it is accessible for firmware download. + +Reviewed-by: Hante Meuleman <meuleman@broadcom.com> +Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> +Signed-off-by: Arend van Spriel <arend@broadcom.com> +Signed-off-by: Kalle Valo <kvalo@codeaurora.org> +--- + +--- a/drivers/net/wireless/brcm80211/brcmfmac/chip.c ++++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.c +@@ -786,12 +786,6 @@ static int brcmf_chip_setup(struct brcmf + if (chip->ops->setup) + ret = chip->ops->setup(chip->ctx, pub); + +- /* +- * Make sure any on-chip ARM is off (in case strapping is wrong), +- * or downloaded code was already running. +- */ +- brcmf_chip_disable_arm(chip, BCMA_CORE_ARM_CM3); +- brcmf_chip_disable_arm(chip, BCMA_CORE_ARM_CR4); + return ret; + } + +@@ -833,6 +827,8 @@ struct brcmf_chip *brcmf_chip_attach(voi + if (err < 0) + goto fail; + ++ /* assure chip is passive for download */ ++ brcmf_chip_set_passive(&chip->pub); + return &chip->pub; + + fail: +--- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c ++++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c +@@ -509,8 +509,6 @@ static void brcmf_pcie_attach(struct brc + + static int brcmf_pcie_enter_download_state(struct brcmf_pciedev_info *devinfo) + { +- brcmf_chip_set_passive(devinfo->ci); +- + if (devinfo->ci->chip == BRCM_CC_43602_CHIP_ID) { + brcmf_pcie_select_core(devinfo, BCMA_CORE_ARM_CR4); + brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_ARMCR4REG_BANKIDX, +--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c ++++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c +@@ -3356,9 +3356,6 @@ static int brcmf_sdio_download_firmware( + sdio_claim_host(bus->sdiodev->func[1]); + brcmf_sdio_clkctl(bus, CLK_AVAIL, false); + +- /* Keep arm in reset */ +- brcmf_chip_set_passive(bus->ci); +- + rstvec = get_unaligned_le32(fw->data); + brcmf_dbg(SDIO, "firmware rstvec: %x\n", rstvec); + |