input: gpio-keys: parse input-name from dt

Accept input-name from devtree.

Bug 1449481

Change-Id: Icdc5cb82485a40f55895c49854bebcc6e38c7799
Signed-off-by: Vinayak Pane <vpane@nvidia.com>
Reviewed-on: http://git-master/r/386485
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

diff --git a/Documentation/devicetree/bindings/gpio/gpio_keys.txt b/Documentation/devicetree/bindings/gpio/gpio_keys.txt
index 5c2c02140a62dac132566aaeb4f6156b46233f41..baa4e703241ef3047b87499b1cc8575db49d6e8d 100644 (file)
--- a/Documentation/devicetree/bindings/gpio/gpio_keys.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio_keys.txt
@@ -6,6 +6,7 @@ Required properties:
 Optional properties:
        - autorepeat: Boolean, Enable auto repeat feature of Linux input
          subsystem.
+       - input-name: String, Input device name "/sys/class/input/inputX/name"
 
 Each button (key) is represented as a sub-node of "gpio-keys":
 Subnode properties:
@@ -28,6 +29,7 @@ Example nodes:
                        #address-cells = <1>;
                        #size-cells = <0>;
                        autorepeat;
+                       input-name = "gpio-keys";
                        button@21 {
                                label = "GPIO Key UP";
                                linux,code = <103>;

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 13d80878362e0c068efe17bc9a4cccada532ed93..d86b4d459357a6f314011fb71d0f03a55049a16d 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -614,6 +614,7 @@ gpio_keys_get_devtree_pdata(struct device *dev)
        pdata->nbuttons = nbuttons;
 
        pdata->rep = !!of_get_property(node, "autorepeat", NULL);
+       pdata->name = of_get_property(node, "input-name", NULL);
 
        i = 0;
        for_each_child_of_node(node, pp) {