diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2017-03-17 10:05:19 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2017-03-23 11:45:55 +0000 |
| commit | 9674a8dc5bd1f3cd27f4e6f668beadc64475f3e9 (patch) | |
| tree | 2d1f7a07352b35754bf772463b864a28a9915ee1 /drivers/gpio | |
| parent | f6dd8449cd50de25881b76cecf1086bebeb11fe8 (diff) | |
| download | linux-9674a8dc5bd1f3cd27f4e6f668beadc64475f3e9.tar.bz2 | |
gpio: wm831x: Add basic device tree support
Now the wm831x-core has basic DT support we can update this driver to
allow use of the GPIOs within a device tree system.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-wm831x.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-wm831x.c b/drivers/gpio/gpio-wm831x.c index 00e3839b3f96..938bbe3f831c 100644 --- a/drivers/gpio/gpio-wm831x.c +++ b/drivers/gpio/gpio-wm831x.c @@ -263,7 +263,7 @@ static const struct gpio_chip template_chip = { static int wm831x_gpio_probe(struct platform_device *pdev) { struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); - struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev); + struct wm831x_pdata *pdata = &wm831x->pdata; struct wm831x_gpio *wm831x_gpio; int ret; @@ -280,6 +280,9 @@ 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 ret = devm_gpiochip_add_data(&pdev->dev, &wm831x_gpio->gpio_chip, wm831x_gpio); |