summaryrefslogtreecommitdiff
path: root/drivers/mmc/host
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2010-05-19 18:36:02 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-05-22 17:05:21 +0900
commitac8fb3e8627d5494f3d2221925a82be4c1778b0e (patch)
tree5e2e62928e4eeb67aac2363b613ec087546912d6 /drivers/mmc/host
parent65a1b0347a329422e939e14daae6dad9a29e9cf2 (diff)
downloadlinux-3.10-ac8fb3e8627d5494f3d2221925a82be4c1778b0e.tar.gz
linux-3.10-ac8fb3e8627d5494f3d2221925a82be4c1778b0e.tar.bz2
linux-3.10-ac8fb3e8627d5494f3d2221925a82be4c1778b0e.zip
tmio: add a platform flag to disable card write-protection detection
Write-protection status is not always available, e.g., micro-SD cards do not have a write-protection switch at all. This patch adds a flag to let platforms force tmio_mmc to consider the card writable. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Ian Molton <ian@mnementh.co.uk> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/mmc/host')
-rw-r--r--drivers/mmc/host/tmio_mmc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 3ecd41875fa..faa16b7d941 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -748,8 +748,11 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
static int tmio_mmc_get_ro(struct mmc_host *mmc)
{
struct tmio_mmc_host *host = mmc_priv(mmc);
+ struct mfd_cell *cell = host->pdev->dev.platform_data;
+ struct tmio_mmc_data *pdata = cell->driver_data;
- return (sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT) ? 0 : 1;
+ return ((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) ||
+ (sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT)) ? 0 : 1;
}
static const struct mmc_host_ops tmio_mmc_ops = {