Browse Source

MMC: S3C24XX: Add support to invert write protect line

Support for inverting the sense of the MMC driver's write
protect detection line.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Ben Dooks 17 years ago
parent
commit
cf0984c8ed
2 changed files with 11 additions and 2 deletions
  1. 9 2
      drivers/mmc/host/s3cmci.c
  2. 2 0
      include/asm-arm/plat-s3c24xx/mci.h

+ 9 - 2
drivers/mmc/host/s3cmci.c

@@ -1083,11 +1083,18 @@ static void s3cmci_reset(struct s3cmci_host *host)
 static int s3cmci_get_ro(struct mmc_host *mmc)
 static int s3cmci_get_ro(struct mmc_host *mmc)
 {
 {
 	struct s3cmci_host *host = mmc_priv(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 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 = {
 static struct mmc_host_ops s3cmci_ops = {

+ 2 - 0
include/asm-arm/plat-s3c24xx/mci.h

@@ -2,6 +2,8 @@
 #define _ARCH_MCI_H
 #define _ARCH_MCI_H
 
 
 struct s3c24xx_mci_pdata {
 struct s3c24xx_mci_pdata {
+	unsigned int	wprotect_invert : 1;
+
 	unsigned int	gpio_detect;
 	unsigned int	gpio_detect;
 	unsigned int	gpio_wprotect;
 	unsigned int	gpio_wprotect;
 	unsigned long	ocr_avail;
 	unsigned long	ocr_avail;