summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Reichel <sebastian.reichel@collabora.co.uk>2017-07-25 14:11:34 -0700
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-11-29 13:54:04 +0100
commite9f9e559a6fd641634c488d1f811e2bc1b45587c (patch)
tree9c1e49ed808842d7373c3e93258d72edd54557f9
parent9b337988ced12104f6989583a616a881d8f3660b (diff)
Input: atmel_mxt_ts - add support for reset line
Provide support for controlling reset pin. If this is not driven correctly the device will be held in reset and will not respond. Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> (cherry picked from commit f657b00df22e231da217ca0162a75db452475e8f) Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com> (cherry picked from commit 51a32466a0ca40843039b6d1f1e719bc93db8a21)
-rw-r--r--Documentation/devicetree/bindings/input/atmel,maxtouch.txt12
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c38
-rw-r--r--include/linux/platform_data/atmel_mxt_ts.h1
3 files changed, 38 insertions, 13 deletions
diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
index 6c868fc..23e3abc 100644
--- a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
+++ b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
@@ -22,17 +22,7 @@ Optional properties for main touchpad device:
experiment to determine which bit corresponds to which input. Use
KEY_RESERVED for unused padding values.
-- atmel,suspend-mode: Select method used to suspend:
- MXT_SUSPEND_DEEP_SLEEP - use T7 to suspend the device into deep sleep
- MXT_SUSPEND_T9_CTRL - use T9.CTRL to turn off touch processing
- Definitions are in <dt-bindings/input/atmel_mxt_ts.h>.
-
-- atmel,reset-gpio: Configure RESET GPIO. Required for regulator support.
-
-- atmel,cfg_name: Provide name of configuration file in OBP_RAW format. This
- will be downloaded from the firmware loader on probe to the device.
-
-- atmel,input_name: Override name of input device from the default.
+- reset-gpios: GPIO specifier for the touchscreen's reset pin (active low)
Example:
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 515c9d5..5815a70 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -23,6 +23,7 @@
#include <linux/delay.h>
#include <linux/firmware.h>
#include <linux/i2c.h>
+#include <linux/of_gpio.h>
#include <linux/platform_data/atmel_mxt_ts.h>
#include <linux/input/mt.h>
#include <linux/interrupt.h>
@@ -1877,7 +1878,6 @@ static void mxt_set_up_as_touchpad(struct input_dev *input_dev,
static int mxt_initialize_input_device(struct mxt_data *data)
{
- const struct mxt_platform_data *pdata = data->pdata;
struct device *dev = &data->client->dev;
struct input_dev *input_dev;
int error;
@@ -2920,6 +2920,8 @@ 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-gpios", 0);
+
if (of_find_property(np, "linux,gpio-keymap", &proplen)) {
pdata->t19_num_keys = proplen / sizeof(u32);
@@ -3119,20 +3121,49 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
init_completion(&data->reset_completion);
init_completion(&data->crc_completion);
+ if (pdata->gpio_reset >= 0) {
+ error = gpio_request_one( pdata->gpio_reset, GPIOF_OUT_INIT_LOW,
+ "atmel-mxt-ts reset");
+ } else {
+ dev_err(&client->dev, "No reset gpio defined\n");
+ return -ENOENT;
+ }
+
+
+ if (error) {
+ dev_err(&client->dev, "Failed to get reset gpio: %d\n", error);
+ return error;
+ }
+
error = devm_request_threaded_irq(&client->dev, client->irq,
NULL, mxt_interrupt,
pdata->irqflags | IRQF_ONESHOT,
client->name, data);
if (error) {
dev_err(&client->dev, "Failed to register interrupt\n");
+ gpio_free(pdata->gpio_reset);
return error;
}
+ data->in_bootloader = true;
+ msleep(MXT_RESET_TIME);
+ reinit_completion(&data->bl_completion);
+ __gpio_set_value(pdata->gpio_reset, 1);
+ error = mxt_wait_for_completion(data, &data->bl_completion,
+ MXT_RESET_TIMEOUT);
+ if (error) {
+ gpio_free(pdata->gpio_reset);
+ return error;
+ }
+ data->in_bootloader = false;
+
disable_irq(client->irq);
error = mxt_initialize(data);
- if (error)
+ if (error) {
+ gpio_free(pdata->gpio_reset);
return error;
+ }
error = sysfs_create_group(&client->dev.kobj, &mxt_attr_group);
if (error) {
@@ -3144,6 +3175,7 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
return 0;
err_free_object:
+ gpio_free(pdata->gpio_reset);
mxt_free_input_device(data);
mxt_free_object_table(data);
return error;
@@ -3152,11 +3184,13 @@ err_free_object:
static int mxt_remove(struct i2c_client *client)
{
struct mxt_data *data = i2c_get_clientdata(client);
+ const struct mxt_platform_data *pdata = data->pdata;
disable_irq(data->irq);
sysfs_remove_group(&client->dev.kobj, &mxt_attr_group);
mxt_free_input_device(data);
mxt_free_object_table(data);
+ gpio_free(pdata->gpio_reset);
return 0;
}
diff --git a/include/linux/platform_data/atmel_mxt_ts.h b/include/linux/platform_data/atmel_mxt_ts.h
index 695035a..c59fc18 100644
--- a/include/linux/platform_data/atmel_mxt_ts.h
+++ b/include/linux/platform_data/atmel_mxt_ts.h
@@ -26,6 +26,7 @@ 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 */