Input: adp5588 - add support for gpio names

Signed-off-by: Jean-François Dagenais <jeff.dagenais@gmail.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 39ebffac207edc419dcc381aff9aae3791a6e53d..b083bf10f13941020215421b52c485e8fb99d22b 100644 (file)
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -197,6 +197,7 @@ static int __devinit adp5588_gpio_add(struct adp5588_kpad *kpad)
        kpad->gc.base = gpio_data->gpio_start;
        kpad->gc.label = kpad->client->name;
        kpad->gc.owner = THIS_MODULE;
+       kpad->gc.names = gpio_data->names;
 
        mutex_init(&kpad->gpio_lock);
 

diff --git a/include/linux/i2c/adp5588.h b/include/linux/i2c/adp5588.h
index cec17cf6cac2b6044d820066419164d2faeccabc..d8341cb47b60882b5a9f53bc6a6a2576b5482db7 100644 (file)
--- a/include/linux/i2c/adp5588.h
+++ b/include/linux/i2c/adp5588.h
@@ -157,6 +157,7 @@ struct i2c_client; /* forward declaration */
 
 struct adp5588_gpio_platform_data {
        int gpio_start;         /* GPIO Chip base # */
+       const char *const *names;
        unsigned irq_base;      /* interrupt base # */
        unsigned pullup_dis_mask; /* Pull-Up Disable Mask */
        int     (*setup)(struct i2c_client *client,