summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2014-06-23 17:29:41 +0400
committerMark Brown <broonie@linaro.org>2014-06-24 19:21:36 +0400
commitb29d7c5f7126d3c0b9984fcfd74ea82ec4fb3510 (patch)
tree4af30de3c8c5b8ade98c76b5f4f6003c7544d92a /sound
parent0ec66fed40e31e74a762dd7166a9bf62ebbae5da (diff)
downloadlinux-b29d7c5f7126d3c0b9984fcfd74ea82ec4fb3510.tar.xz
ASoC: Intel: byt-max98090: Do not change speaker and DMIC with jack state
Kernel should not enable/disable speakers and digital microphone whenever jack is inserted/removed. This is more use-case than kernel specific decision. For instance one may want to play VoIP ring tones using both speakers and headphone but play music only from one of them. Because of above reason remove "Ext Spk" and "Int Mic" update when jack state is changed. Also this update was illogical anyway: "Ext Spk" was enabled when jack was inserted and disabled when jack was removed. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/intel/byt-max98090.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c
index 5fc98c64a3f4..da0b2ee28dff 100644
--- a/sound/soc/intel/byt-max98090.c
+++ b/sound/soc/intel/byt-max98090.c
@@ -64,14 +64,6 @@ static struct snd_soc_jack_pin hs_jack_pins[] = {
.pin = "Headset Mic",
.mask = SND_JACK_MICROPHONE,
},
- {
- .pin = "Ext Spk",
- .mask = SND_JACK_LINEOUT,
- },
- {
- .pin = "Int Mic",
- .mask = SND_JACK_LINEIN,
- },
};
static struct snd_soc_jack_gpio hs_jack_gpios[] = {