diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-01-13 07:56:40 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-13 09:18:05 +0100 |
| commit | c4dc5f8c953f23d45329abc8b8e04f0c1e314a75 (patch) | |
| tree | 75884e1e5d4b786acbfe64cb91b6f3f9f426506e /drivers/input/keyboard | |
| parent | Merge branch 'xpad' into next (diff) | |
| download | linux-c4dc5f8c953f23d45329abc8b8e04f0c1e314a75.tar.xz linux-c4dc5f8c953f23d45329abc8b8e04f0c1e314a75.zip | |
Input: gpio-keys - allow setting input device name in DT
Allow specifying name if input device via device tree property. This helps
userspace code to get name and perform proper event to key mapping in some
cases (for example, on Android).
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index b9f01bd1b7ef..671cdc9a6aea 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -645,6 +645,8 @@ gpio_keys_get_devtree_pdata(struct device *dev) pdata->rep = !!of_get_property(node, "autorepeat", NULL); + of_property_read_string(node, "label", &pdata->name); + i = 0; for_each_child_of_node(node, pp) { enum of_gpio_flags flags; |