summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-wm831x.c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2021-12-06 15:18:52 +0200
committerBartosz Golaszewski <brgl@bgdev.pl>2021-12-17 17:50:46 +0100
commit6dbe6c07f94f349098b512d88a1e1c5e2312b13d (patch)
treef9b6be6937c13c8494ba5263cb0f5b1ab8fc503e /drivers/gpio/gpio-wm831x.c
parent45a541a610af8156ee623b5906515796405ae9f5 (diff)
downloadlinux-stable-6dbe6c07f94f349098b512d88a1e1c5e2312b13d.tar.gz
linux-stable-6dbe6c07f94f349098b512d88a1e1c5e2312b13d.tar.bz2
linux-stable-6dbe6c07f94f349098b512d88a1e1c5e2312b13d.zip
gpio: Propagate firmware node from a parent device
When creating MFD platform devices the firmware node is left unset. This, in particular, prevents GPIO library to use it for different purposes. Propagate firmware node from the parent device and let GPIO library do the right thing. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Diffstat (limited to 'drivers/gpio/gpio-wm831x.c')
-rw-r--r--drivers/gpio/gpio-wm831x.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-wm831x.c b/drivers/gpio/gpio-wm831x.c
index 9cf1e5ebb352..7eaf8a28638c 100644
--- a/drivers/gpio/gpio-wm831x.c
+++ b/drivers/gpio/gpio-wm831x.c
@@ -262,6 +262,8 @@ static int wm831x_gpio_probe(struct platform_device *pdev)
struct wm831x_pdata *pdata = &wm831x->pdata;
struct wm831x_gpio *wm831x_gpio;
+ device_set_node(&pdev->dev, dev_fwnode(pdev->dev.parent));
+
wm831x_gpio = devm_kzalloc(&pdev->dev, sizeof(*wm831x_gpio),
GFP_KERNEL);
if (wm831x_gpio == NULL)
@@ -275,9 +277,6 @@ static int wm831x_gpio_probe(struct platform_device *pdev)
wm831x_gpio->gpio_chip.base = pdata->gpio_base;
else
wm831x_gpio->gpio_chip.base = -1;
-#ifdef CONFIG_OF_GPIO
- wm831x_gpio->gpio_chip.of_node = wm831x->dev->of_node;
-#endif
return devm_gpiochip_add_data(&pdev->dev, &wm831x_gpio->gpio_chip, wm831x_gpio);
}