[PATCH] ASoC: sam9g20ek: Let device core handle pinctrl

[PATCH] ASoC: sam9g20ek: Let device core handle pinctrl

[Mark Brown]

Since commit ab78029 (drivers/pinctrl: grab default handles from device
core) we can rely on device core for handling pinctrl so remove
devm_pinctrl_get_select_default() from the driver.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/atmel/sam9g20_wm8731.c |    9 ---------
 1 file changed, 9 deletions(-)

diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 2d6fbd0..802717e 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -38,8 +38,6 @@
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 
-#include <linux/pinctrl/consumer.h>
-
 #include <linux/atmel-ssc.h>
 
 #include <sound/core.h>
@@ -203,15 +201,8 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
 	struct device_node *codec_np, *cpu_np;
 	struct clk *pllb;
 	struct snd_soc_card *card = &snd_soc_at91sam9g20ek;
-	struct pinctrl *pinctrl;
 	int ret;
 
-	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-	if (IS_ERR(pinctrl)) {
-		dev_err(&pdev->dev, "Failed to request pinctrl for mck\n");
-		return PTR_ERR(pinctrl);
-	}
-
 	if (!np) {
 		if (!(machine_is_at91sam9g20ek() ||
 			machine_is_at91sam9g20ek_2mmc()))
-- 
1.7.10.4

Re: [PATCH] ASoC: sam9g20ek: Let device core handle pinctrl

[Bo Shen]

Hi Mark,

On 5/7/2013 03:28, Mark Brown wrote:
> Since commit ab78029 (drivers/pinctrl: grab default handles from device
> core) we can rely on device core for handling pinctrl so remove
> devm_pinctrl_get_select_default() from the driver.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>   sound/soc/atmel/sam9g20_wm8731.c |    9 ---------
>   1 file changed, 9 deletions(-)
>
> diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
> index 2d6fbd0..802717e 100644
> --- a/sound/soc/atmel/sam9g20_wm8731.c
> +++ b/sound/soc/atmel/sam9g20_wm8731.c
> @@ -38,8 +38,6 @@
>   #include <linux/platform_device.h>
>   #include <linux/i2c.h>
>
> -#include <linux/pinctrl/consumer.h>
> -
>   #include <linux/atmel-ssc.h>
>
>   #include <sound/core.h>
> @@ -203,15 +201,8 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
>   	struct device_node *codec_np, *cpu_np;
>   	struct clk *pllb;
>   	struct snd_soc_card *card = &snd_soc_at91sam9g20ek;
> -	struct pinctrl *pinctrl;
>   	int ret;
>
> -	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
> -	if (IS_ERR(pinctrl)) {
> -		dev_err(&pdev->dev, "Failed to request pinctrl for mck\n");
> -		return PTR_ERR(pinctrl);
> -	}
> -

I have one question: with this patch, if lose default pinctrl 
configuration in dts/dtsi file, how should we know that?

Best Regards,
Bo Shen

Re: [PATCH] ASoC: sam9g20ek: Let device core handle pinctrl

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 496 bytes --]

On Tue, May 07, 2013 at 10:10:10AM +0800, Bo Shen wrote:
> On 5/7/2013 03:28, Mark Brown wrote:

> >Since commit ab78029 (drivers/pinctrl: grab default handles from device
> >core) we can rely on device core for handling pinctrl so remove
> >devm_pinctrl_get_select_default() from the driver.

> I have one question: with this patch, if lose default pinctrl
> configuration in dts/dtsi file, how should we know that?

I'd hope the core does something sensible with this, though I've not
checked.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ASoC: sam9g20ek: Let device core handle pinctrl

[Bo Shen]

Hi Mark,

On 5/7/2013 17:01, Mark Brown wrote:
> On Tue, May 07, 2013 at 10:10:10AM +0800, Bo Shen wrote:
>> On 5/7/2013 03:28, Mark Brown wrote:
>
>>> Since commit ab78029 (drivers/pinctrl: grab default handles from device
>>> core) we can rely on device core for handling pinctrl so remove
>>> devm_pinctrl_get_select_default() from the driver.
>
>> I have one question: with this patch, if lose default pinctrl
>> configuration in dts/dtsi file, how should we know that?
>
> I'd hope the core does something sensible with this, though I've not
> checked.

except this consideration.

Tested-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Bo Shen <voice.shen@atmel.com>

Best Regards,
Bo Shen