[PATCH V2 1/2] ASoC: davinci-mcasp: Add pinctrl support

From: Hebbar Gururaja
Date: Fri Jan 04 2013 - 04:54:21 EST


From: "Hebbar, Gururaja" <gururaja.hebbar@xxxxxx>

Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@xxxxxx>
---
Changes in V2
- no change

:100644 100644 55e2bf6... 83d96eb... M sound/soc/davinci/davinci-mcasp.c
sound/soc/davinci/davinci-mcasp.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 55e2bf6..83d96eb 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -25,6 +25,7 @@
#include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/of_device.h>
+#include <linux/pinctrl/consumer.h>

#include <sound/core.h>
#include <sound/pcm.h>
@@ -1080,6 +1081,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
struct resource *mem, *ioarea, *res;
struct snd_platform_data *pdata;
struct davinci_audio_dev *dev;
+ struct pinctrl *pinctrl;
int ret;

if (!pdev->dev.platform_data && !pdev->dev.of_node) {
@@ -1111,6 +1113,11 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
return -EBUSY;
}

+ pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+ if (IS_ERR(pinctrl))
+ dev_warn(&pdev->dev,
+ "pins are not configured from the driver\n");
+
pm_runtime_enable(&pdev->dev);

ret = pm_runtime_get_sync(&pdev->dev);
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/