Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c92cf24 authored by Shawn Guo's avatar Shawn Guo
Browse files

mmc: mxs-mmc: adopt pinctrl support 



Cc: linux-mmc@vger.kernel.org
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarChris Ball <cjb@laptop.org>
parent 2e174c33

drivers/mmc/host/mxs-mmc.c

+8 −0
Original line number Diff line number Diff line
@@ -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);