summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Patard <apatard@mandriva.com>2008-07-25 12:46:00 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 21:53:30 +0400
commit60e540d617b40eb3d37f1dd99c97af588ff9b70b (patch)
treef4887d37cb8e21ffa86abf43d489fdd4c426d734
parentf61be273d3699d174bc1438e6804f9f9e52bb932 (diff)
downloadlinux-60e540d617b40eb3d37f1dd99c97af588ff9b70b.tar.xz
sm501: gpio dynamic registration for PCI devices
The SM501 PCI card requires a dyanmic gpio allocation as the number of cards is not known at compile time. Fixup the platform data and registration to deal with this. Acked-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Arnaud Patard <apatard@mandriva.com> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/mfd/sm501.c6
-rw-r--r--include/linux/sm501.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index be8713908125..c3e5a48f6148 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -996,12 +996,13 @@ static int __devinit sm501_gpio_register_chip(struct sm501_devdata *sm,
{
struct sm501_platdata *pdata = sm->platdata;
struct gpio_chip *gchip = &chip->gpio;
- unsigned base = pdata->gpio_base;
+ int base = pdata->gpio_base;
memcpy(chip, &gpio_chip_template, sizeof(struct gpio_chip));
if (chip == &gpio->high) {
- base += 32;
+ if (base > 0)
+ base += 32;
chip->regbase = gpio->regs + SM501_GPIO_DATA_HIGH;
gchip->label = "SM501-HIGH";
} else {
@@ -1452,6 +1453,7 @@ static struct sm501_platdata_fb sm501_fb_pdata = {
static struct sm501_platdata sm501_pci_platdata = {
.init = &sm501_pci_initdata,
.fb = &sm501_fb_pdata,
+ .gpio_base = -1,
};
static int sm501_pci_probe(struct pci_dev *dev,
diff --git a/include/linux/sm501.h b/include/linux/sm501.h
index 6ea39007c8a3..a8d02f36ad32 100644
--- a/include/linux/sm501.h
+++ b/include/linux/sm501.h
@@ -156,7 +156,7 @@ struct sm501_platdata {
struct sm501_platdata_fb *fb;
int flags;
- unsigned gpio_base;
+ int gpio_base;
int (*get_power)(struct device *dev);
int (*set_power)(struct device *dev, unsigned int on);