sdio: add SDIO_FBR_BASE(f) macro

[linux-2.6] / drivers / mmc / core / sdio.c

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 62df8e177585b9668629faacf3f5564a6b259990..58cf36e44678908463fc5490f45ed854035b95f9 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -30,7 +30,7 @@ static int sdio_read_fbr(struct sdio_func *func)
        unsigned char data;
 
        ret = mmc_io_rw_direct(func->card, 0, 0,
-               func->num * 0x100 + SDIO_FBR_STD_IF, 0, &data);
+               SDIO_FBR_BASE(func->num) + SDIO_FBR_STD_IF, 0, &data);
        if (ret)
                goto out;
 
@@ -38,7 +38,7 @@ static int sdio_read_fbr(struct sdio_func *func)
 
        if (data == 0x0f) {
                ret = mmc_io_rw_direct(func->card, 0, 0,
-                       func->num * 0x100 + SDIO_FBR_STD_IF_EXT, 0, &data);
+                       SDIO_FBR_BASE(func->num) + SDIO_FBR_STD_IF_EXT, 0, &data);
                if (ret)
                        goto out;
        }
@@ -138,6 +138,32 @@ out:
        return ret;
 }
 
+static int sdio_enable_wide(struct mmc_card *card)
+{
+       int ret;
+       u8 ctrl;
+
+       if (!(card->host->caps & MMC_CAP_4_BIT_DATA))
+               return 0;
+
+       if (card->cccr.low_speed && !card->cccr.wide_bus)
+               return 0;
+
+       ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_IF, 0, &ctrl);
+       if (ret)
+               return ret;
+
+       ctrl |= SDIO_BUS_WIDTH_4BIT;
+
+       ret = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_IF, ctrl, NULL);
+       if (ret)
+               return ret;
+
+       mmc_set_bus_width(card->host, MMC_BUS_WIDTH_4);
+
+       return 0;
+}
+
 /*
  * Host is being removed. Free up the current card.
  */
@@ -299,6 +325,13 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
         */
        mmc_set_clock(host, card->cis.max_dtr);
 
+       /*
+        * Switch to wider bus (if supported).
+        */
+       err = sdio_enable_wide(card);
+       if (err)
+               goto remove;
+
        /*
         * Initialize (but don't add) all present functions.
         */