ASoC: Add jack reporting interface

This patch adds a jack reporting interface to ASoC.  This wraps the ALSA
core jack detection functionality and provides integration with DAPM to
automatically update the power state of pins based on the jack state.

Since embedded platforms can have multiple detecton methods used for a
single jack (eg, separate microphone and headphone detection) the report
function allows specification of which bits are being updated on a given
report.

The expected usage is that machine drivers will create jack objects and
then configure jack detection methods to update that jack.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

3 files changed, 140 insertions, 1 deletions

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index ef025c66cc66..3d2bb6fc6dcc 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -6,6 +6,7 @@ menuconfig SND_SOC
         tristate "ALSA for SoC audio support"
         select SND_PCM
         select AC97_BUS if SND_SOC_AC97_BUS
+        select SND_JACK if INPUT=y || INPUT=SND
         ---help---
 
           If you want ASoC support, you should say Y here and also to the
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 86a9b1f5b0f3..0237879fd412 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,4 +1,4 @@
-snd-soc-core-objs := soc-core.o soc-dapm.o
+snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o
 
 obj-$(CONFIG_SND_SOC)   += snd-soc-core.o
 obj-$(CONFIG_SND_SOC)   += codecs/
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
new file mode 100644
index 000000000000..8cc00c3cdf34
--- /dev/null
+++ b/sound/soc/soc-jack.c
@@ -0,0 +1,138 @@
+/*
+ * soc-jack.c  --  ALSA SoC jack handling
+ *
+ * Copyright 2008 Wolfson Microelectronics PLC.
+ *
+ * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ */
+
+#include <sound/jack.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+
+/**
+ * snd_soc_jack_new - Create a new jack
+ * @card:  ASoC card
+ * @id:    an identifying string for this jack
+ * @type:  a bitmask of enum snd_jack_type values that can be detected by
+ *         this jack
+ * @jack:  structure to use for the jack
+ *
+ * Creates a new jack object.
+ *
+ * Returns zero if successful, or a negative error code on failure.
+ * On success jack will be initialised.
+ */
+int snd_soc_jack_new(struct snd_soc_card *card, const char *id, int type,
+                     struct snd_soc_jack *jack)
+{
+        jack->card = card;
+        INIT_LIST_HEAD(&jack->pins);
+
+        return snd_jack_new(card->socdev->codec->card, id, type, &jack->jack);
+}
+EXPORT_SYMBOL_GPL(snd_soc_jack_new);
+
+/**
+ * snd_soc_jack_report - Report the current status for a jack
+ *
+ * @jack:   the jack
+ * @status: a bitmask of enum snd_jack_type values that are currently detected.
+ * @mask:   a bitmask of enum snd_jack_type values that being reported.
+ *
+ * If configured using snd_soc_jack_add_pins() then the associated
+ * DAPM pins will be enabled or disabled as appropriate and DAPM
+ * synchronised.
+ *
+ * Note: This function uses mutexes and should be called from a
+ * context which can sleep (such as a workqueue).
+ */
+void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
+{
+        struct snd_soc_codec *codec = jack->card->socdev->codec;
+        struct snd_soc_jack_pin *pin;
+        int enable;
+        int oldstatus;
+
+        if (!jack) {
+                WARN_ON_ONCE(!jack);
+                return;
+        }
+
+        mutex_lock(&codec->mutex);
+
+        oldstatus = jack->status;
+
+        jack->status &= ~mask;
+        jack->status |= status;
+
+        /* The DAPM sync is expensive enough to be worth skipping */
+        if (jack->status == oldstatus)
+                goto out;
+
+        list_for_each_entry(pin, &jack->pins, list) {
+                enable = pin->mask & status;
+
+                if (pin->invert)
+                        enable = !enable;
+
+                if (enable)
+                        snd_soc_dapm_enable_pin(codec, pin->pin);
+                else
+                        snd_soc_dapm_disable_pin(codec, pin->pin);
+        }
+
+        snd_soc_dapm_sync(codec);
+
+        snd_jack_report(jack->jack, status);
+
+out:
+        mutex_unlock(&codec->mutex);
+}
+EXPORT_SYMBOL_GPL(snd_soc_jack_report);
+
+/**
+ * snd_soc_jack_add_pins - Associate DAPM pins with an ASoC jack
+ *
+ * @jack:  ASoC jack
+ * @count: Number of pins
+ * @pins:  Array of pins
+ *
+ * After this function has been called the DAPM pins specified in the
+ * pins array will have their status updated to reflect the current
+ * state of the jack whenever the jack status is updated.
+ */
+int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
+                          struct snd_soc_jack_pin *pins)
+{
+        int i;
+
+        for (i = 0; i < count; i++) {
+                if (!pins[i].pin) {
+                        printk(KERN_ERR "No name for pin %d\n", i);
+                        return -EINVAL;
+                }
+                if (!pins[i].mask) {
+                        printk(KERN_ERR "No mask for pin %d (%s)\n", i,
+                               pins[i].pin);
+                        return -EINVAL;
+                }
+
+                INIT_LIST_HEAD(&pins[i].list);
+                list_add(&(pins[i].list), &jack->pins);
+        }
+
+        /* Update to reflect the last reported status; canned jack
+         * implementations are likely to set their state before the
+         * card has an opportunity to associate pins.
+         */
+        snd_soc_jack_report(jack, 0, 0);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_jack_add_pins);