From: "Hebbar, Gururaja" <gururaja.hebbar@ti.com>
To: <alsa-devel@alsa-project.org>,
<davinci-linux-open-source@linux.davincidsp.com>,
<linux-arm-kernel@lists.infradead.org>
Cc: <tony@atomide.com>, <lrg@ti.com>,
<broonie@opensource.wolfsonmicro.com>, <perex@perex.cz>,
<nsekhar@ti.com>, <sudhakar.raj@ti.com>, <gururaja.hebbar@ti.com>,
<linux-kernel@vger.kernel.org>,
<devicetree-discuss@lists.ozlabs.org>,
<linux-doc@vger.kernel.org>, <rob@landley.net>
Subject: [PATCH 1/2] ASoC: davinci-mcasp: Add pinctrl support
Date: Thu, 22 Nov 2012 09:34:58 +0530 [thread overview]
Message-ID: <1353557099-21599-2-git-send-email-gururaja.hebbar@ti.com> (raw)
In-Reply-To: <1353557099-21599-1-git-send-email-gururaja.hebbar@ti.com>
From: "Hebbar, Gururaja" <gururaja.hebbar@ti.com>
Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
---
:100644 100644 5715595... 76c05d9... 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 5715595..76c05d9 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>
@@ -1108,6 +1109,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) {
@@ -1139,6 +1141,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
next prev parent reply other threads:[~2012-11-22 19:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-22 4:04 [PATCH 0/2] ARM/ASoC: Davinci: Device Tree Update Hebbar, Gururaja
2012-11-22 4:04 ` Hebbar, Gururaja [this message]
2012-11-26 11:45 ` [PATCH 1/2] ASoC: davinci-mcasp: Add pinctrl support Mark Brown
2012-11-27 5:55 ` Peter Korsgaard
2012-11-27 14:04 ` Mark Brown
2012-11-22 4:04 ` [PATCH 2/2] ASoC: Davinci: machine: Add device tree binding Hebbar, Gururaja
2012-11-26 11:56 ` Mark Brown
2012-11-27 12:53 ` Hebbar, Gururaja
2012-11-26 11:41 ` [PATCH 0/2] ARM/ASoC: Davinci: Device Tree Update Hebbar, Gururaja
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353557099-21599-2-git-send-email-gururaja.hebbar@ti.com \
--to=gururaja.hebbar@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=davinci-linux-open-source@linux.davincidsp.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=nsekhar@ti.com \
--cc=perex@perex.cz \
--cc=rob@landley.net \
--cc=sudhakar.raj@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).