diff options
author | Olliver Schinagl <oliver@schinagl.nl> | 2015-01-21 16:33:46 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-03-04 07:58:58 -0500 |
commit | 1feb57a245a4910b03202a814ffc51a900bd4aca (patch) | |
tree | aa32b4a6ceb8132a7c89c4edae70ea83a7cbc1a0 /drivers/input | |
parent | b80eef95beb04760629822fa130aeed54cdfafca (diff) |
gpio: add parameter to allow the use named gpios
The gpio binding document says that new code should always use named
gpios. Patch 40b73183 added support to parse a list of gpios from child
nodes, but does not make it possible to use named gpios. This patch adds
the con_id property and implements it is done in gpiolib.c, where the
old-style of using unnamed gpios still works.
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
Acked-by: Bryan Wu <cooloney@gmail.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/keyboard/gpio_keys_polled.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index 90df4df58b07..097d7216d98e 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c | |||
@@ -125,7 +125,7 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct | |||
125 | device_for_each_child_node(dev, child) { | 125 | device_for_each_child_node(dev, child) { |
126 | struct gpio_desc *desc; | 126 | struct gpio_desc *desc; |
127 | 127 | ||
128 | desc = devm_get_gpiod_from_child(dev, child); | 128 | desc = devm_get_gpiod_from_child(dev, NULL, child); |
129 | if (IS_ERR(desc)) { | 129 | if (IS_ERR(desc)) { |
130 | error = PTR_ERR(desc); | 130 | error = PTR_ERR(desc); |
131 | if (error != -EPROBE_DEFER) | 131 | if (error != -EPROBE_DEFER) |