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

Commit 6550334f authored by Mark Brown's avatar Mark Brown
Browse files

mfd: wm8994: Update to fully use irq_domain 



Take advantage of the new regmap irq_domain support to dynamically
allocate interrupts, using regmap_irq_get_virq() rather than irq_base
to look up the interrupts. This means that most users should not need
to specify an irq_base at all.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 022f926a

drivers/mfd/wm8994-irq.c

+0 −6
Original line number Diff line number Diff line
@@ -147,12 +147,6 @@ int wm8994_irq_init(struct wm8994 *wm8994) 
		return 0;

	}



	if (!wm8994->irq_base) {

		dev_err(wm8994->dev,

			"No interrupt base specified, no interrupts\n");

		return 0;

	}



	ret = regmap_add_irq_chip(wm8994->regmap, wm8994->irq,

				  IRQF_TRIGGER_HIGH | IRQF_ONESHOT,

				  wm8994->irq_base, &wm8994_irq_chip,

include/linux/mfd/wm8994/core.h

+6 −6
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <linux/mutex.h>

#include <linux/interrupt.h>

#include <linux/regmap.h>



enum wm8994_type {

	WM8994 = 0,
@@ -26,7 +27,6 @@ enum wm8994_type { 


struct regulator_dev;

struct regulator_bulk_data;

struct regmap;



#define WM8994_NUM_GPIO_REGS 11

#define WM8994_NUM_LDO_REGS   2
@@ -94,17 +94,17 @@ static inline int wm8994_request_irq(struct wm8994 *wm8994, int irq, 
				     irq_handler_t handler, const char *name,

				     void *data)

{

	if (!wm8994->irq_base)

	if (!wm8994->irq_data)

		return -EINVAL;

	return request_threaded_irq(wm8994->irq_base + irq, NULL, handler,

				    IRQF_TRIGGER_RISING, name,

	return request_threaded_irq(regmap_irq_get_virq(wm8994->irq_data, irq),

				    NULL, handler, IRQF_TRIGGER_RISING, name,

				    data);

}

static inline void wm8994_free_irq(struct wm8994 *wm8994, int irq, void *data)

{

	if (!wm8994->irq_base)

	if (!wm8994->irq_data)

		return;

	free_irq(wm8994->irq_base + irq, data);

	free_irq(regmap_irq_get_virq(wm8994->irq_data, irq), data);

}



int wm8994_irq_init(struct wm8994 *wm8994);