diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-17 16:35:55 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-18 09:14:14 -0800 |
| commit | 7887ab3a274dc5f1d1d94ca0cd41ae495d01f94f (patch) | |
| tree | 9182cd4d0c2c857688520a50f733d1c9f690039c | |
| parent | 5a9f91ca7994bd6a7c696fd397716da3bb440921 (diff) | |
| download | kernel_goldelico_gta04-7887ab3a274dc5f1d1d94ca0cd41ae495d01f94f.zip kernel_goldelico_gta04-7887ab3a274dc5f1d1d94ca0cd41ae495d01f94f.tar.gz kernel_goldelico_gta04-7887ab3a274dc5f1d1d94ca0cd41ae495d01f94f.tar.bz2 | |
ASoC: Allow GPIO jack detection to be configured as a wake source
Some systems wish to use jacks as wake sources. Provide a wake flag in the
GPIO configuration which causes the driver to enable the IRQ as a wake
source.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
| -rw-r--r-- | include/sound/soc.h | 3 | ||||
| -rw-r--r-- | sound/soc/soc-jack.c | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 4ccf1e4..fb57c33 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -436,6 +436,7 @@ struct snd_soc_jack_zone { * @report: value to report when jack detected * @invert: report presence in low state * @debouce_time: debouce time in ms + * @wake: enable as wake source */ #ifdef CONFIG_GPIOLIB struct snd_soc_jack_gpio { @@ -444,6 +445,8 @@ struct snd_soc_jack_gpio { int report; int invert; int debounce_time; + bool wake; + struct snd_soc_jack *jack; struct delayed_work work; diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 4579ee0..1382251 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -330,6 +330,14 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, if (ret) goto err; + if (gpios[i].wake) { + ret = set_irq_wake(gpio_to_irq(gpios[i].gpio), 1); + if (ret != 0) + printk(KERN_ERR + "Failed to mark GPIO %d as wake source: %d\n", + gpios[i].gpio, ret); + } + #ifdef CONFIG_GPIO_SYSFS /* Expose GPIO value over sysfs for diagnostic purposes */ gpio_export(gpios[i].gpio, false); |