[alsa-devel] [PATCH 2/5] ASoC: beagleboard - update DAPM pins

Liam Girdwood lrg at slimlogic.co.uk
Tue Apr 27 16:54:17 CEST 2010


Add our NC pins to conserve power.

Acked-by: Peter Ujfalusi <peter.ujfalusi at nokia.com>
Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg at slimlogic.co.uk>
---
 sound/soc/omap/omap3beagle.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
index 240e097..f348d03 100644
--- a/sound/soc/omap/omap3beagle.c
+++ b/sound/soc/omap/omap3beagle.c
@@ -88,6 +88,31 @@ static struct snd_soc_ops omap3beagle_ops = {
 	.hw_params = omap3beagle_hw_params,
 };
 
+static int beagle_twl4030_init(struct snd_soc_codec *codec)
+{
+	/* Beagle pin config  */
+
+	/* Headphone Jack */
+	snd_soc_dapm_enable_pin(codec, "HSOR");
+	snd_soc_dapm_enable_pin(codec, "HSOL");
+
+	/* Line in */
+	snd_soc_dapm_enable_pin(codec, "AUXR");
+	snd_soc_dapm_enable_pin(codec, "AUXL");
+
+	/* TWL4030 not connected pins */
+	snd_soc_dapm_nc_pin(codec, "CARKITMIC");
+	snd_soc_dapm_nc_pin(codec, "DIGIMIC0");
+	snd_soc_dapm_nc_pin(codec, "DIGIMIC1");
+	snd_soc_dapm_nc_pin(codec, "EARPIECE");
+	snd_soc_dapm_nc_pin(codec, "PREDRIVEL");
+	snd_soc_dapm_nc_pin(codec, "PREDRIVER");
+	snd_soc_dapm_nc_pin(codec, "CARKITL");
+	snd_soc_dapm_nc_pin(codec, "CARKITR");
+
+	return snd_soc_dapm_sync(codec);
+}
+
 /* Digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link omap3beagle_dai = {
 	.name = "TWL4030",
@@ -95,6 +120,7 @@ static struct snd_soc_dai_link omap3beagle_dai = {
 	.cpu_dai = &omap_mcbsp_dai[0],
 	.codec_dai = &twl4030_dai[TWL4030_DAI_HIFI],
 	.ops = &omap3beagle_ops,
+	.init = beagle_twl4030_init,
 };
 
 /* Audio machine driver */
-- 
1.6.3.3



More information about the Alsa-devel mailing list