[PATCH 4/9] mmc: mxs-mmc: adopt pinctrl support

[Chris Ball]

Hi,

Patch looks fine -- perhaps you could copy the explanation about the
dummy pinctrl state for non-DT boards from your series introduction
into this commit message, since the commit messages go into git and
the series description doesn't?  Thanks.

On Sun, May 06 2012, Shawn Guo wrote:
> Cc: Chris Ball <cjb at laptop.org>
> Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
> ---
>  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 e3f5af9..bb03ddd 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);

Acked-by: Chris Ball <cjb at laptop.org>

- Chris.
-- 
Chris Ball   <cjb at laptop.org>   <http://printf.net/>
One Laptop Per Child