diff options
| author | Linus Walleij <[email protected]> | 2021-03-30 00:55:49 +0200 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2021-03-30 00:55:49 +0200 |
| commit | 762bee3e3e9f42cafdb3ead64b7aee37f9b7369f (patch) | |
| tree | ac41e90b78bee9bbfb73b4650d519f3081043b6d /include/linux | |
| parent | 22667a63fe3e5fbda7b02ac51d769ad906a385b2 (diff) | |
| parent | d28039fccf948a407de69106465caa465b1dcf32 (diff) | |
Merge branch 'ib-bcm63xx' into devel
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/gpio/driver.h | 9 | ||||
| -rw-r--r-- | include/linux/gpio/regmap.h | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 286de0520574..ecf0032a0995 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -624,8 +624,17 @@ void gpiochip_irq_domain_deactivate(struct irq_domain *domain, bool gpiochip_irqchip_irq_valid(const struct gpio_chip *gc, unsigned int offset); +#ifdef CONFIG_GPIOLIB_IRQCHIP int gpiochip_irqchip_add_domain(struct gpio_chip *gc, struct irq_domain *domain); +#else +static inline int gpiochip_irqchip_add_domain(struct gpio_chip *gc, + struct irq_domain *domain) +{ + WARN_ON(1); + return -EINVAL; +} +#endif int gpiochip_generic_request(struct gpio_chip *gc, unsigned int offset); void gpiochip_generic_free(struct gpio_chip *gc, unsigned int offset); diff --git a/include/linux/gpio/regmap.h b/include/linux/gpio/regmap.h index ad76f3d0a6ba..334dd928042b 100644 --- a/include/linux/gpio/regmap.h +++ b/include/linux/gpio/regmap.h @@ -4,6 +4,7 @@ #define _LINUX_GPIO_REGMAP_H struct device; +struct fwnode_handle; struct gpio_regmap; struct irq_domain; struct regmap; @@ -16,6 +17,8 @@ struct regmap; * @parent: The parent device * @regmap: The regmap used to access the registers * given, the name of the device is used + * @fwnode: (Optional) The firmware node. + * If not given, the fwnode of the parent is used. * @label: (Optional) Descriptive name for GPIO controller. * If not given, the name of the device is used. * @ngpio: Number of GPIOs @@ -57,6 +60,7 @@ struct regmap; struct gpio_regmap_config { struct device *parent; struct regmap *regmap; + struct fwnode_handle *fwnode; const char *label; int ngpio; |