Support for inverting the sense of the MMC driver's write
protect detection line.
Signed-off-by: Ben Dooks <[email protected]>
Index: linux-2.6.26-rc8-next20080627/drivers/mmc/host/s3cmci.c
===================================================================
--- linux-2.6.26-rc8-next20080627.orig/drivers/mmc/host/s3cmci.c 2008-06-30 12:31:46.000000000 +0100
+++ linux-2.6.26-rc8-next20080627/drivers/mmc/host/s3cmci.c 2008-06-30 12:36:42.000000000 +0100
@@ -1083,11 +1083,18 @@ static void s3cmci_reset(struct s3cmci_h
static int s3cmci_get_ro(struct mmc_host *mmc)
{
struct s3cmci_host *host = mmc_priv(mmc);
+ struct s3c24xx_mci_pdata *pdata = host->pdata;
+ int ret;
- if (host->pdata->gpio_wprotect == 0)
+ if (pdata->gpio_wprotect == 0)
return 0;
- return s3c2410_gpio_getpin(host->pdata->gpio_wprotect);
+ ret = s3c2410_gpio_getpin(pdata->gpio_wprotect);
+
+ if (pdata->wprotect_invert)
+ ret = !ret;
+
+ return ret;
}
static struct mmc_host_ops s3cmci_ops = {
Index: linux-2.6.26-rc8-next20080627/include/asm-arm/plat-s3c24xx/mci.h
===================================================================
--- linux-2.6.26-rc8-next20080627.orig/include/asm-arm/plat-s3c24xx/mci.h 2008-06-30 12:31:37.000000000 +0100
+++ linux-2.6.26-rc8-next20080627/include/asm-arm/plat-s3c24xx/mci.h 2008-06-30 12:36:42.000000000 +0100
@@ -2,6 +2,8 @@
#define _ARCH_MCI_H
struct s3c24xx_mci_pdata {
+ unsigned int wprotect_invert : 1;
+
unsigned int gpio_detect;
unsigned int gpio_wprotect;
unsigned long ocr_avail;
--
Ben ([email protected], http://www.fluff.org/)
'a smiley only costs 4 bytes'