[PATCH v5 02/15] gpio: regmap: set gpio_chip of_node
From: Álvaro Fernández Rojas <hidden>
Date: 2021-03-06 15:58:21
Also in:
linux-arm-kernel, linux-gpio, lkml
Subsystem:
gpio regmap, gpio subsystem, the rest · Maintainers:
Michael Walle, Linus Walleij, Bartosz Golaszewski, Linus Torvalds
This is needed for properly registering GPIO regmap as a child of a regmap pin controller. Signed-off-by: Álvaro Fernández Rojas <redacted> Reviewed-by: Michael Walle <redacted> --- v5: switch to fwnode v4: fix documentation v3: introduce patch needed for properly parsing gpio-range drivers/gpio/gpio-regmap.c | 4 ++++ include/linux/gpio/regmap.h | 3 +++ 2 files changed, 7 insertions(+)
diff --git a/drivers/gpio/gpio-regmap.c b/drivers/gpio/gpio-regmap.c
index 5412cb3b0b2a..626433934d69 100644
--- a/drivers/gpio/gpio-regmap.c
+++ b/drivers/gpio/gpio-regmap.c@@ -249,6 +249,10 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config chip = &gpio->gpio_chip; chip->parent = config->parent; + if (config->fwnode) + chip->of_node = to_of_node(config->fwnode); + else + chip->of_node = dev_of_node(config->parent); chip->base = -1; chip->ngpio = config->ngpio; chip->names = config->names;
diff --git a/include/linux/gpio/regmap.h b/include/linux/gpio/regmap.h
index ad76f3d0a6ba..c12e8d1d171b 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,7 @@ 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 * @label: (Optional) Descriptive name for GPIO controller. * If not given, the name of the device is used. * @ngpio: Number of GPIOs
@@ -57,6 +59,7 @@ struct regmap; struct gpio_regmap_config { struct device *parent; struct regmap *regmap; + struct fwnode_handle *fwnode; const char *label; int ngpio;
--
2.20.1