[PATCH 2/2] mmc_spi: add support for card-detection polling
From: Anton Vorontsov <hidden>
Date: 2008-05-21 18:48:59
Also in:
linux-spi, lkml
Subsystem:
multimedia card (mmc) etc. over spi, multimedia card (mmc), secure digital (sd) and sdio subsystem, spi subsystem, the rest · Maintainers:
Ulf Hansson, Mark Brown, Linus Torvalds
If platform_data lacks init() callback (solely used to request card-detect interrupt), we mark the host as MMC_CAP_NEEDS_POLL. get_cd() host operation provided to optimize polling. p.s. Since mmc_host_ops no longer the same for every instance of mmc_spi, struct mmc_host_ops can't be const and should be allocated dynamically. Signed-off-by: Anton Vorontsov <redacted> --- drivers/mmc/host/mmc_spi.c | 31 +++++++++++++++++++++---------- include/linux/spi/mmc_spi.h | 6 ++++++ 2 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index 3550858..667855a 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c@@ -115,6 +115,7 @@ struct scratch { struct mmc_spi_host { struct mmc_host *mmc; + struct mmc_host_ops mmc_spi_ops; struct spi_device *spi; unsigned char power_mode;
@@ -1131,13 +1132,12 @@ static int mmc_spi_get_ro(struct mmc_host *mmc) return 0; } +static int mmc_spi_get_cd(struct mmc_host *mmc) +{ + struct mmc_spi_host *host = mmc_priv(mmc); -static const struct mmc_host_ops mmc_spi_ops = { - .request = mmc_spi_request, - .set_ios = mmc_spi_set_ios, - .get_ro = mmc_spi_get_ro, -}; - + return host->pdata->get_cd(mmc->parent); +} /****************************************************************************/
@@ -1236,8 +1236,12 @@ static int mmc_spi_probe(struct spi_device *spi) mmc = mmc_alloc_host(sizeof(*host), &spi->dev); if (!mmc) goto nomem; + host = mmc_priv(mmc); - mmc->ops = &mmc_spi_ops; + host->mmc_spi_ops.request = mmc_spi_request, + host->mmc_spi_ops.set_ios = mmc_spi_set_ios, + host->mmc_spi_ops.get_ro = mmc_spi_get_ro, + mmc->ops = &host->mmc_spi_ops; mmc->max_blk_size = MMC_SPI_BLOCKSIZE; /* As long as we keep track of the number of successfully
@@ -1256,7 +1260,6 @@ static int mmc_spi_probe(struct spi_device *spi) mmc->f_min = 400000; mmc->f_max = spi->max_speed_hz; - host = mmc_priv(mmc); host->mmc = mmc; host->spi = spi;
@@ -1323,13 +1326,21 @@ static int mmc_spi_probe(struct spi_device *spi) if (status != 0) goto fail_add_host; - dev_info(&spi->dev, "SD/MMC host %s%s%s%s\n", + if (host->pdata && !host->pdata->init) + mmc->caps |= MMC_CAP_NEEDS_POLL; + + if (host->pdata && host->pdata->get_cd) + host->mmc_spi_ops.get_cd = mmc_spi_get_cd; + + dev_info(&spi->dev, "SD/MMC host %s%s%s%s%s\n", mmc->class_dev.bus_id, host->dma_dev ? "" : ", no DMA", (host->pdata && host->pdata->get_ro) ? "" : ", no WP", (host->pdata && host->pdata->setpower) - ? "" : ", no poweroff"); + ? "" : ", no poweroff", + (mmc->caps & MMC_CAP_NEEDS_POLL) + ? ", cd polling" : ""); return 0; fail_add_host:
diff --git a/include/linux/spi/mmc_spi.h b/include/linux/spi/mmc_spi.h
index d5ca78b..915faf3 100644
--- a/include/linux/spi/mmc_spi.h
+++ b/include/linux/spi/mmc_spi.h@@ -23,6 +23,12 @@ struct mmc_spi_platform_data { /* sense switch on sd cards */ int (*get_ro)(struct device *); + /* + * if board does not use CD interrupts, driver can poll the CD + * line using this function. + */ + int (*get_cd)(struct device *); + /* how long to debounce card detect, in msecs */ u16 detect_delay;
--
1.5.5.1