diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 09:05:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 09:05:59 -0700 |
| commit | 524196d2ad12cfe29e15d3db7b8d678dde35b5f7 (patch) | |
| tree | 7fb051f346c0b17e82aaef55f7e11ab1eb2f7675 /sound/soc/codecs | |
| parent | d36c30181c4cf6ead34ae30fa2c777b871225c87 (diff) | |
| parent | b793eb60a01d5b5e4aaeb2fbc2b036dec0d9f84d (diff) | |
| download | kernel_samsung_smdk4412-524196d2ad12cfe29e15d3db7b8d678dde35b5f7.zip kernel_samsung_smdk4412-524196d2ad12cfe29e15d3db7b8d678dde35b5f7.tar.gz kernel_samsung_smdk4412-524196d2ad12cfe29e15d3db7b8d678dde35b5f7.tar.bz2 | |
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: Correct WM8994 MICBIAS supply widget hookup
ASoC: Fix shift in WM8958 accessory detection default implementation
ASoC: sh: fsi-hdmi: fixup snd_soc_card name
ASoC: sh: fsi-da7210: fixup snd_soc_card name
ASoC: sh: fsi-ak4642: fixup snd_soc_card name
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index c2fc035..83014a7 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1190,7 +1190,6 @@ SND_SOC_DAPM_INPUT("DMIC1DAT"), SND_SOC_DAPM_INPUT("DMIC2DAT"), SND_SOC_DAPM_INPUT("Clock"), -SND_SOC_DAPM_MICBIAS("MICBIAS", WM8994_MICBIAS, 2, 0), SND_SOC_DAPM_SUPPLY_S("MICBIAS Supply", 1, SND_SOC_NOPM, 0, 0, micbias_ev, SND_SOC_DAPM_PRE_PMU), @@ -1509,8 +1508,10 @@ static const struct snd_soc_dapm_route wm8994_revd_intercon[] = { { "AIF2DACDAT", NULL, "AIF1DACDAT" }, { "AIF1ADCDAT", NULL, "AIF2ADCDAT" }, { "AIF2ADCDAT", NULL, "AIF1ADCDAT" }, - { "MICBIAS", NULL, "CLK_SYS" }, - { "MICBIAS", NULL, "MICBIAS Supply" }, + { "MICBIAS1", NULL, "CLK_SYS" }, + { "MICBIAS1", NULL, "MICBIAS Supply" }, + { "MICBIAS2", NULL, "CLK_SYS" }, + { "MICBIAS2", NULL, "MICBIAS Supply" }, }; static const struct snd_soc_dapm_route wm8994_intercon[] = { @@ -2763,7 +2764,7 @@ static void wm8958_default_micdet(u16 status, void *data) report = SND_JACK_MICROPHONE; /* Everything else is buttons; just assign slots */ - if (status & 0x1c0) + if (status & 0x1c) report |= SND_JACK_BTN_0; done: |