Return-path: Received: from mail-gw2-out.broadcom.com ([216.31.210.63]:40585 "EHLO mail-gw2-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751615AbaE0RDF (ORCPT ); Tue, 27 May 2014 13:03:05 -0400 Message-ID: <5384C544.9000903@broadcom.com> (sfid-20140527_190311_296724_8FEA4B47) Date: Tue, 27 May 2014 19:03:00 +0200 From: Arend van Spriel MIME-Version: 1.0 To: Hans de Goede CC: Linus Walleij , Chris Ball , Ulf Hansson , "John W. Linville" , Maxime Ripard , Chen-Yu Tsai , , , , devicetree , Subject: Re: [PATCH 09/11] brcmfmac: Fix OOB interrupt not working for BCM43362 References: <1401090486-4414-1-git-send-email-hdegoede@redhat.com> <1401090486-4414-10-git-send-email-hdegoede@redhat.com> In-Reply-To: <1401090486-4414-10-git-send-email-hdegoede@redhat.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: On 05/26/14 09:48, Hans de Goede wrote: > 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 > > I'm not entirely sure if this specific to the AP6210 module, or if this > should be done for all BCM43362 sdio devices. Let keep it as this for now. I added some remarks below. Regards, Arend > Signed-off-by: Hans de Goede > --- > drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > index 0fc707c..2369a0f 100644 > --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c > @@ -39,7 +39,9 @@ > #include > #include > #include > +#include > #include > +#include "chip.h" > #include "dhd_bus.h" > #include "dhd_dbg.h" > #include "sdio_host.h" > @@ -119,6 +121,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)) { > @@ -148,6 +151,21 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev) > > sdio_claim_host(sdiodev->func[1]); > > + if (sdiodev->bus_if->chip == BCM43362_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); > + > + /* SPROM_ADDR_HIGH ? perhaps the defines name is off */ These names are all off. These should be: SBSDIO_SPROM_ADDR_HIGH = SBSDIO_GPIO_SELECT SBSDIO_CHIP_CTRL_DATA = SBSDIO_GPIO_OUT SBSDIO_CHIP_CTRL_EN = SBSDIO_GPIO_EN > + brcmf_sdiod_regwb(sdiodev, SBSDIO_SPROM_ADDR_HIGH, 0xf, > + &ret); > + brcmf_sdiod_regwb(sdiodev, SBSDIO_CHIP_CTRL_DATA, 0, > + &ret); > + brcmf_sdiod_regwb(sdiodev, SBSDIO_CHIP_CTRL_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;