diff options
author | Daniel Silverstone <dsilvers@simtec.co.uk> | 2009-06-17 19:26:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-18 16:03:44 -0400 |
commit | 77906a546127e056dbdac618a7afb5b92d00c058 (patch) | |
tree | 772f90419a217eb3e73483ba7309a9d85e928d51 /drivers/gpio/pca953x.c | |
parent | 7bfa58dd4ac8b07b28d4d48780fd44ee6215562b (diff) |
pca953x: support GPIOLIB GPIO naming
Add support to the PCA953x driver to use the GPIOLIB naming facility for
GPIOs.
Signed-off-by: Daniel Silverstone <dsilvers@simtec.co.uk>
Cc: Ben Gardner <bgardner@wabtec.com>
Cc: Jean Delvare <khali@linux-fr.org>
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>
Diffstat (limited to 'drivers/gpio/pca953x.c')
-rw-r--r-- | drivers/gpio/pca953x.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index 8dc0164bd51e..2dae94fbabf4 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c | |||
@@ -50,6 +50,7 @@ struct pca953x_chip { | |||
50 | 50 | ||
51 | struct i2c_client *client; | 51 | struct i2c_client *client; |
52 | struct gpio_chip gpio_chip; | 52 | struct gpio_chip gpio_chip; |
53 | char **names; | ||
53 | }; | 54 | }; |
54 | 55 | ||
55 | static int pca953x_write_reg(struct pca953x_chip *chip, int reg, uint16_t val) | 56 | static int pca953x_write_reg(struct pca953x_chip *chip, int reg, uint16_t val) |
@@ -192,6 +193,7 @@ static void pca953x_setup_gpio(struct pca953x_chip *chip, int gpios) | |||
192 | gc->label = chip->client->name; | 193 | gc->label = chip->client->name; |
193 | gc->dev = &chip->client->dev; | 194 | gc->dev = &chip->client->dev; |
194 | gc->owner = THIS_MODULE; | 195 | gc->owner = THIS_MODULE; |
196 | gc->names = chip->names; | ||
195 | } | 197 | } |
196 | 198 | ||
197 | static int __devinit pca953x_probe(struct i2c_client *client, | 199 | static int __devinit pca953x_probe(struct i2c_client *client, |
@@ -215,6 +217,8 @@ static int __devinit pca953x_probe(struct i2c_client *client, | |||
215 | 217 | ||
216 | chip->gpio_start = pdata->gpio_base; | 218 | chip->gpio_start = pdata->gpio_base; |
217 | 219 | ||
220 | chip->names = pdata->names; | ||
221 | |||
218 | /* initialize cached registers from their original values. | 222 | /* initialize cached registers from their original values. |
219 | * we can't share this chip with another i2c master. | 223 | * we can't share this chip with another i2c master. |
220 | */ | 224 | */ |