Skip to content

Commit

Permalink
mmc: dw_mmc: support mmc power control with regulator
Browse files Browse the repository at this point in the history
This patch adds support for power regulators.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Jaehoon Chung authored and Chris Ball committed Mar 17, 2011
1 parent e61cf11 commit c07946a
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
25 changes: 25 additions & 0 deletions drivers/mmc/host/dw_mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <linux/mmc/mmc.h>
#include <linux/mmc/dw_mmc.h>
#include <linux/bitops.h>
#include <linux/regulator/consumer.h>

#include "dw_mmc.h"

Expand Down Expand Up @@ -1440,6 +1441,13 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id)
}
#endif /* CONFIG_MMC_DW_IDMAC */

host->vmmc = regulator_get(mmc_dev(mmc), "vmmc");
if (IS_ERR(host->vmmc)) {
printk(KERN_INFO "%s: no vmmc regulator found\n", mmc_hostname(mmc));
host->vmmc = NULL;
} else
regulator_enable(host->vmmc);

if (dw_mci_get_cd(mmc))
set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
else
Expand Down Expand Up @@ -1704,6 +1712,12 @@ static int dw_mci_probe(struct platform_device *pdev)
host->sg_cpu, host->sg_dma);
iounmap(host->regs);

if (host->vmmc) {
regulator_disable(host->vmmc);
regulator_put(host->vmmc);
}


err_freehost:
kfree(host);
return ret;
Expand Down Expand Up @@ -1735,6 +1749,11 @@ static int __exit dw_mci_remove(struct platform_device *pdev)
if (host->use_dma && host->dma_ops->exit)
host->dma_ops->exit(host);

if (host->vmmc) {
regulator_disable(host->vmmc);
regulator_put(host->vmmc);
}

iounmap(host->regs);

kfree(host);
Expand All @@ -1750,6 +1769,9 @@ static int dw_mci_suspend(struct platform_device *pdev, pm_message_t mesg)
int i, ret;
struct dw_mci *host = platform_get_drvdata(pdev);

if (host->vmmc)
regulator_enable(host->vmmc);

for (i = 0; i < host->num_slots; i++) {
struct dw_mci_slot *slot = host->slot[i];
if (!slot)
Expand All @@ -1765,6 +1787,9 @@ static int dw_mci_suspend(struct platform_device *pdev, pm_message_t mesg)
}
}

if (host->vmmc)
regulator_disable(host->vmmc);

return 0;
}

Expand Down
2 changes: 2 additions & 0 deletions include/linux/mmc/dw_mmc.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ struct dw_mci {

/* Workaround flags */
u32 quirks;

struct regulator *vmmc; /* Power regulator */
};

/* DMA ops for Internal/External DMAC interface */
Expand Down

0 comments on commit c07946a

Please sign in to comment.