ASoC: Intel: byt-max98090: Do not change speaker and DMIC with jack state
authorJarkko Nikula <jarkko.nikula@linux.intel.com>
Mon, 23 Jun 2014 13:29:41 +0000 (16:29 +0300)
committerMark Brown <broonie@linaro.org>
Tue, 24 Jun 2014 15:21:36 +0000 (16:21 +0100)
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>
sound/soc/intel/byt-max98090.c

index 5fc98c64a3f41c3b19cfe975f15830afd4bd0cfa..da0b2ee28dff8692048c56bf1c95305b2a11989c 100644 (file)
@@ -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[] = {