aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-05-06 10:56:16 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-05-11 21:43:15 -0400
commit9c92cf2409d7828b797c763c661bffbf66d251c0 (patch)
treeeafcbdaee696f45438392d506731e7ae1ae47634
parent2e174c3373bdbb4a4f35ac48d7c7fea181062f6f (diff)
mmc: mxs-mmc: adopt pinctrl support
Cc: linux-mmc@vger.kernel.org Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Chris Ball <cjb@laptop.org>
-rw-r--r--drivers/mmc/host/mxs-mmc.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index e3f5af96ab87..bb03ddda481d 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -39,6 +39,7 @@
39#include <linux/regulator/consumer.h> 39#include <linux/regulator/consumer.h>
40#include <linux/module.h> 40#include <linux/module.h>
41#include <linux/fsl/mxs-dma.h> 41#include <linux/fsl/mxs-dma.h>
42#include <linux/pinctrl/consumer.h>
42 43
43#include <mach/mxs.h> 44#include <mach/mxs.h>
44#include <mach/common.h> 45#include <mach/common.h>
@@ -682,6 +683,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
682 struct mmc_host *mmc; 683 struct mmc_host *mmc;
683 struct resource *iores, *dmares, *r; 684 struct resource *iores, *dmares, *r;
684 struct mxs_mmc_platform_data *pdata; 685 struct mxs_mmc_platform_data *pdata;
686 struct pinctrl *pinctrl;
685 int ret = 0, irq_err, irq_dma; 687 int ret = 0, irq_err, irq_dma;
686 dma_cap_mask_t mask; 688 dma_cap_mask_t mask;
687 689
@@ -719,6 +721,12 @@ static int mxs_mmc_probe(struct platform_device *pdev)
719 host->irq = irq_err; 721 host->irq = irq_err;
720 host->sdio_irq_en = 0; 722 host->sdio_irq_en = 0;
721 723
724 pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
725 if (IS_ERR(pinctrl)) {
726 ret = PTR_ERR(pinctrl);
727 goto out_iounmap;
728 }
729
722 host->clk = clk_get(&pdev->dev, NULL); 730 host->clk = clk_get(&pdev->dev, NULL);
723 if (IS_ERR(host->clk)) { 731 if (IS_ERR(host->clk)) {
724 ret = PTR_ERR(host->clk); 732 ret = PTR_ERR(host->clk);