瀏覽代碼

ASoC: omap: rx51: Report headset insertion instead of video out cable

It is more usefull to report headset instead of video out cable in response
to jack insertion as this is more usual use-case and because now the headset
feature is supported. Automatic accessory detection is not possible at the
moment so most sensible static accessory type have to be used.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Jarkko Nikula 14 年之前
父節點
當前提交
1784061957
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      sound/soc/omap/rx51.c

+ 3 - 2
sound/soc/omap/rx51.c

@@ -240,7 +240,7 @@ static struct snd_soc_jack_gpio rx51_av_jack_gpios[] = {
 	{
 	{
 		.gpio = RX51_JACK_DETECT_GPIO,
 		.gpio = RX51_JACK_DETECT_GPIO,
 		.name = "avdet-gpio",
 		.name = "avdet-gpio",
-		.report = SND_JACK_VIDEOOUT,
+		.report = SND_JACK_HEADSET,
 		.invert = 1,
 		.invert = 1,
 		.debounce_time = 200,
 		.debounce_time = 200,
 	},
 	},
@@ -331,7 +331,8 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
 
 
 	/* AV jack detection */
 	/* AV jack detection */
 	err = snd_soc_jack_new(codec, "AV Jack",
 	err = snd_soc_jack_new(codec, "AV Jack",
-			       SND_JACK_VIDEOOUT, &rx51_av_jack);
+			       SND_JACK_HEADSET | SND_JACK_VIDEOOUT,
+			       &rx51_av_jack);
 	if (err)
 	if (err)
 		return err;
 		return err;
 	err = snd_soc_jack_add_gpios(&rx51_av_jack,
 	err = snd_soc_jack_add_gpios(&rx51_av_jack,