From: Peter Meerwald <p.meerwald@xxxxxxxxxxxxxxxxxx>
on the mxt224e, the upper 4 bits of blen are gain and the threshold should probably be set in CTECONFIG
mxt_handle_pdata() is problematic as there is no way to NOT apply settings
Signed-off-by: Peter Meerwald <p.meerwald@xxxxxxxxxxxxxxxxxx>
---
drivers/input/touchscreen/atmel_mxt_ts.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 7fdd439..313b201 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -673,14 +673,6 @@ static void mxt_handle_pdata(struct mxt_data *data)
mxt_write_object(data, MXT_TOUCH_MULTI_T9, MXT_TOUCH_ORIENT,
pdata->orient);
- /* Set touchscreen burst length */
- mxt_write_object(data, MXT_TOUCH_MULTI_T9,
- MXT_TOUCH_BLEN, pdata->blen);
-
- /* Set touchscreen threshold */
- mxt_write_object(data, MXT_TOUCH_MULTI_T9,
- MXT_TOUCH_TCHTHR, pdata->threshold);
-
/* Set touchscreen resolution */
mxt_write_object(data, MXT_TOUCH_MULTI_T9,
MXT_TOUCH_XRANGE_LSB, (pdata->x_size - 1) & 0xff);
@@ -693,6 +685,14 @@ static void mxt_handle_pdata(struct mxt_data *data)
/* Set touchscreen voltage */
if (pdata->voltage && data->info.family_id == MXT224_ID) {
+ /* Set touchscreen burst length */
+ mxt_write_object(data, MXT_TOUCH_MULTI_T9,
+ MXT_TOUCH_BLEN, pdata->blen);
+
+ /* Set touchscreen threshold */
+ mxt_write_object(data, MXT_TOUCH_MULTI_T9,
+ MXT_TOUCH_TCHTHR, pdata->threshold);
+
if (pdata->voltage < MXT_VOLTAGE_DEFAULT) {
voltage = (MXT_VOLTAGE_DEFAULT - pdata->voltage) /
MXT_VOLTAGE_STEP;
--
1.7.9.5
--
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
