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

Commit ea2590e2 authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

Merge tag 'topic/domain' of... 

Merge tag 'topic/domain' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into for-next
parents fe39f2f4 90f790d2

drivers/base/regmap/regmap-irq.c

+19 −0
Original line number Diff line number Diff line
@@ -458,3 +458,22 @@ int regmap_irq_get_virq(struct regmap_irq_chip_data *data, int irq) 
	return irq_create_mapping(data->domain, irq);

}

EXPORT_SYMBOL_GPL(regmap_irq_get_virq);



/**

 * regmap_irq_get_domain(): Retrieve the irq_domain for the chip

 *

 * Useful for drivers to request their own IRQs and for integration

 * with subsystems.  For ease of integration NULL is accepted as a

 * domain, allowing devices to just call this even if no domain is

 * allocated.

 *

 * @data: regmap_irq controller to operate on.

 */

struct irq_domain *regmap_irq_get_domain(struct regmap_irq_chip_data *data)

{

	if (data)

		return data->domain;

	else

		return NULL;

}

EXPORT_SYMBOL_GPL(regmap_irq_get_domain);

include/linux/regmap.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
struct module;

struct device;

struct i2c_client;

struct irq_domain;

struct spi_device;

struct regmap;

struct regmap_range_cfg;
@@ -317,6 +318,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, 
void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data);

int regmap_irq_chip_get_base(struct regmap_irq_chip_data *data);

int regmap_irq_get_virq(struct regmap_irq_chip_data *data, int irq);

struct irq_domain *regmap_irq_get_domain(struct regmap_irq_chip_data *data);



#else