From: Jarkko Nikula Date: Mon, 14 Feb 2011 15:20:22 +0000 (+0200) Subject: ASoC: omap: rx51: Report headset insertion instead of video out cable X-Git-Tag: v2.6.39-rc1~424^2~2^2^2~2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=178406195755293bf63799ae41ed0c92968ded8c;p=~shefty%2Frdma-dev.git 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 Acked-by: Mark Brown Signed-off-by: Liam Girdwood --- diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 9860018cc2e..e28f089b38d 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c @@ -240,7 +240,7 @@ static struct snd_soc_jack_gpio rx51_av_jack_gpios[] = { { .gpio = RX51_JACK_DETECT_GPIO, .name = "avdet-gpio", - .report = SND_JACK_VIDEOOUT, + .report = SND_JACK_HEADSET, .invert = 1, .debounce_time = 200, }, @@ -331,7 +331,8 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd) /* AV jack detection */ 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) return err; err = snd_soc_jack_add_gpios(&rx51_av_jack,