aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
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/mfd
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/mfd')
-rw-r--r--drivers/mfd/wm831x-core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 8504c6ef4a16..8d386c0c8027 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1293,16 +1293,19 @@ static int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
1293 switch (ret) { 1293 switch (ret) {
1294 case WM8310: 1294 case WM8310:
1295 parent = WM8310; 1295 parent = WM8310;
1296 wm831x->num_gpio = 16;
1296 dev_info(wm831x->dev, "WM8310 revision %c\n", 'A' + rev); 1297 dev_info(wm831x->dev, "WM8310 revision %c\n", 'A' + rev);
1297 break; 1298 break;
1298 1299
1299 case WM8311: 1300 case WM8311:
1300 parent = WM8311; 1301 parent = WM8311;
1302 wm831x->num_gpio = 16;
1301 dev_info(wm831x->dev, "WM8311 revision %c\n", 'A' + rev); 1303 dev_info(wm831x->dev, "WM8311 revision %c\n", 'A' + rev);
1302 break; 1304 break;
1303 1305
1304 case WM8312: 1306 case WM8312:
1305 parent = WM8312; 1307 parent = WM8312;
1308 wm831x->num_gpio = 16;
1306 dev_info(wm831x->dev, "WM8312 revision %c\n", 'A' + rev); 1309 dev_info(wm831x->dev, "WM8312 revision %c\n", 'A' + rev);
1307 break; 1310 break;
1308 1311