From: Lee Hyuk <[email protected]> S5PV210 HSMMC host controller doesn't have the WP pin which should be connnected with SDMMC card WP pin. So if there are the cfg_wp and get_ro in pdata, configure the WP pin and replace get_ro function in sdhci with get_ro function in pdata.
Signed-off-by: Hyuk Lee <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> --- drivers/mmc/host/sdhci-s3c.c | 12 ++++++++++++ drivers/mmc/host/sdhci.c | 3 +++ drivers/mmc/host/sdhci.h | 3 +++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index af21792..857cbed 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -311,6 +311,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) if (pdata->cfg_gpio) pdata->cfg_gpio(pdev, pdata->max_width); + if (pdata->get_ro) + sdhci_s3c_ops.get_ro = pdata->get_ro; + host->hw_name = "samsung-hsmmc"; host->ops = &sdhci_s3c_ops; host->quirks = 0; @@ -335,6 +338,15 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) host->quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR | SDHCI_QUIRK_32BIT_DMA_SIZE); + /* Controller's WP pin donsn't connected with SD card. So we allocate + * a GPIO for getting WP data form SD card and use that data as + * the return value of the get_ro function */ + host->quirks |= SDHCI_QUIRK_NO_WP_BIT; + + /* to configure gpio pin as a card write protection signal */ + if (pdata->cfg_wp) + pdata->cfg_wp(pdev->id); + ret = sdhci_add_host(host); if (ret) { dev_err(dev, "sdhci_add_host() failed\n"); diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index c6d1bd8..2f8dfbc 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1192,6 +1192,9 @@ static int sdhci_get_ro(struct mmc_host *mmc) host = mmc_priv(mmc); + if ((host->quirks & SDHCI_QUIRK_NO_WP_BIT) && host->ops->get_ro) + return host->ops->get_ro(mmc); + spin_lock_irqsave(&host->lock, flags); if (host->flags & SDHCI_DEVICE_DEAD) diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index c846813..f479e22 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -240,6 +240,8 @@ struct sdhci_host { #define SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN (1<<25) /* Controller cannot support End Attribute in NOP ADMA descriptor */ #define SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC (1<<26) +/* Controller has no write-protect pin connected with SD card */ +#define SDHCI_QUIRK_NO_WP_BIT (1<<27) int irq; /* Device IRQ */ void __iomem * ioaddr; /* Mapped address */ @@ -312,6 +314,7 @@ struct sdhci_ops { unsigned int (*get_max_clock)(struct sdhci_host *host); unsigned int (*get_min_clock)(struct sdhci_host *host); unsigned int (*get_timeout_clock)(struct sdhci_host *host); + int (*get_ro)(struct mmc_host *mmc); }; #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS -- 1.6.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
