Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/asoc' into for-linus

Browse source 
* fix/asoc:
  ASoC: Remove BROKEN from mpc5200 kconfig
  ASoC: TWL4030: Fix gain control for earpiece amplifier
  ASoC: Set the MPC5200 i2s driver to BROKEN status.
  ASoC: Fix logic in WM8350 master clocking check
This commit is contained in:
Takashi Iwai 2009-05-04 16:06:43 +02:00
commit dea6a9d306
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/codecs/twl4030.c
View file

@ -835,6 +835,12 @@ static DECLARE_TLV_DB_SCALE(analog_tlv, -2400, 200, 0);
*/ */
static DECLARE_TLV_DB_SCALE(output_tvl, -1200, 600, 1); static DECLARE_TLV_DB_SCALE(output_tvl, -1200, 600, 1);
/*
* Gain control for earpiece amplifier
* 0 dB to 12 dB in 6 dB steps (mute instead of -6)
*/
static DECLARE_TLV_DB_SCALE(output_ear_tvl, -600, 600, 1);
/* /*
* Capture gain after the ADCs * Capture gain after the ADCs
* from 0 dB to 31 dB in 1 dB steps * from 0 dB to 31 dB in 1 dB steps
@ -900,7 +906,7 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = {
4, 3, 0, output_tvl), 4, 3, 0, output_tvl),
SOC_SINGLE_TLV_TWL4030("Earpiece Playback Volume", SOC_SINGLE_TLV_TWL4030("Earpiece Playback Volume",
TWL4030_REG_EAR_CTL, 4, 3, 0, output_tvl), TWL4030_REG_EAR_CTL, 4, 3, 0, output_ear_tvl),
/* Common capture gain controls */ /* Common capture gain controls */
SOC_DOUBLE_R_TLV("TX1 Digital Capture Volume", SOC_DOUBLE_R_TLV("TX1 Digital Capture Volume",

2
sound/soc/codecs/wm8350.c
View file

@ -968,7 +968,7 @@ static int wm8350_pcm_trigger(struct snd_pcm_substream *substream,
* required for LRC in master mode. The DACs or ADCs need a * required for LRC in master mode. The DACs or ADCs need a
* valid audio path i.e. pin -> ADC or DAC -> pin before * valid audio path i.e. pin -> ADC or DAC -> pin before
* the LRC will be enabled in master mode. */ * the LRC will be enabled in master mode. */
if (!master && cmd != SNDRV_PCM_TRIGGER_START) if (!master || cmd != SNDRV_PCM_TRIGGER_START)
return 0; return 0;
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {