Subject: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support

From: [email-masked] (Dong Aisheng)
Date: Thu, 10 May 2012 11:28:05 +0800

On Wed, May 09, 2012 at 07:33:02PM +0800, Richard Zhao wrote:
> Signed-off-by: Richard Zhao <[email-masked]>
> ---
>  sound/soc/fsl/imx-audmux.c |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
Acked-by: Dong Aisheng <[email-masked]>

I guess you may want it to go through arm-soc tree which already has
a patch asking pinctrl to provide dummies or it may break the drivers.

Regards
Dong Aisheng

> diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
> index f237003..0803274 100644
> --- a/sound/soc/fsl/imx-audmux.c
> +++ b/sound/soc/fsl/imx-audmux.c
> @@ -26,6 +26,7 @@
>  #include <linux/of_device.h>
>  #include <linux/platform_device.h>
>  #include <linux/slab.h>
> +#include <linux/pinctrl/consumer.h>
>  
>  #include "imx-audmux.h"
>  
> @@ -249,6 +250,7 @@ EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port);
>  static int __devinit imx_audmux_probe(struct platform_device *pdev)
>  {
>  	struct resource *res;
> +	struct pinctrl *pinctrl;
>  	const struct of_device_id *of_id =
>  			of_match_device(imx_audmux_dt_ids, &pdev->dev);
>  
> @@ -257,6 +259,12 @@ static int __devinit imx_audmux_probe(struct platform_device *pdev)
>  	if (!audmux_base)
>  		return -EADDRNOTAVAIL;
>  
> +	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
> +	if (IS_ERR(pinctrl)) {
> +		dev_err(&pdev->dev, "setup pinctrl failed!");
> +		return PTR_ERR(pinctrl);
> +	}
> +
>  	audmux_clk = clk_get(&pdev->dev, "audmux");
>  	if (IS_ERR(audmux_clk)) {
>  		dev_dbg(&pdev->dev, "cannot get clock: %ld\n",
> -- 
> 1.7.5.4
> 
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>