Commit 8a64c0f6 authored by Daniel Mack's avatar Daniel Mack Committed by John W. Linville

libertas/sdio: 8686: set ECSI bit for 1-bit transfers

When operating in 1-bit mode, SDAT1 is used as dedicated interrupt line.
However, the 8686 will only drive this line when the ECSI bit is set in
the CCCR_IF register.

Thanks to Alagu Sankar for pointing me in the right direction.
Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Cc: Alagu Sankar <alagusankar@embwise.com>
Cc: Volker Ernst <volker.ernst@txtr.com>
Cc: Dan Williams <dcbw@redhat.com>
Cc: John W. Linville <linville@tuxdriver.com>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Bing Zhao <bzhao@marvell.com>
Cc: libertas-dev@lists.infradead.org
Cc: linux-wireless@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cfcfe446
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#include <linux/mmc/card.h> #include <linux/mmc/card.h>
#include <linux/mmc/sdio_func.h> #include <linux/mmc/sdio_func.h>
#include <linux/mmc/sdio_ids.h> #include <linux/mmc/sdio_ids.h>
#include <linux/mmc/sdio.h>
#include <linux/mmc/host.h>
#include "host.h" #include "host.h"
#include "decl.h" #include "decl.h"
...@@ -942,6 +944,7 @@ static int if_sdio_probe(struct sdio_func *func, ...@@ -942,6 +944,7 @@ static int if_sdio_probe(struct sdio_func *func,
int ret, i; int ret, i;
unsigned int model; unsigned int model;
struct if_sdio_packet *packet; struct if_sdio_packet *packet;
struct mmc_host *host = func->card->host;
lbs_deb_enter(LBS_DEB_SDIO); lbs_deb_enter(LBS_DEB_SDIO);
...@@ -1022,6 +1025,25 @@ static int if_sdio_probe(struct sdio_func *func, ...@@ -1022,6 +1025,25 @@ static int if_sdio_probe(struct sdio_func *func,
if (ret) if (ret)
goto disable; goto disable;
/* For 1-bit transfers to the 8686 model, we need to enable the
* interrupt flag in the CCCR register. Set the MMC_QUIRK_LENIENT_FN0
* bit to allow access to non-vendor registers. */
if ((card->model == IF_SDIO_MODEL_8686) &&
(host->caps & MMC_CAP_SDIO_IRQ) &&
(host->ios.bus_width == MMC_BUS_WIDTH_1)) {
u8 reg;
func->card->quirks |= MMC_QUIRK_LENIENT_FN0;
reg = sdio_f0_readb(func, SDIO_CCCR_IF, &ret);
if (ret)
goto release_int;
reg |= SDIO_BUS_ECSI;
sdio_f0_writeb(func, reg, SDIO_CCCR_IF, &ret);
if (ret)
goto release_int;
}
card->ioport = sdio_readb(func, IF_SDIO_IOPORT, &ret); card->ioport = sdio_readb(func, IF_SDIO_IOPORT, &ret);
if (ret) if (ret)
goto release_int; goto release_int;
......
...@@ -94,6 +94,8 @@ ...@@ -94,6 +94,8 @@
#define SDIO_BUS_WIDTH_1BIT 0x00 #define SDIO_BUS_WIDTH_1BIT 0x00
#define SDIO_BUS_WIDTH_4BIT 0x02 #define SDIO_BUS_WIDTH_4BIT 0x02
#define SDIO_BUS_ECSI 0x20 /* Enable continuous SPI interrupt */
#define SDIO_BUS_SCSI 0x40 /* Support continuous SPI interrupt */
#define SDIO_BUS_CD_DISABLE 0x80 /* disable pull-up on DAT3 (pin 1) */ #define SDIO_BUS_CD_DISABLE 0x80 /* disable pull-up on DAT3 (pin 1) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment