[PATCH v2 2/3] gpio: wm831x: Add basic device tree support

From	Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 2/3] gpio: wm831x: Add basic device tree support
Date	2017-02-13 12:20 +0100
Message-ID	<tamPM-2Yu-5@gated-at.bofh.it> (permalink)
References	<tamPM-2Yu-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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(-)

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);
-- 
2.1.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 2/3] gpio: wm831x: Add basic device tree support Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2017-02-13 12:20 +0100
  Re: [PATCH v2 2/3] gpio: wm831x: Add basic device tree support Linus Walleij <linus.walleij@linaro.org> - 2017-02-22 15:40 +0100
    Re: [PATCH v2 2/3] gpio: wm831x: Add basic device tree support Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2017-02-22 17:10 +0100

csiph-web