Skip to content

Commit ac62726

Browse files
committed
gpiolib: of: make fwnode take precedence in struct gpio_chip
If the driver sets the fwnode in struct gpio_chip, let it take precedence over the of_node. This only affects OF-based systems, ACPI needs to be converted separately. Signed-off-by: Bartosz Golaszewski <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Acked-by: Linus Walleij <[email protected]>
1 parent 990f675 commit ac62726

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/gpio/gpiolib-of.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,9 @@ void of_gpio_dev_init(struct gpio_chip *gc, struct gpio_device *gdev)
10461046
if (gc->parent)
10471047
gdev->dev.of_node = gc->parent->of_node;
10481048

1049+
if (gc->fwnode)
1050+
gc->of_node = to_of_node(gc->fwnode);
1051+
10491052
/* If the gpiochip has an assigned OF node this takes precedence */
10501053
if (gc->of_node)
10511054
gdev->dev.of_node = gc->of_node;

0 commit comments

Comments
 (0)