From: Lu Guanqun <guanqun.lu@intel.com>
To: ALSA <alsa-devel@alsa-project.org>, Lu Guanqun <guanqun.lu@intel.com>
Cc: Takashi Iwai <tiwai@suse.de>, Koul Vinod <vinod.koul@intel.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>,
Wang Xingchao <xingchao.wang@intel.com>
Subject: [PATCH 13/19] ASoC: mrst_machine: add jack detection support
Date: Wed, 04 May 2011 21:45:59 +0800 [thread overview]
Message-ID: <20110504134559.32443.30963.stgit@localhost> (raw)
In-Reply-To: <20110504133756.32443.6282.stgit@localhost>
Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
---
sound/soc/mid-x86/mrst_machine.c | 142 ++++++++++++++++++++++++++++++++++++++
1 files changed, 142 insertions(+), 0 deletions(-)
diff --git a/sound/soc/mid-x86/mrst_machine.c b/sound/soc/mid-x86/mrst_machine.c
index d70b26e..96df9a1 100644
--- a/sound/soc/mid-x86/mrst_machine.c
+++ b/sound/soc/mid-x86/mrst_machine.c
@@ -31,10 +31,83 @@
#include <linux/device.h>
#include <linux/slab.h>
#include <linux/gpio.h>
+#include <linux/list.h>
#include <linux/io.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
+#include <sound/jack.h>
+#include <../codecs/upd9976.h>
+
+/* Jack Detection */
+static struct snd_soc_jack mrst_jack;
+struct mrst_jack_context {
+ struct list_head head;
+ spinlock_t lock;
+ void __iomem *interrupt_base;
+};
+
+struct mrst_jack_node {
+ struct list_head list;
+ u8 interrupt_status;
+};
+
+static struct snd_soc_jack_pin mrst_jack_pins = {
+ .pin = "Headphone",
+ .mask = SND_JACK_HEADSET,
+};
+
+static irqreturn_t mrst_jack_intr_handler(int irq, void *dev)
+{
+ struct mrst_jack_context *context = dev;
+ u8 interrupt_status;
+ struct mrst_jack_node *node;
+ unsigned long flags;
+
+ memcpy_fromio(&interrupt_status,
+ context->interrupt_base,
+ sizeof(u8));
+
+ /* check if it's valid */
+ if (!(interrupt_status & 0xf))
+ return IRQ_NONE;
+
+ node = kmalloc(sizeof(*node), GFP_ATOMIC);
+ if (!node)
+ return IRQ_NONE;
+
+ INIT_LIST_HEAD(&node->list);
+ node->interrupt_status = interrupt_status;
+
+ spin_lock_irqsave(&context->lock, flags);
+ list_add_tail(&node->list, &context->head);
+ spin_unlock_irqrestore(&context->lock, flags);
+
+ return IRQ_WAKE_THREAD;
+}
+
+static irqreturn_t mrst_jack_detection(int irq, void *data)
+{
+ struct mrst_jack_context *context = data;
+ u8 interrupt_status;
+ unsigned long flags;
+ struct mrst_jack_node *node;
+
+ spin_lock_irqsave(&context->lock, flags);
+ if (list_empty(&context->head)) {
+ spin_unlock_irqrestore(&context->lock, flags);
+ return IRQ_HANDLED;
+ }
+ node = list_first_entry(&context->head, struct mrst_jack_node, list);
+ interrupt_status = node->interrupt_status;
+ list_del(&node->list);
+ kfree(node);
+ spin_unlock_irqrestore(&context->lock, flags);
+
+ upd9976_jack_detection(&mrst_jack, interrupt_status);
+
+ return IRQ_HANDLED;
+}
static const struct snd_kcontrol_new mrst_snd_controls[] = {
SOC_DAPM_PIN_SWITCH("Headphone"),
@@ -116,8 +189,22 @@ static int mrst_audio_init(struct snd_soc_pcm_runtime *runtime)
snd_soc_dapm_disable_pin(dapm, "Headset MIC");
snd_soc_dapm_enable_pin(dapm, "Internal MIC");
+ snd_soc_dapm_force_enable_pin(dapm, "MIC2 Bias");
+
snd_soc_dapm_sync(dapm);
+ ret = snd_soc_jack_new(codec, "Intel(R) MID Audio Jack",
+ (SND_JACK_HEADSET |
+ SND_JACK_BTN_0 |
+ SND_JACK_BTN_1),
+ &mrst_jack);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_pins(&mrst_jack, 1, &mrst_jack_pins);
+ if (ret)
+ return ret;
+
return 0;
}
@@ -159,6 +246,9 @@ static struct snd_soc_card snd_soc_card_mrst = {
static int __devinit snd_mrst_audio_probe(struct platform_device *pdev)
{
+ int irq;
+ struct resource *irq_mem;
+ struct mrst_jack_context *jack_context = NULL;
int ret;
if (pdev->dev.platform_data) {
@@ -168,14 +258,59 @@ static int __devinit snd_mrst_audio_probe(struct platform_device *pdev)
mrst_gpio_amp = 0;
}
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0) {
+ ret = irq;
+ goto fail_get_irq;
+ }
+
+ jack_context = kzalloc(sizeof(*jack_context), GFP_KERNEL);
+ if (!jack_context) {
+ ret = -ENOMEM;
+ goto fail_get_irq;
+ }
+ spin_lock_init(&jack_context->lock);
+ INIT_LIST_HEAD(&jack_context->head);
+
+ irq_mem = platform_get_resource_byname(pdev,
+ IORESOURCE_MEM, "IRQ_BASE");
+ if (!irq_mem) {
+ ret = -ENODEV;
+ goto fail_alloc_context;
+ }
+
+ jack_context->interrupt_base = ioremap_nocache(irq_mem->start,
+ resource_size(irq_mem));
+ if (!jack_context->interrupt_base) {
+ ret = -ENOMEM;
+ goto fail_alloc_context;
+ }
+
+ ret = request_threaded_irq(irq,
+ mrst_jack_intr_handler,
+ mrst_jack_detection,
+ IRQF_SHARED,
+ pdev->dev.driver->name,
+ jack_context);
+ if (ret)
+ goto fail_request_irq;
+
snd_soc_card_mrst.dev = &pdev->dev;
ret = snd_soc_register_card(&snd_soc_card_mrst);
if (ret)
goto fail_register_card;
+ platform_set_drvdata(pdev, jack_context);
+
return 0;
fail_register_card:
+ free_irq(irq, jack_context);
+fail_request_irq:
+ iounmap(jack_context->interrupt_base);
+fail_alloc_context:
+ kfree(jack_context);
+fail_get_irq:
if (mrst_gpio_amp)
gpio_free(mrst_gpio_amp);
return ret;
@@ -183,9 +318,16 @@ fail_register_card:
static int __devexit snd_mrst_audio_remove(struct platform_device *pdev)
{
+ struct mrst_jack_context *jack_context = platform_get_drvdata(pdev);
+ int irq = platform_get_irq(pdev, 0);
+
+ free_irq(irq, jack_context);
+ iounmap(jack_context->interrupt_base);
+ kfree(jack_context);
if (mrst_gpio_amp)
gpio_free(mrst_gpio_amp);
snd_soc_unregister_card(&snd_soc_card_mrst);
+
return 0;
}
next prev parent reply other threads:[~2011-05-04 13:44 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-04 13:44 [PATCH 00/19] ASoC for moorestown Lu Guanqun
2011-05-04 13:44 ` [PATCH 01/19] ASoC: upd9976: Add Renesas uPD9976 codec driver Lu Guanqun
2011-05-04 14:34 ` Mark Brown
2011-05-04 15:05 ` Lu Guanqun
2011-05-05 3:14 ` Koul, Vinod
2011-05-05 3:51 ` Lu Guanqun
2011-05-04 15:07 ` Takashi Iwai
2011-05-04 15:18 ` Lu Guanqun
2011-05-04 15:38 ` Takashi Iwai
2011-05-04 16:15 ` Mark Brown
2011-05-05 0:33 ` Lu Guanqun
2011-05-05 0:30 ` Lu Guanqun
2011-05-04 16:13 ` Mark Brown
2011-05-05 16:26 ` Lu Guanqun
2011-05-06 9:37 ` Mark Brown
2011-05-04 14:46 ` Dimitris Papastamos
2011-05-04 15:12 ` Lu Guanqun
2011-05-04 16:11 ` Mark Brown
2011-05-05 3:12 ` Koul, Vinod
2011-05-05 8:07 ` Mark Brown
2011-05-04 13:45 ` [PATCH 02/19] ASoC: sst_platform: add cpu dai driver for moorestown platform Lu Guanqun
2011-05-05 3:23 ` Koul, Vinod
2011-05-05 4:48 ` Lu Guanqun
2011-05-05 9:26 ` Koul, Vinod
2011-05-05 8:05 ` Mark Brown
2011-05-05 9:28 ` Koul, Vinod
2011-05-05 10:26 ` Mark Brown
2011-05-05 10:00 ` Koul, Vinod
2011-05-05 13:46 ` Mark Brown
2011-05-05 14:55 ` Koul, Vinod
2011-05-06 9:37 ` Mark Brown
2011-05-04 13:45 ` [PATCH 03/19] ASoC: mrst_machine: add moorestown machine driver Lu Guanqun
2011-05-04 14:55 ` Dimitris Papastamos
2011-05-04 15:25 ` Lu Guanqun
2011-05-04 13:45 ` [PATCH 04/19] ASoC: mrst_machine: add speaker widget to " Lu Guanqun
2011-05-04 16:17 ` Mark Brown
2011-05-04 13:45 ` [PATCH 05/19] ASoC: mrst_machine: enable user to select different output Lu Guanqun
2011-05-04 16:22 ` Mark Brown
2011-05-05 0:34 ` Lu Guanqun
2011-05-04 13:45 ` [PATCH 06/19] ASoC: upd9976: add capture ability for dai driver Lu Guanqun
2011-05-04 16:22 ` Mark Brown
2011-05-04 13:45 ` [PATCH 07/19] ASoC: sst_platform: add capture capability for cpu " Lu Guanqun
2011-05-04 13:45 ` [PATCH 08/19] ASoC: upd9976: add DMIC support Lu Guanqun
2011-05-04 15:03 ` Dimitris Papastamos
2011-05-04 15:20 ` Lu Guanqun
2011-05-04 13:45 ` [PATCH 09/19] ASoC: upd9976: add Analog MIC support Lu Guanqun
2011-05-04 13:45 ` [PATCH 10/19] ASoC: upd9976: add microphone bias support Lu Guanqun
2011-05-04 16:25 ` Mark Brown
2011-05-05 0:40 ` Lu Guanqun
2011-05-04 13:45 ` [PATCH 11/19] ASoC: upd9976: add jack detection function Lu Guanqun
2011-05-04 16:32 ` Mark Brown
2011-05-05 0:37 ` Lu Guanqun
2011-05-04 13:45 ` [PATCH 12/19] ASoC: mrst_machine: add capture functionality Lu Guanqun
2011-05-04 13:45 ` Lu Guanqun [this message]
2011-05-04 13:46 ` [PATCH 14/19] ASoC: upd9976: add mute switch for DMIC Lu Guanqun
2011-05-04 13:46 ` [PATCH 15/19] ASoC: upd9976: add mute switch for analog Lu Guanqun
2011-05-04 13:46 ` [PATCH 16/19] ASoC: mrst_machine: make DMIC's output to PCM2 mono Lu Guanqun
2011-05-04 13:46 ` [PATCH 17/19] ASoC: mrst_machine: make MIC2 pseudo-differential Lu Guanqun
2011-05-04 13:46 ` [PATCH 18/19] ASoC: upd9976: add capture volume for analog inputs Lu Guanqun
2011-05-04 13:46 ` [PATCH 19/19] ASoC: upd9976: add capture volume for DMIC Lu Guanqun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110504134559.32443.30963.stgit@localhost \
--to=guanqun.lu@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lrg@ti.com \
--cc=tiwai@suse.de \
--cc=vinod.koul@intel.com \
--cc=xingchao.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.