Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 568ba389 authored by Hans de Goede's avatar Hans de Goede Committed by John W. Linville
Browse files

brcmfmac: Fix OOB interrupt not working for BCM43362 

It has taken me a long long time to get the OOB interrupt working on the
AP6210 sdio wifi/bt module found on various Allwinner A20 boards. In the
end I found these magic register pokes in the cubietruck kernel tree:
https://github.com/cubieboard2/linux-sunxi/commit/7f08ba395617d17e7a711507503d89a50406fe7a



This is also done for the bcm43362 in broadcom's internal/proprietary driver.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
[arend@broadcom.com: rebased changing BCM43362 chip id to fix compilation]
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cf9ae8fa

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

+16 −0
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ 
#include <brcm_hw_ids.h>

#include <brcmu_utils.h>

#include <brcmu_wifi.h>

#include <chipcommon.h>

#include <soc.h>

#include "chip.h"

#include "dhd_bus.h"

#include "dhd_dbg.h"

#include "sdio_host.h"
@@ -118,6 +120,7 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev) 
{

	int ret = 0;

	u8 data;

	u32 addr, gpiocontrol;

	unsigned long flags;



	if ((sdiodev->pdata) && (sdiodev->pdata->oob_irq_supported)) {
@@ -147,6 +150,19 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev) 


		sdio_claim_host(sdiodev->func[1]);



		if (sdiodev->bus_if->chip == BRCM_CC_43362_CHIP_ID) {

			/* assign GPIO to SDIO core */

			addr = CORE_CC_REG(SI_ENUM_BASE, gpiocontrol);

			gpiocontrol = brcmf_sdiod_regrl(sdiodev, addr, &ret);

			gpiocontrol |= 0x2;

			brcmf_sdiod_regwl(sdiodev, addr, gpiocontrol, &ret);



			brcmf_sdiod_regwb(sdiodev, SBSDIO_GPIO_SELECT, 0xf,

					  &ret);

			brcmf_sdiod_regwb(sdiodev, SBSDIO_GPIO_OUT, 0, &ret);

			brcmf_sdiod_regwb(sdiodev, SBSDIO_GPIO_EN, 0x2, &ret);

		}



		/* must configure SDIO_CCCR_IENx to enable irq */

		data = brcmf_sdiod_regrb(sdiodev, SDIO_CCCR_IENx, &ret);

		data |= 1 << SDIO_FUNC_1 | 1 << SDIO_FUNC_2 | 1;