aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/imx-audmux.c
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-05-06 16:39:08 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-12 12:45:34 -0400
commit436947fc82237e2cd78b3b2c11633aaa6ef07641 (patch)
tree437a6522cb5421d8d7b635acc1035df7fdb85451 /sound/soc/fsl/imx-audmux.c
parent666c25e3d759dfd33c6df4cd3a26f1bfed65215e (diff)
ASoC: fsl: imx-audmux: 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: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl/imx-audmux.c')
-rw-r--r--sound/soc/fsl/imx-audmux.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index 47f046a8fdab..e260f1f899db 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -26,7 +26,6 @@
26#include <linux/of_device.h> 26#include <linux/of_device.h>
27#include <linux/platform_device.h> 27#include <linux/platform_device.h>
28#include <linux/slab.h> 28#include <linux/slab.h>
29#include <linux/pinctrl/consumer.h>
30 29
31#include "imx-audmux.h" 30#include "imx-audmux.h"
32 31
@@ -247,7 +246,6 @@ EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port);
247static int imx_audmux_probe(struct platform_device *pdev) 246static int imx_audmux_probe(struct platform_device *pdev)
248{ 247{
249 struct resource *res; 248 struct resource *res;
250 struct pinctrl *pinctrl;
251 const struct of_device_id *of_id = 249 const struct of_device_id *of_id =
252 of_match_device(imx_audmux_dt_ids, &pdev->dev); 250 of_match_device(imx_audmux_dt_ids, &pdev->dev);
253 251
@@ -256,12 +254,6 @@ static int imx_audmux_probe(struct platform_device *pdev)
256 if (IS_ERR(audmux_base)) 254 if (IS_ERR(audmux_base))
257 return PTR_ERR(audmux_base); 255 return PTR_ERR(audmux_base);
258 256
259 pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
260 if (IS_ERR(pinctrl)) {
261 dev_err(&pdev->dev, "setup pinctrl failed!");
262 return PTR_ERR(pinctrl);
263 }
264
265 audmux_clk = devm_clk_get(&pdev->dev, "audmux"); 257 audmux_clk = devm_clk_get(&pdev->dev, "audmux");
266 if (IS_ERR(audmux_clk)) { 258 if (IS_ERR(audmux_clk)) {
267 dev_dbg(&pdev->dev, "cannot get clock: %ld\n", 259 dev_dbg(&pdev->dev, "cannot get clock: %ld\n",