From: Jean-François Dagenais Date: Fri, 11 May 2012 05:32:00 +0000 (-0700) Subject: Input: adp5588 - add support for gpio names X-Git-Tag: v3.5-rc6~10^2~4^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d0a3457d38adbad37e43ffe6b763360b2bfe71d9;p=platform%2Fkernel%2Flinux-3.10.git Input: adp5588 - add support for gpio names Signed-off-by: Jean-François Dagenais Acked-by: Michael Hennerich Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index 39ebffa..b083bf1 100644 --- 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 cec17cf..d8341cb 100644 --- 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,