diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:41 +0100 |
| commit | 27b92d4ff2be2359a21ff4acde5b63563ff720e2 (patch) | |
| tree | 49691b22fe1318aa68d5ebdff74795f004f0cf8f /sound/soc/pxa/z2.c | |
| parent | 5de0ee574be8f6922a6c33f2fbc7e9b130a2f626 (diff) | |
| parent | e58a8947b0264ec1f43ce5deef563b72acf1284f (diff) | |
| download | linux-3.10-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.gz linux-3.10-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.bz2 linux-3.10-27b92d4ff2be2359a21ff4acde5b63563ff720e2.zip | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/z2.c')
| -rw-r--r-- | sound/soc/pxa/z2.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 3ceaef68e01..d69d9fc3223 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -95,6 +95,11 @@ static struct snd_soc_jack_pin hs_jack_pins[] = { .pin = "Headphone Jack", .mask = SND_JACK_HEADPHONE, }, + { + .pin = "Ext Spk", + .mask = SND_JACK_HEADPHONE, + .invert = 1 + }, }; /* Headset jack detection gpios */ @@ -147,7 +152,7 @@ static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_disable_pin(dapm, "LINPUT3"); snd_soc_dapm_disable_pin(dapm, "RINPUT3"); snd_soc_dapm_disable_pin(dapm, "OUT3"); - snd_soc_dapm_disable_pin(dapm, "MONO"); + snd_soc_dapm_disable_pin(dapm, "MONO1"); /* Add z2 specific widgets */ snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets, |