diff options
| author | Jarkko Nikula <jhnikula@gmail.com> | 2011-02-14 17:20:22 +0200 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-02-15 21:53:59 +0000 |
| commit | 178406195755293bf63799ae41ed0c92968ded8c (patch) | |
| tree | 82e636463d076d6e3bcbcc3e4f653fa900280baa /sound/soc/omap/rx51.c | |
| parent | 31164c7cf1190729292126b2d6d27d792adfcec5 (diff) | |
| download | kernel_samsung_smdk4412-178406195755293bf63799ae41ed0c92968ded8c.zip kernel_samsung_smdk4412-178406195755293bf63799ae41ed0c92968ded8c.tar.gz kernel_samsung_smdk4412-178406195755293bf63799ae41ed0c92968ded8c.tar.bz2 | |
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>
Diffstat (limited to 'sound/soc/omap/rx51.c')
| -rw-r--r-- | sound/soc/omap/rx51.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 9860018..e28f089 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, |