brcmfmac: define and use platform specific data for SDIO.

This patch adds support for platform specific data for SDIO
fullmac devices. Currently OOB interrupts are configured by Kconfig
BRCMFMAC_SDIO_OOB but that is now determined dynamically by checking
availibility of platform data.

Cc: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Piotr Haber <phaber@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

6 files changed, 250 insertions, 187 deletions

diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig
index 747e9317dabd..fc8a0fa6d3b2 100644
--- a/drivers/net/wireless/brcm80211/Kconfig
+++ b/drivers/net/wireless/brcm80211/Kconfig
@@ -37,15 +37,6 @@ config BRCMFMAC_SDIO
           IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to
           use the driver for a SDIO wireless card.
 
-config BRCMFMAC_SDIO_OOB
-        bool "Out of band interrupt support for SDIO interface chipset"
-        depends on BRCMFMAC_SDIO
-        ---help---
-          This option enables out-of-band interrupt support for Broadcom
-          SDIO Wifi chipset using fullmac in order to gain better
-          performance and deep sleep wake up capability on certain
-          platforms. Say N if you are unsure.
-
 config BRCMFMAC_USB
         bool "USB bus interface support for FullMAC driver"
         depends on USB
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index aa51f370be49..4891e3df2058 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -25,6 +25,7 @@
 #include <linux/mmc/sdio.h>
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/card.h>
+#include <linux/platform_data/brcmfmac-sdio.h>
 
 #include <defs.h>
 #include <brcm_hw_ids.h>
@@ -37,16 +38,15 @@
 
 #define SDIOH_API_ACCESS_RETRY_LIMIT    2
 
-#ifdef CONFIG_BRCMFMAC_SDIO_OOB
-static irqreturn_t brcmf_sdio_irqhandler(int irq, void *dev_id)
+
+static irqreturn_t brcmf_sdio_oob_irqhandler(int irq, void *dev_id)
 {
         struct brcmf_bus *bus_if = dev_get_drvdata(dev_id);
         struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
 
-        brcmf_dbg(INTR, "oob intr triggered\n");
+        brcmf_dbg(INTR, "OOB intr triggered\n");
 
-        /*
-         * out-of-band interrupt is level-triggered which won't
+        /* out-of-band interrupt is level-triggered which won't
          * be cleared until dpc
          */
         if (sdiodev->irq_en) {
@@ -59,72 +59,12 @@ static irqreturn_t brcmf_sdio_irqhandler(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)
-{
-        int ret = 0;
-        u8 data;
-        unsigned long flags;
-
-        brcmf_dbg(SDIO, "Entering: irq %d\n", sdiodev->irq);
-
-        ret = request_irq(sdiodev->irq, brcmf_sdio_irqhandler,
-                          sdiodev->irq_flags, "brcmf_oob_intr",
-                          &sdiodev->func[1]->dev);
-        if (ret != 0)
-                return ret;
-        spin_lock_init(&sdiodev->irq_en_lock);
-        spin_lock_irqsave(&sdiodev->irq_en_lock, flags);
-        sdiodev->irq_en = true;
-        spin_unlock_irqrestore(&sdiodev->irq_en_lock, flags);
-
-        ret = enable_irq_wake(sdiodev->irq);
-        if (ret != 0)
-                return ret;
-        sdiodev->irq_wake = true;
-
-        sdio_claim_host(sdiodev->func[1]);
-
-        /* must configure SDIO_CCCR_IENx to enable irq */
-        data = brcmf_sdio_regrb(sdiodev, SDIO_CCCR_IENx, &ret);
-        data |= 1 << SDIO_FUNC_1 | 1 << SDIO_FUNC_2 | 1;
-        brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, data, &ret);
-
-        /* redirect, configure and enable io for interrupt signal */
-        data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE;
-        if (sdiodev->irq_flags & IRQF_TRIGGER_HIGH)
-                data |= SDIO_SEPINT_ACT_HI;
-        brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, data, &ret);
-
-        sdio_release_host(sdiodev->func[1]);
-
-        return 0;
-}
-
-int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev)
-{
-        brcmf_dbg(SDIO, "Entering\n");
-
-        sdio_claim_host(sdiodev->func[1]);
-        brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, 0, NULL);
-        brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, 0, NULL);
-        sdio_release_host(sdiodev->func[1]);
-
-        if (sdiodev->irq_wake) {
-                disable_irq_wake(sdiodev->irq);
-                sdiodev->irq_wake = false;
-        }
-        free_irq(sdiodev->irq, &sdiodev->func[1]->dev);
-        sdiodev->irq_en = false;
-
-        return 0;
-}
-#else           /* CONFIG_BRCMFMAC_SDIO_OOB */
-static void brcmf_sdio_irqhandler(struct sdio_func *func)
+static void brcmf_sdio_ib_irqhandler(struct sdio_func *func)
 {
         struct brcmf_bus *bus_if = dev_get_drvdata(&func->dev);
         struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
 
-        brcmf_dbg(INTR, "ib intr triggered\n");
+        brcmf_dbg(INTR, "IB intr triggered\n");
 
         brcmf_sdbrcm_isr(sdiodev->bus);
 }
@@ -136,12 +76,56 @@ static void brcmf_sdio_dummy_irqhandler(struct sdio_func *func)
 
 int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)
 {
-        brcmf_dbg(SDIO, "Entering\n");
+        int ret = 0;
+        u8 data;
+        unsigned long flags;
 
-        sdio_claim_host(sdiodev->func[1]);
-        sdio_claim_irq(sdiodev->func[1], brcmf_sdio_irqhandler);
-        sdio_claim_irq(sdiodev->func[2], brcmf_sdio_dummy_irqhandler);
-        sdio_release_host(sdiodev->func[1]);
+        if ((sdiodev->pdata) && (sdiodev->pdata->oob_irq_supported)) {
+                brcmf_dbg(SDIO, "Enter, register OOB IRQ %d\n",
+                          sdiodev->pdata->oob_irq_nr);
+                ret = request_irq(sdiodev->pdata->oob_irq_nr,
+                                  brcmf_sdio_oob_irqhandler,
+                                  sdiodev->pdata->oob_irq_flags,
+                                  "brcmf_oob_intr",
+                                  &sdiodev->func[1]->dev);
+                if (ret != 0) {
+                        brcmf_err("request_irq failed %d\n", ret);
+                        return ret;
+                }
+                sdiodev->oob_irq_requested = true;
+                spin_lock_init(&sdiodev->irq_en_lock);
+                spin_lock_irqsave(&sdiodev->irq_en_lock, flags);
+                sdiodev->irq_en = true;
+                spin_unlock_irqrestore(&sdiodev->irq_en_lock, flags);
+
+                ret = enable_irq_wake(sdiodev->pdata->oob_irq_nr);