[alsa-devel] [PATCH] ASoC: TWL4030: Correct bypass event for voice sidetone
Event for voice sidetone was being interpreted as an analog HiFi bypass event because VSTPGA register offset is less than ARXR2_APGA_CTL offset. Reordering the register checks allows to handle voice digital bypass event properly.
Signed-off-by: Misael Lopez Cruz x0052729@ti.com --- sound/soc/codecs/twl4030.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index f916a9a..df42fa2 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -712,7 +712,19 @@ static int bypass_event(struct snd_soc_dapm_widget *w,
reg = twl4030_read_reg_cache(w->codec, m->reg);
- if (m->reg <= TWL4030_REG_ARXR2_APGA_CTL) { + /* + * bypass_state[0:3] - analog HiFi bypass + * bypass_state[4] - analog voice bypass + * bypass_state[5] - digital voice bypass + * bypass_state[6:7] - digital HiFi bypass + */ + if (m->reg == TWL4030_REG_VSTPGA) { + /* Voice digital bypass */ + if (reg) + twl4030->bypass_state |= (1 << 5); + else + twl4030->bypass_state &= ~(1 << 5); + } else if (m->reg <= TWL4030_REG_ARXR2_APGA_CTL) { /* Analog bypass */ if (reg & (1 << m->shift)) twl4030->bypass_state |= @@ -726,12 +738,6 @@ static int bypass_event(struct snd_soc_dapm_widget *w, twl4030->bypass_state |= (1 << 4); else twl4030->bypass_state &= ~(1 << 4); - } else if (m->reg == TWL4030_REG_VSTPGA) { - /* Voice digital bypass */ - if (reg) - twl4030->bypass_state |= (1 << 5); - else - twl4030->bypass_state &= ~(1 << 5); } else { /* Digital bypass */ if (reg & (0x7 << m->shift))
On Tuesday 23 June 2009 03:34:07 ext Lopez Cruz, Misael wrote:
Event for voice sidetone was being interpreted as an analog HiFi bypass event because VSTPGA register offset is less than ARXR2_APGA_CTL offset. Reordering the register checks allows to handle voice digital bypass event properly.
Signed-off-by: Misael Lopez Cruz x0052729@ti.com
sound/soc/codecs/twl4030.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-)
Good catch.
BTW: I think I'll try to get rid of this bypass handling at some point. Now that ASoC core has support for keeping the codec in BIAS_ON when any of the paths are active we should not need this black magic with the bypasses.
But I'm afraid this has to wait, since I will start my summer holiday quite soon...
Acked-by: Peter Ujfalusi peter.ujfalusi@nokia.com
On Tue, Jun 23, 2009 at 08:18:44AM +0300, Peter Ujfalusi wrote:
On Tuesday 23 June 2009 03:34:07 ext Lopez Cruz, Misael wrote:
Event for voice sidetone was being interpreted as an analog HiFi bypass event because VSTPGA register offset is less than ARXR2_APGA_CTL offset. Reordering the register checks allows to handle voice digital bypass event properly.
Signed-off-by: Misael Lopez Cruz x0052729@ti.com
Acked-by: Peter Ujfalusi peter.ujfalusi@nokia.com
Applied, thanks.
participants (3)
-
Lopez Cruz, Misael -
Mark Brown -
Peter Ujfalusi