diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-05-06 22:56:16 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 09:43:15 +0800 |
| commit | 9c92cf2409d7828b797c763c661bffbf66d251c0 (patch) | |
| tree | eafcbdaee696f45438392d506731e7ae1ae47634 /drivers/mmc | |
| parent | 2e174c3373bdbb4a4f35ac48d7c7fea181062f6f (diff) | |
| download | linux-9c92cf2409d7828b797c763c661bffbf66d251c0.tar.gz linux-9c92cf2409d7828b797c763c661bffbf66d251c0.tar.xz linux-9c92cf2409d7828b797c763c661bffbf66d251c0.zip | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 8 |
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 @@ #include <linux/regulator/consumer.h> #include <linux/module.h> #include <linux/fsl/mxs-dma.h> +#include <linux/pinctrl/consumer.h> #include <mach/mxs.h> #include <mach/common.h> @@ -682,6 +683,7 @@ static int mxs_mmc_probe(struct platform_device *pdev) struct mmc_host *mmc; struct resource *iores, *dmares, *r; struct mxs_mmc_platform_data *pdata; + struct pinctrl *pinctrl; int ret = 0, irq_err, irq_dma; dma_cap_mask_t mask; @@ -719,6 +721,12 @@ static int mxs_mmc_probe(struct platform_device *pdev) host->irq = irq_err; host->sdio_irq_en = 0; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) { + ret = PTR_ERR(pinctrl); + goto out_iounmap; + } + host->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(host->clk)) { ret = PTR_ERR(host->clk); |