Skip to content

Commit

Permalink
mmc: mxs-mmc: Add wp-inverted property
Browse files Browse the repository at this point in the history
The write-protect GPIO is inverted on some boards. Handle such case.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Marek Vasut authored and Chris Ball committed Jul 22, 2012
1 parent 9a0985b commit b6e76f1
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions drivers/mmc/host/mxs-mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,16 +164,23 @@ struct mxs_mmc_host {
spinlock_t lock;
int sdio_irq_en;
int wp_gpio;
bool wp_inverted;
};

static int mxs_mmc_get_ro(struct mmc_host *mmc)
{
struct mxs_mmc_host *host = mmc_priv(mmc);
int ret;

if (!gpio_is_valid(host->wp_gpio))
return -EINVAL;

return gpio_get_value(host->wp_gpio);
ret = gpio_get_value(host->wp_gpio);

if (host->wp_inverted)
ret = !ret;

return ret;
}

static int mxs_mmc_get_cd(struct mmc_host *mmc)
Expand Down Expand Up @@ -708,6 +715,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
int ret = 0, irq_err, irq_dma;
dma_cap_mask_t mask;
struct regulator *reg_vmmc;
enum of_gpio_flags flags;

iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
Expand Down Expand Up @@ -796,7 +804,10 @@ static int mxs_mmc_probe(struct platform_device *pdev)
mmc->caps |= MMC_CAP_4_BIT_DATA;
else if (bus_width == 8)
mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
host->wp_gpio = of_get_named_gpio(np, "wp-gpios", 0);
host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0,
&flags);
if (flags & OF_GPIO_ACTIVE_LOW)
host->wp_inverted = 1;
} else {
if (pdata->flags & SLOTF_8_BIT_CAPABLE)
mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;
Expand Down

0 comments on commit b6e76f1

Please sign in to comment.