From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Peter Ujfalusi <peter.ujfalusi@nokia.com>
Subject: [PATCH 03/18] ASoC: TWL4030: Add DAPM event handler for output MUX selection
Date: Tue, 9 Dec 2008 14:01:27 +0000 [thread overview]
Message-ID: <1228831302-17605-3-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1228831302-17605-2-git-send-email-broonie@opensource.wolfsonmicro.com>
From: Peter Ujfalusi <peter.ujfalusi@nokia.com>
DAPM event handler is set to filter out invalid MUX settings
for certain outputs.
Earpiece:
- 0 = Off
- 1 = DACL1
- 2 = DACL2
- 3 = *** Invalid ***
- 4 = DACR1
PreDriveL/R:
- 0 = Off/Off
- 1 = DACL1/DACR1
- 2 = DACL2/DACR2
- 3 = *** Invalid/Invalid ***
- 4 = DACR2/DACL2
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/twl4030.c | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 4293ec7..9d10783 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -190,6 +190,30 @@ static void twl4030_init_chip(struct snd_soc_codec *codec)
}
+static int outmixer_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
+ int ret = 0;
+ int val;
+
+ switch (e->reg) {
+ case TWL4030_REG_PREDL_CTL:
+ case TWL4030_REG_PREDR_CTL:
+ case TWL4030_REG_EAR_CTL:
+ val = w->value >> e->shift_l;
+ if (val == 3) {
+ printk(KERN_WARNING
+ "Invalid MUX setting for register 0x%02x (%d)\n",
+ e->reg, val);
+ ret = -1;
+ }
+ break;
+ }
+
+ return ret;
+}
+
/*
* Some of the gain controls in TWL (mostly those which are associated with
* the outputs) are implemented in an interesting way:
--
1.5.6.5
next prev parent reply other threads:[~2008-12-09 14:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-09 14:01 [PATCH 00/18] ASoC updates Mark Brown
2008-12-09 14:01 ` [PATCH 01/18] ASoC: TWL4030: Correct DAPM_DAC with power control Mark Brown
2008-12-09 14:01 ` [PATCH 02/18] ASoC: TWL4030: Add Analog PGA control switch to DAPM Mark Brown
2008-12-09 14:01 ` Mark Brown [this message]
2008-12-09 14:01 ` [PATCH 04/18] ASoC: TWL4030: DAPM mapping of the Earpiece output Mark Brown
2008-12-09 14:01 ` [PATCH 05/18] ASoC: TWL4030: DAPM mapping of the PreDriv outputs Mark Brown
2008-12-09 14:01 ` [PATCH 06/18] ASoC: TWL4030: DAPM mapping of the Headset outputs Mark Brown
2008-12-09 14:01 ` [PATCH 07/18] ASoC: TWL4030: DAPM mapping of the Carkit outputs Mark Brown
2008-12-09 14:01 ` [PATCH 08/18] ASoC: TWL4030: DAPM mapping of the Handsfree outputs Mark Brown
2008-12-09 14:01 ` [PATCH 09/18] ASoC: TWL4030: Do not alter the Headset output volume on power-up/down Mark Brown
2008-12-09 14:01 ` [PATCH 10/18] ASoC: Add card registration API Mark Brown
2008-12-09 14:01 ` [PATCH 11/18] ASoC: Add DAI " Mark Brown
2008-12-09 14:01 ` [PATCH 12/18] ASoC: Register platform DAIs Mark Brown
2008-12-09 14:01 ` [PATCH 13/18] ASoC: Add platform registration API Mark Brown
2008-12-09 14:01 ` [PATCH 14/18] ASoC: Register platform drivers Mark Brown
2008-12-09 14:01 ` [PATCH 15/18] ASoC: Register non-AC97 codec DAIs Mark Brown
2008-12-09 14:01 ` [PATCH 16/18] ASoC: Initial framework for dynamic card instantiation Mark Brown
2008-12-09 14:01 ` [PATCH 17/18] ASoC: Wait for non-AC97 codec DAIs before instantiating Mark Brown
2008-12-09 14:01 ` [PATCH 18/18] ASoC: Convert WM8900 to allow registration by machine code Mark Brown
2008-12-09 14:38 ` [PATCH 14/18] ASoC: Register platform drivers Takashi Iwai
2008-12-09 14:40 ` [PATCH 12/18] ASoC: Register platform DAIs Takashi Iwai
2008-12-09 14:17 ` [PATCH 10/18] ASoC: Add card registration API Takashi Iwai
2008-12-09 14:24 ` Takashi Iwai
2008-12-10 8:27 ` [PATCH 06/18] ASoC: TWL4030: DAPM mapping of the Headset outputs stanley.miao
2008-12-10 9:19 ` Peter Ujfalusi
2008-12-09 14:39 ` [PATCH 00/18] ASoC updates Takashi Iwai
2008-12-09 15:01 ` Mark Brown
2008-12-09 15:03 ` [PATCH] ASoC: Fix typos in Atmel module registration Mark Brown
2008-12-09 15:06 ` [PATCH 00/18] ASoC updates Takashi Iwai
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=1228831302-17605-3-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=peter.ujfalusi@nokia.com \
--cc=tiwai@suse.de \
/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