Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1e9adc0 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Support edge triggered IRQs for WM8915 



Really this should be something the IRQ core can cope with for us but since
it doesn't currently do so (at least for threaded interrupts like this) do
so in the driver. This allows us to run with interrupt controllers that
only support edge triggered interrupts.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 37aa716a

sound/soc/codecs/wm8915.c

+22 −2
Original line number Diff line number Diff line
@@ -2382,6 +2382,20 @@ static irqreturn_t wm8915_irq(int irq, void *data) 
	}

}



static irqreturn_t wm8915_edge_irq(int irq, void *data)

{

	irqreturn_t ret = IRQ_NONE;

	irqreturn_t val;



	do {

		val = wm8915_irq(irq, data);

		if (val != IRQ_NONE)

			ret = val;

	} while (val != IRQ_NONE);



	return ret;

}



static void wm8915_retune_mobile_pdata(struct snd_soc_codec *codec)

{

	struct wm8915_priv *wm8915 = snd_soc_codec_get_drvdata(codec);
@@ -2708,8 +2722,14 @@ static int wm8915_probe(struct snd_soc_codec *codec) 


		irq_flags |= IRQF_ONESHOT;



		if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING))

			ret = request_threaded_irq(i2c->irq, NULL,

						   wm8915_edge_irq,

						   irq_flags, "wm8915", codec);

		else

			ret = request_threaded_irq(i2c->irq, NULL, wm8915_irq,

						   irq_flags, "wm8915", codec);



		if (ret == 0) {

			/* Unmask the interrupt */

			snd_soc_update_bits(codec, WM8915_INTERRUPT_CONTROL,