diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-01-12 22:56:40 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-13 00:18:05 -0800 |
| commit | c4dc5f8c953f23d45329abc8b8e04f0c1e314a75 (patch) | |
| tree | 75884e1e5d4b786acbfe64cb91b6f3f9f426506e | |
| parent | 85c017f2f1a6ae213b08c9d694202df8c912c614 (diff) | |
| download | linux-stable-c4dc5f8c953f23d45329abc8b8e04f0c1e314a75.tar.gz linux-stable-c4dc5f8c953f23d45329abc8b8e04f0c1e314a75.tar.bz2 linux-stable-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>
| -rw-r--r-- | Documentation/devicetree/bindings/input/gpio-keys.txt | 1 | ||||
| -rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/gpio-keys.txt b/Documentation/devicetree/bindings/input/gpio-keys.txt index cf1333d1dd52..21641236c095 100644 --- a/Documentation/devicetree/bindings/input/gpio-keys.txt +++ b/Documentation/devicetree/bindings/input/gpio-keys.txt @@ -6,6 +6,7 @@ Required properties: Optional properties: - autorepeat: Boolean, Enable auto repeat feature of Linux input subsystem. + - label: String, name of the input device. Each button (key) is represented as a sub-node of "gpio-keys": Subnode properties: 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; |