summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Sliwa <dominik.sliwa@toradex.com>2018-10-09 10:04:23 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-11-29 13:53:50 +0100
commitb18b41786a1507bec257c9a131d5aefd5c942f16 (patch)
tree975f46aae7eb28f9329e0943494e2220079bafc3
parent4f04efd8590618827d15c41dabfe7e31bb0b8ac4 (diff)
Revert "input: atmel_mxt_ts: support reset gpio line"
This reverts commit 28531a1ff5ca27c0ab7e2f99bbb0058858b72aa5.
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c23
-rw-r--r--include/linux/platform_data/atmel_mxt_ts.h1
2 files changed, 0 insertions, 24 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 8f5c281..4ddbced 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -27,7 +27,6 @@
#include <linux/input/mt.h>
#include <linux/interrupt.h>
#include <linux/of.h>
-#include <linux/of_gpio.h>
#include <linux/slab.h>
#include <asm/unaligned.h>
#include <media/v4l2-device.h>
@@ -2920,8 +2919,6 @@ static const struct mxt_platform_data *mxt_parse_dt(struct i2c_client *client)
if (!pdata)
return ERR_PTR(-ENOMEM);
- pdata->gpio_reset = of_get_named_gpio(np, "reset-gpio", 0);
-
if (of_find_property(np, "linux,gpio-keymap", &proplen)) {
pdata->t19_num_keys = proplen / sizeof(u32);
@@ -3131,21 +3128,6 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
goto err_free_mem;
}
- if (pdata->gpio_reset >= 0) {
- error = gpio_request(pdata->gpio_reset, "atmel-mxt-ts-reset");
- if (error < 0 ) {
- dev_err(&client->dev, "Failure %d requesting reset "
- "gpio\n", error);
- goto err_free_mem;
- }
- error = gpio_direction_output(pdata->gpio_reset, 1);
- if (error < 0 ) {
- dev_err(&client->dev, "Failure %d setting reset gpio"
- "direction\n", error);
- goto err_free_gpio;
- }
- }
-
disable_irq(client->irq);
#endif
@@ -3167,9 +3149,6 @@ err_free_object:
mxt_free_object_table(data);
err_free_irq:
free_irq(client->irq, data);
-err_free_gpio:
- if (pdata->gpio_reset >= 0)
- gpio_free(pdata->gpio_reset);
err_free_mem:
kfree(data);
return error;
@@ -3181,8 +3160,6 @@ static int mxt_remove(struct i2c_client *client)
sysfs_remove_group(&client->dev.kobj, &mxt_attr_group);
free_irq(data->irq, data);
- if (data->pdata->gpio_reset >= 0)
- gpio_free(data->pdata->gpio_reset);
mxt_free_input_device(data);
mxt_free_object_table(data);
kfree(data);
diff --git a/include/linux/platform_data/atmel_mxt_ts.h b/include/linux/platform_data/atmel_mxt_ts.h
index c59fc18..695035a 100644
--- a/include/linux/platform_data/atmel_mxt_ts.h
+++ b/include/linux/platform_data/atmel_mxt_ts.h
@@ -26,7 +26,6 @@ struct mxt_platform_data {
u8 t19_num_keys;
const unsigned int *t19_keymap;
enum mxt_suspend_mode suspend_mode;
- int gpio_reset;
};
#endif /* __LINUX_PLATFORM_DATA_ATMEL_MXT_TS_H */