diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2021-10-27 00:16:14 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2021-10-27 00:16:14 +0200 |
| commit | 5853fd57d8933f0b667ed467fe30a086112af6c9 (patch) | |
| tree | 3c811b3fc8c81891d1cd9079f019e3ac4ba1e8a9 | |
| parent | pinctrl: tegra: Fix warnings and error (diff) | |
| parent | gpio: Allow per-parent interrupt data (diff) | |
| download | linux-dev-5853fd57d8933f0b667ed467fe30a086112af6c9.tar.xz linux-dev-5853fd57d8933f0b667ed467fe30a086112af6c9.zip | |
Merge branch 'ib-gpio-ppid' into devel
| -rw-r--r-- | drivers/gpio/gpiolib.c | 9 | ||||
| -rw-r--r-- | include/linux/gpio/driver.h | 19 |
2 files changed, 24 insertions, 4 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index d1b9b721218f..abfbf546d159 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1534,9 +1534,14 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc, } if (gc->irq.parent_handler) { - void *data = gc->irq.parent_handler_data ?: gc; - for (i = 0; i < gc->irq.num_parents; i++) { + void *data; + + if (gc->irq.per_parent_data) + data = gc->irq.parent_handler_data_array[i]; + else + data = gc->irq.parent_handler_data ?: gc; + /* * The parent IRQ chip is already using the chip_data * for this IRQ chip, so our callbacks simply use the diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index a0f9901dcae6..a673a359e20b 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -168,11 +168,18 @@ struct gpio_irq_chip { /** * @parent_handler_data: + * @parent_handler_data_array: * * Data associated, and passed to, the handler for the parent - * interrupt. + * interrupt. Can either be a single pointer if @per_parent_data + * is false, or an array of @num_parents pointers otherwise. If + * @per_parent_data is true, @parent_handler_data_array cannot be + * NULL. */ - void *parent_handler_data; + union { + void *parent_handler_data; + void **parent_handler_data_array; + }; /** * @num_parents: @@ -204,6 +211,14 @@ struct gpio_irq_chip { bool threaded; /** + * @per_parent_data: + * + * True if parent_handler_data_array describes a @num_parents + * sized array to be used as parent data. + */ + bool per_parent_data; + + /** * @init_hw: optional routine to initialize hardware before * an IRQ chip will be added. This is quite useful when * a particular driver wants to clear IRQ related registers |