diff mbox

[v2,1/2] Input: egalax_ts: get gpio from devicetree node

Message ID 1344417034-30175-2-git-send-email-jason77.wang@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jason Wang Aug. 8, 2012, 9:10 a.m. UTC 
The irq_to_gpio() is old, most platforms use GENERIC_GPIO framework
and don't support this API anymore.

The i.MX6q sabrelite platform equips an egalax touchscreen controller,
and this platform already transfered to GENERIC_GPIO framework, to
support this driver, we use a more generic way to get gpio.

Add a return value checking for waking up the controller in the probe
function, this guarantee only a workable device can pass init.

Signed-off-by: Hui Wang <jason77.wang@gmail.com>
---
 drivers/input/touchscreen/egalax_ts.c |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

Comments

Zhang Jiejing-B33651 Aug. 8, 2012, 10:08 a.m. UTC | #1 
Hi Hui,

? 2012-8-8???5:10?Hui Wang <jason77.wang@gmail.com>
 ???

> The irq_to_gpio() is old, most platforms use GENERIC_GPIO framework

> and don't support this API anymore.

> 

> The i.MX6q sabrelite platform equips an egalax touchscreen controller,

> and this platform already transfered to GENERIC_GPIO framework, to

> support this driver, we use a more generic way to get gpio.

> 

> Add a return value checking for waking up the controller in the probe

> function, this guarantee only a workable device can pass init.

> 

> Signed-off-by: Hui Wang <jason77.wang@gmail.com>

Ackyed-by Zhang Jiejing <jiejing.zhang@freescale.com> 
> ---

> drivers/input/touchscreen/egalax_ts.c |   19 ++++++++++++++++---

> 1 files changed, 16 insertions(+), 3 deletions(-)



Best Regards
Jiejing
diff mbox

Patch

diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c
index 70524dd..668b9ba 100644
--- a/drivers/input/touchscreen/egalax_ts.c
+++ b/drivers/input/touchscreen/egalax_ts.c
@@ -28,6 +28,7 @@ 
 #include <linux/slab.h>
 #include <linux/bitops.h>
 #include <linux/input/mt.h>
+#include <linux/of_gpio.h>
 
 /*
  * Mouse Mode: some panel may configure the controller to mouse mode,
@@ -122,8 +123,15 @@  static irqreturn_t egalax_ts_interrupt(int irq, void *dev_id)
 /* wake up controller by an falling edge of interrupt gpio.  */
 static int egalax_wake_up_device(struct i2c_client *client)
 {
-	int gpio = irq_to_gpio(client->irq);
-	int ret;
+	struct device_node *np = client->dev.of_node;
+	int gpio, ret;
+
+	if (!np)
+		return -ENODEV;
+
+	gpio = of_get_named_gpio(np, "irq-gpio", 0);
+	if (!gpio_is_valid(gpio))
+		return -ENODEV;
 
 	ret = gpio_request(gpio, "egalax_irq");
 	if (ret < 0) {
@@ -181,7 +189,12 @@  static int __devinit egalax_ts_probe(struct i2c_client *client,
 	ts->input_dev = input_dev;
 
 	/* controller may be in sleep, wake it up. */
-	egalax_wake_up_device(client);
+	ret = egalax_wake_up_device(client);
+	if (ret < 0) {
+		dev_err(&client->dev, "Failed to wake up the controller\n");
+		error = ret;
+		goto err_free_dev;
+	}
 
 	ret = egalax_firmware_version(client);
 	if (ret < 0) {