| Message ID | 20211223103809.12343-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 4a08d63c243ae8525c40016ce57b50df515fafaf |
| Headers | show |
| Series | [v1,1/2] gpiolib: acpi: make fwnode take precedence in struct gpio_chip | expand |
On Thu, Dec 23, 2021 at 11:38 AM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > If the driver sets the fwnode in struct gpio_chip, let it take > precedence over the parent's fwnode. > > This is a follow up to the commit 9126a738edc1 ("gpiolib: of: make > fwnode take precedence in struct gpio_chip"). > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- Applied, thanks! Bart
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index c7a0e56593e7..c0f6a25c3279 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -1339,6 +1339,9 @@ void acpi_gpio_dev_init(struct gpio_chip *gc, struct gpio_device *gdev) /* Set default fwnode to parent's one if present */ if (gc->parent) ACPI_COMPANION_SET(&gdev->dev, ACPI_COMPANION(gc->parent)); + + if (gc->fwnode) + device_set_node(&gdev->dev, gc->fwnode); } static int acpi_gpio_package_count(const union acpi_object *obj)
If the driver sets the fwnode in struct gpio_chip, let it take precedence over the parent's fwnode. This is a follow up to the commit 9126a738edc1 ("gpiolib: of: make fwnode take precedence in struct gpio_chip"). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/gpio/gpiolib-acpi.c | 3 +++ 1 file changed, 3 insertions(+)