On 10/23/2012 21:29, Jean-Christophe PLAGNIOL-VILLARD wrote:
If no pinctrl available just report a warning as some architecture may not
need to do anything.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
Cc: linux-input@xxxxxxxxxxxxxxx
---
drivers/input/keyboard/qt1070.c | 11 +++++++++++
1 file changed, 11 insertions(+)
Test it on sam9x5ek board with qt1070. It works well.
Tested-by: Bo Shen <voice.shen@xxxxxxxxx>
diff --git a/drivers/input/keyboard/qt1070.c b/drivers/input/keyboard/qt1070.c
index ca68f29..967734e 100644
--- a/drivers/input/keyboard/qt1070.c
+++ b/drivers/input/keyboard/qt1070.c
@@ -33,6 +33,7 @@
#include <linux/interrupt.h>
#include <linux/jiffies.h>
#include <linux/delay.h>
+#include <linux/pinctrl/consumer.h>
/* Address for each register */
#define CHIP_ID 0x00
@@ -147,6 +148,7 @@ static int __devinit qt1070_probe(struct i2c_client *client,
struct input_dev *input;
int i;
int err;
+ struct pinctrl *pinctrl;
err = i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE);
if (!err) {
@@ -155,6 +157,15 @@ static int __devinit qt1070_probe(struct i2c_client *client,
return -ENODEV;
}
+ pinctrl = devm_pinctrl_get_select_default(&client->dev);
+ if (IS_ERR(pinctrl)) {
+ err = PTR_ERR(pinctrl);
+ if (err == -EPROBE_DEFER)
+ return err;
+
+ dev_warn(&client->dev, "No pinctrl provided\n");
+ }
+
if (!client->irq) {
dev_err(&client->dev, "please assign the irq to this device\n");
return -EINVAL;
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
