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

Commit 9b74fad5 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: sam9g20ek: Let device core handle pinctrl 



Since commit ab78029e (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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: default avatarBo Shen <voice.shen@atmel.com>
Acked-by: default avatarBo Shen <voice.shen@atmel.com>
parent f722406f

sound/soc/atmel/sam9g20_wm8731.c

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