From: Daniel Mack <zonque@gmail.com>
To: linux-input@vger.kernel.org
Cc: Daniel Mack <zonque@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: [PATCH] Input: gpio_keys: allocate pins
Date: Fri, 12 Oct 2012 17:55:46 +0200 [thread overview]
Message-ID: <1350057346-15998-1-git-send-email-zonque@gmail.com> (raw)
This allows DT driven boards to allocate and configure the pinmux once
the driver is probed.
Signed-off-by: Daniel Mack <zonque@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Dmitry Torokhov <dmitry.torokhov@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
next reply other threads:[~2012-10-12 15:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-12 15:55 Daniel Mack [this message]
2012-10-12 21:26 ` [PATCH] Input: gpio_keys: allocate pins Linus Walleij
2012-10-12 21:27 ` Daniel Mack
2012-10-12 21:37 ` Linus Walleij
2012-10-12 21:40 ` Daniel Mack
2012-10-12 21:44 ` Linus Walleij
2012-10-25 7:58 ` Lee Jones
2012-10-25 8:08 ` Linus Walleij
2012-10-25 8:20 ` Lee Jones
2012-10-25 8:20 ` Daniel Mack
2012-10-12 21:35 ` Dmitry Torokhov
2012-10-12 21:40 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350057346-15998-1-git-send-email-zonque@gmail.com \
--to=zonque@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-input@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).