diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-11 03:39:29 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-11 03:39:29 (GMT) |
| commit | 4d348e6e0a35cd1b40196a463f1159ae5d582770 (patch) | |
| tree | 914c629a0f0ff6c3015c7afb0a4317df465c9246 | |
| parent | bcf86687d676fa478c71201294b296126212f06c (diff) | |
| parent | 90f790d2dc96f5a61855ae65b90e30c40c893a20 (diff) | |
| download | linux-4d348e6e0a35cd1b40196a463f1159ae5d582770.tar.xz | |
Merge remote-tracking branch 'regmap/topic/domain' into regmap-next
| -rw-r--r-- | drivers/base/regmap/regmap-irq.c | 19 | ||||
| -rw-r--r-- | include/linux/regmap.h | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index 5b6b1d8e..5972ad9 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c @@ -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); diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 9f228d7..41e9e4e 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -19,6 +19,7 @@ struct module; struct device; struct i2c_client; +struct irq_domain; struct spi_device; struct regmap; struct regmap_range_cfg; @@ -321,6 +322,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 |