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

Commit 436947fc authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

ASoC: fsl: imx-audmux: 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 avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 666c25e3

sound/soc/fsl/imx-audmux.c

+0 −8
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/pinctrl/consumer.h>



#include "imx-audmux.h"
@@ -247,7 +246,6 @@ EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port); 
static int 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);
@@ -256,12 +254,6 @@ static int imx_audmux_probe(struct platform_device *pdev) 
	if (IS_ERR(audmux_base))

		return PTR_ERR(audmux_base);



	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 = devm_clk_get(&pdev->dev, "audmux");

	if (IS_ERR(audmux_clk)) {

		dev_dbg(&pdev->dev, "cannot get clock: %ld\n",