From 3879fe712f9055138a0270d4c2a22ceccc0b1330 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Tue, 26 Jun 2012 16:38:57 +0800 Subject: [PATCH] --- yaml --- r: 312839 b: refs/heads/master c: 4dc5a79f1350718ac31e4ab87eebce112b117a34 h: refs/heads/master i: 312837: 02e0306a0ed80d5723ba3b2c72238d0bcae0606e 312835: 156737d1aad4fefd60c58d8712abe0cdd3ac186a 312831: fe104cd7ef3f0086f6876cc3bae2b88bbdbf5832 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/mxs-mmc.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4a63f5d75e4d..281e315728f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b63b5e819d5b21ae493c17c356018ffa98d3ee1c +refs/heads/master: 4dc5a79f1350718ac31e4ab87eebce112b117a34 diff --git a/trunk/drivers/mmc/host/mxs-mmc.c b/trunk/drivers/mmc/host/mxs-mmc.c index 277161d279b8..2247c50f9869 100644 --- a/trunk/drivers/mmc/host/mxs-mmc.c +++ b/trunk/drivers/mmc/host/mxs-mmc.c @@ -707,6 +707,7 @@ static int mxs_mmc_probe(struct platform_device *pdev) struct pinctrl *pinctrl; int ret = 0, irq_err, irq_dma; dma_cap_mask_t mask; + struct regulator *reg_vmmc; iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0); @@ -747,6 +748,16 @@ static int mxs_mmc_probe(struct platform_device *pdev) host->mmc = mmc; host->sdio_irq_en = 0; + reg_vmmc = devm_regulator_get(&pdev->dev, "vmmc"); + if (!IS_ERR(reg_vmmc)) { + ret = regulator_enable(reg_vmmc); + if (ret) { + dev_err(&pdev->dev, + "Failed to enable vmmc regulator: %d\n", ret); + goto out_mmc_free; + } + } + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); if (IS_ERR(pinctrl)) { ret = PTR_ERR(pinctrl);