From 9e3c0d712c5f84bb96669649c18fa8e7aa6eec50 Mon Sep 17 00:00:00 2001 From: Jaehyoung Choi Date: Wed, 20 Sep 2017 21:44:07 +0900 Subject: [PATCH] [COMMON] touchscreen: synaptics: Remove stop touch screen code in probe Change-Id: I1d830cac9012dfd710f97121fcb10b6c13a4807c Signed-off-by: Jaehyoung Choi --- drivers/input/touchscreen/Kconfig | 1 + drivers/input/touchscreen/Makefile | 1 + .../touchscreen/synaptics_dsx/synaptics_i2c_rmi.c | 12 +++++++----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 64b30fe273fd..a382f8ac3d71 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -1246,4 +1246,5 @@ config TOUCHSCREEN_ROHM_BU21023 To compile this driver as a module, choose M here: the module will be called bu21023_ts. +source "drivers/input/touchscreen/synaptics_dsx/Kconfig" endif diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 850c1562555a..8f7038705ae0 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -104,3 +104,4 @@ obj-$(CONFIG_TOUCHSCREEN_ZET6223) += zet6223.o obj-$(CONFIG_TOUCHSCREEN_ZFORCE) += zforce_ts.o obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50) += colibri-vf50-ts.o obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023) += rohm_bu21023.o +obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_DSX) += synaptics_dsx/ diff --git a/drivers/input/touchscreen/synaptics_dsx/synaptics_i2c_rmi.c b/drivers/input/touchscreen/synaptics_dsx/synaptics_i2c_rmi.c index 4f2117401529..13a8914dab01 100644 --- a/drivers/input/touchscreen/synaptics_dsx/synaptics_i2c_rmi.c +++ b/drivers/input/touchscreen/synaptics_dsx/synaptics_i2c_rmi.c @@ -484,7 +484,6 @@ static void late_enable_irq(struct work_struct *work) return; if (data->touch_stopped) { - dev_err(&data->i2c_client->dev, "Enable IRQ when S/W touch stopped\n"); retval = synaptics_rmi4_start_device(data); if (retval < 0) { tsp_debug_err(true, &data->i2c_client->dev, @@ -3900,8 +3899,8 @@ static int synaptics_power_ctrl(void *data, bool on) return retval; } - if (IS_ERR(pinctrl_irq)) - tsp_debug_err(true, dev, "%s: Failed to configure tsp_attn pin\n", __func__); + /*if (IS_ERR(pinctrl_irq)) + tsp_debug_err(true, dev, "%s: Failed to configure tsp_attn pin\n", __func__);*/ pinctrl_irq = devm_pinctrl_get_select(dev, "on_state"); if (IS_ERR(pinctrl_irq)) @@ -4177,7 +4176,7 @@ err_tsp_reboot: } pr_info("%s schdule delayed work for irq at probe\n",__func__); - schedule_delayed_work(&rmi4_data->work_init_irq, 4500); + schedule_delayed_work(&rmi4_data->work_init_irq, 1500); #if 0 /* Enable attn pin */ retval = synaptics_rmi4_irq_enable(rmi4_data, true); @@ -4228,7 +4227,7 @@ err_tsp_reboot: rmi4_data->tsp_probe = true; /* it will be started by input reader */ - synaptics_rmi4_stop_device(rmi4_data); + //synaptics_rmi4_stop_device(rmi4_data); complete_all(&rmi4_data->init_done); @@ -4245,6 +4244,9 @@ err_sysfs: } synaptics_rmi4_irq_enable(rmi4_data, false); +/*err_enable_irq: + synaptics_rmi4_remove_exp_fn(rmi4_data); +*/ err_init_exp_fn: input_unregister_device(rmi4_data->input_dev); input_free_device(rmi4_data->input_dev); -- 2.20.1