android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Allow userspace control of Speyside headphone output

Browse Source 
In order to facilitate the widest range of use cases (especially things
like speakerphone) allow the headphone output to be enabled and disabled
by the application layer.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
This commit is contained in:
Mark Brown
2011-08-04 18:13:45 +09:00
parent 42bef6866f
commit 68d5a59e0c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/samsung/speyside.c
View File

@ -125,10 +125,6 @@ static struct snd_soc_jack_pin speyside_headset_pins[] = {
.pin = "Headset Mic", .pin = "Headset Mic",
.mask = SND_JACK_MICROPHONE, .mask = SND_JACK_MICROPHONE,
}, },
{
.pin = "Headphone",
.mask = SND_JACK_HEADPHONE,
},
}; };
/* Default the headphone selection to active high */ /* Default the headphone selection to active high */
@ -252,6 +248,7 @@ static const struct snd_kcontrol_new controls[] = {
SOC_DAPM_PIN_SWITCH("Main AMIC"), SOC_DAPM_PIN_SWITCH("Main AMIC"),
SOC_DAPM_PIN_SWITCH("WM1250 Input"), SOC_DAPM_PIN_SWITCH("WM1250 Input"),
SOC_DAPM_PIN_SWITCH("WM1250 Output"), SOC_DAPM_PIN_SWITCH("WM1250 Output"),
SOC_DAPM_PIN_SWITCH("Headphone"),
}; };
static struct snd_soc_dapm_widget widgets[] = { static struct snd_soc_dapm_widget widgets[] = {