* [PATCH 12/13] ASoC: fsl: imx-audmux: Let device core handle pinctrl
[not found] <1367863561-11534-1-git-send-email-fabio.estevam@freescale.com>
@ 2013-05-06 18:06 ` Fabio Estevam
2013-05-06 19:21 ` Mark Brown
2013-05-06 18:06 ` [PATCH 13/13] ASoC: mxs: mxs-saif: " Fabio Estevam
1 sibling, 1 reply; 4+ messages in thread
From: Fabio Estevam @ 2013-05-06 18:06 UTC (permalink / raw)
To: shawn.guo; +Cc: Fabio Estevam, alsa-devel, Mark Brown, festevam, kernel
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.
Cc: Mark Brown <broonie@kernel.org>
Cc: <alsa-devel@alsa-project.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
sound/soc/fsl/imx-audmux.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index 3f333e5..22967c6 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -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 = clk_get(&pdev->dev, "audmux");
if (IS_ERR(audmux_clk)) {
dev_dbg(&pdev->dev, "cannot get clock: %ld\n",
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 13/13] ASoC: mxs: mxs-saif: Let device core handle pinctrl
[not found] <1367863561-11534-1-git-send-email-fabio.estevam@freescale.com>
2013-05-06 18:06 ` [PATCH 12/13] ASoC: fsl: imx-audmux: Let device core handle pinctrl Fabio Estevam
@ 2013-05-06 18:06 ` Fabio Estevam
2013-05-06 19:22 ` Mark Brown
1 sibling, 1 reply; 4+ messages in thread
From: Fabio Estevam @ 2013-05-06 18:06 UTC (permalink / raw)
To: shawn.guo; +Cc: Fabio Estevam, alsa-devel, Mark Brown, festevam, kernel
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.
Cc: Mark Brown <broonie@kernel.org>
Cc: <alsa-devel@alsa-project.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
sound/soc/mxs/mxs-saif.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 3a2aa1d..12723b0 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -27,7 +27,6 @@
#include <linux/delay.h>
#include <linux/time.h>
#include <linux/fsl/mxs-dma.h>
-#include <linux/pinctrl/consumer.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
@@ -661,7 +660,6 @@ static int mxs_saif_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node;
struct resource *iores, *dmares;
struct mxs_saif *saif;
- struct pinctrl *pinctrl;
int ret = 0;
struct device_node *master;
@@ -701,12 +699,6 @@ static int mxs_saif_probe(struct platform_device *pdev)
mxs_saif[saif->id] = saif;
- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl)) {
- ret = PTR_ERR(pinctrl);
- return ret;
- }
-
saif->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(saif->clk)) {
ret = PTR_ERR(saif->clk);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread