Commit ac627260 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

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: default avatarBartosz Golaszewski <brgl@bgdev.pl>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 990f6756

drivers/gpio/gpiolib-of.c

+3 −0
Original line number Diff line number Diff line
@@ -1046,6 +1046,9 @@ void of_gpio_dev_init(struct gpio_chip *gc, struct gpio_device *gdev) 
	if (gc->parent)

		gdev->dev.of_node = gc->parent->of_node;



	if (gc->fwnode)

		gc->of_node = to_of_node(gc->fwnode);



	/* If the gpiochip has an assigned OF node this takes precedence */

	if (gc->of_node)

		gdev->dev.of_node = gc->of_node;