| Message ID | 1486984514-29749-2-git-send-email-ckeepax@opensource.wolfsonmicro.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Feb 13, 2017 at 12:15 PM, Charles Keepax <ckeepax@opensource.wolfsonmicro.com> wrote: > 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> > --- > > No changes since v1. Acked-by: Linus Walleij <linus.walleij@linaro.org> Is it OK if I merge this separately from the first patch in the series? Else you need to ask Lee to merge it with my ACK. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 22, 2017 at 03:35:26PM +0100, Linus Walleij wrote: > On Mon, Feb 13, 2017 at 12:15 PM, Charles Keepax > <ckeepax@opensource.wolfsonmicro.com> wrote: > > > 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> > > --- > > > > No changes since v1. > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > Is it OK if I merge this separately from the first patch in the series? > > Else you need to ask Lee to merge it with my ACK. Afraid these two need to go in together because of a build dependency. Thanks, Charles -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpio-wm831x.c b/drivers/gpio/gpio-wm831x.c index 533707f..110453c7 100644 --- a/drivers/gpio/gpio-wm831x.c +++ b/drivers/gpio/gpio-wm831x.c @@ -264,7 +264,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; @@ -281,6 +281,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);
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> --- No changes since v1. drivers/gpio/gpio-wm831x.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)