aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-01 10:41:05 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2009-12-13 13:20:43 -0500
commit6f2ecaae72910211034c4f1955da97b2ff994265 (patch)
tree68d7217dd24f72deeb40e733e0f9f29aecdfde49 /drivers/gpio
parent894362f53164f93d609559e196378b4d0710c2dd (diff)
gpiolib: Make WM831x GPIO count dynamic
This supports future devices with fewer GPIOs. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/wm831x-gpio.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpio/wm831x-gpio.c b/drivers/gpio/wm831x-gpio.c
index f9c09a54ec7f..f5e4934f1da1 100644
--- a/drivers/gpio/wm831x-gpio.c
+++ b/drivers/gpio/wm831x-gpio.c
@@ -23,8 +23,6 @@
23#include <linux/mfd/wm831x/pdata.h> 23#include <linux/mfd/wm831x/pdata.h>
24#include <linux/mfd/wm831x/gpio.h> 24#include <linux/mfd/wm831x/gpio.h>
25 25
26#define WM831X_GPIO_MAX 16
27
28struct wm831x_gpio { 26struct wm831x_gpio {
29 struct wm831x *wm831x; 27 struct wm831x *wm831x;
30 struct gpio_chip gpio_chip; 28 struct gpio_chip gpio_chip;
@@ -192,7 +190,7 @@ static int __devinit wm831x_gpio_probe(struct platform_device *pdev)
192 190
193 wm831x_gpio->wm831x = wm831x; 191 wm831x_gpio->wm831x = wm831x;
194 wm831x_gpio->gpio_chip = template_chip; 192 wm831x_gpio->gpio_chip = template_chip;
195 wm831x_gpio->gpio_chip.ngpio = WM831X_GPIO_MAX; 193 wm831x_gpio->gpio_chip.ngpio = wm831x->num_gpio;
196 wm831x_gpio->gpio_chip.dev = &pdev->dev; 194 wm831x_gpio->gpio_chip.dev = &pdev->dev;
197 if (pdata && pdata->gpio_base) 195 if (pdata && pdata->gpio_base)
198 wm831x_gpio->gpio_chip.base = pdata->gpio_base; 196 wm831x_gpio->gpio_chip.base = pdata->gpio_base;