@@ -856,13 +856,20 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
}
}
- if (irq_base)
+ if (irq_base) {
+ if (chip->domain_suffix)
+ dev_warn(map->dev,
+ "Can't add name suffix for legacy domain\n");
+
d->domain = irq_domain_create_legacy(fwnode, chip->num_irqs,
irq_base, 0,
®map_domain_ops, d);
- else
- d->domain = irq_domain_create_linear(fwnode, chip->num_irqs,
- ®map_domain_ops, d);
+ } else {
+ d->domain = irq_domain_create_linear_named(fwnode,
+ chip->num_irqs, ®map_domain_ops,
+ d, chip->domain_suffix);
+ }
+
if (!d->domain) {
dev_err(map->dev, "Failed to create IRQ domain\n");
ret = -ENOMEM;
@@ -1519,6 +1519,9 @@ struct regmap_irq_chip_data;
* struct regmap_irq_chip - Description of a generic regmap irq_chip.
*
* @name: Descriptive name for IRQ controller.
+ * @domain_suffix: Name suffix to be appended to end of IRQ domain name. Needed
+ * when multiple regmap-IRQ controllers are created from same
+ * device.
*
* @main_status: Base main status register address. For chips which have
* interrupts arranged in separate sub-irq blocks with own IRQ
@@ -1604,6 +1607,7 @@ struct regmap_irq_chip_data;
*/
struct regmap_irq_chip {
const char *name;
+ const char *domain_suffix;
unsigned int main_status;
unsigned int num_main_status_bits;
When multiple IRQ domains are created from the same device-tree node they will get the same name based on the device-tree path. This will cause a naming collision in debugFS when IRQ domain specific entries are created. The regmap-IRQ creates per instance IRQ domains. This will lead to a domain name conflict when a device which provides more than one interrupt line uses the regmap-IRQ. Add support for specifying an IRQ domain name suffix when creating a regmap-IRQ controller. The regmap-IRQ supports both the legacy IRQ domains and the linear IRQ domains. New devices are not expected to be using the legacy domains so support name suffixes only for linear domains and warn if suffix is tried to be added for a legacy domain. Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> --- Revision history: v2 => v3: - Drop name suffix support for the legacy domains --- drivers/base/regmap/regmap-irq.c | 15 +++++++++++---- include/linux/regmap.h | 4 ++++ 2 files changed, 15 insertions(+), 4 deletions(-)