diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-06 15:26:03 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-12 12:43:37 -0400 |
commit | 9b74fad508049471a8c783b9960b7834aba76293 (patch) | |
tree | 367216ff80b4ff305b95a86a9de325ece5863f93 | |
parent | f722406faae2d073cc1d01063d1123c35425939e (diff) |
ASoC: sam9g20ek: Let device core handle pinctrl
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>
Tested-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
-rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 2d6fbd0125b9..802717eccbd0 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c | |||
@@ -38,8 +38,6 @@ | |||
38 | #include <linux/platform_device.h> | 38 | #include <linux/platform_device.h> |
39 | #include <linux/i2c.h> | 39 | #include <linux/i2c.h> |
40 | 40 | ||
41 | #include <linux/pinctrl/consumer.h> | ||
42 | |||
43 | #include <linux/atmel-ssc.h> | 41 | #include <linux/atmel-ssc.h> |
44 | 42 | ||
45 | #include <sound/core.h> | 43 | #include <sound/core.h> |
@@ -203,15 +201,8 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) | |||
203 | struct device_node *codec_np, *cpu_np; | 201 | struct device_node *codec_np, *cpu_np; |
204 | struct clk *pllb; | 202 | struct clk *pllb; |
205 | struct snd_soc_card *card = &snd_soc_at91sam9g20ek; | 203 | struct snd_soc_card *card = &snd_soc_at91sam9g20ek; |
206 | struct pinctrl *pinctrl; | ||
207 | int ret; | 204 | int ret; |
208 | 205 | ||
209 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
210 | if (IS_ERR(pinctrl)) { | ||
211 | dev_err(&pdev->dev, "Failed to request pinctrl for mck\n"); | ||
212 | return PTR_ERR(pinctrl); | ||
213 | } | ||
214 | |||
215 | if (!np) { | 206 | if (!np) { |
216 | if (!(machine_is_at91sam9g20ek() || | 207 | if (!(machine_is_at91sam9g20ek() || |
217 | machine_is_at91sam9g20ek_2mmc())) | 208 | machine_is_at91sam9g20ek_2mmc())) |