This allows DT driven boards to allocate and configure the pinmux once
the driver is probed.
Signed-off-by: Daniel Mack <zon...@gmail.com>
Cc: Linus Walleij <linus.wall...@linaro.org>
Cc: Dmitry Torokhov <dmitry.torok...@gmail.com>
---
drivers/input/keyboard/gpio_keys.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/input/keyboard/gpio_keys.c
b/drivers/input/keyboard/gpio_keys.c
index 6a68041..53dff7d 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -29,6 +29,7 @@
#include <linux/of_platform.h>
#include <linux/of_gpio.h>
#include <linux/spinlock.h>
+#include <linux/pinctrl/consumer.h>
struct gpio_button_data {
const struct gpio_keys_button *button;
@@ -664,6 +665,7 @@ static int __devinit gpio_keys_probe(struct platform_device
*pdev)
const struct gpio_keys_platform_data *pdata = dev_get_platdata(dev);
struct gpio_keys_drvdata *ddata;
struct input_dev *input;
+ struct pinctrl *pinctrl;
int i, error;
int wakeup = 0;
@@ -701,6 +703,11 @@ static int __devinit gpio_keys_probe(struct
platform_device *pdev)
input->id.product = 0x0001;
input->id.version = 0x0100;
+ /* request pin mux */
+ pinctrl = devm_pinctrl_get_select_default(dev);
+ if (IS_ERR(pinctrl))
+ dev_warn(dev, "pins are not configured from the driver\n");
+
/* Enable auto repeat feature of Linux input subsystem */
if (pdata->rep)
__set_bit(EV_REP, input->evbit);
--
1.7.11.4
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
