Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit d0a3457d38adbad37e43ffe6b763360b2bfe71d9

Authored by Jean-François Dagenais
Committed by Dmitry Torokhov
1 parent f77621cc64
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 2 additions and 0 deletions Side-by-side Diff

drivers/input/keyboard/adp5588-keys.c
Diff comments   View file @ d0a3457
... ... @@ -197,6 +197,7 @@
197 197 kpad->gc.base = gpio_data->gpio_start;
198 198 kpad->gc.label = kpad->client->name;
199 199 kpad->gc.owner = THIS_MODULE;
  200 + kpad->gc.names = gpio_data->names;
200 201  
201 202 mutex_init(&kpad->gpio_lock);
202 203  
include/linux/i2c/adp5588.h
Diff comments   View file @ d0a3457
... ... @@ -157,6 +157,7 @@
157 157  
158 158 struct adp5588_gpio_platform_data {
159 159 int gpio_start; /* GPIO Chip base # */
  160 + const char *const *names;
160 161 unsigned irq_base; /* interrupt base # */
161 162 unsigned pullup_dis_mask; /* Pull-Up Disable Mask */
162 163 int (*setup)(struct i2c_client *client,