input: goodix: Remove leftover pen feature

This driver doesn't support pen so remove expensive logic in interrupt
handler.

Signed-off-by: Andrzej Perczak <linux@andrzejperczak.com>
Signed-off-by: onettboots <blackcocopet@gmail.com>

Author: xNombre

drivers/input/touchscreen/goodix_driver_gt9886/goodix_ts_core.h

@@ -872,7 +872,6 @@ extern struct goodix_ts_core *goodix_core_data;
 #define GOODIX_DRIVER_VERSION		"v1.2.0.1"
 #define GOODIX_BUS_RETRY_TIMES		3
 #define GOODIX_MAX_TOUCH			10
-#define GOODIX_MAX_PEN				1
 #define GOODIX_MAX_KEY				3
 #define GOODIX_PEN_MAX_KEY			2
 #define GOODIX_CFG_MAX_SIZE			1024
@@ -970,7 +969,6 @@ struct goodix_ts_board_data {
 	/*add by lishuai*/
 	unsigned int x2x;
 	unsigned int y2y;
-	bool pen_enable;
 	unsigned int tp_key_num;
 	/*add end*/
 
@@ -1066,9 +1064,6 @@ struct goodix_touch_data {
 	/* key */
 	u8 key_value;
 	bool have_key;
-	/*pen*/
-	struct goodix_ts_coords pen_coords[GOODIX_MAX_PEN];
-	bool pen_down;
 };
 
 /* request event data */

drivers/input/touchscreen/goodix_driver_gt9886/goodix_ts_i2c.c

@@ -263,24 +263,6 @@ static int goodix_parse_dt(struct device_node *node,
 			return r;
 	}
 
-	/*get pen-enable switch and pen keys, must after "key map"*/
-	board_data->pen_enable = of_property_read_bool(node, "goodix,pen-enable");
-	if (board_data->pen_enable) {
-		prop = of_find_property(node, "goodix,key-of-pen", NULL);
-		if (prop && prop->length) {
-			if (prop->length / sizeof(u32) > GOODIX_PEN_MAX_KEY) {
-				ts_err("Size of key-of-pen is invalid");
-				return r;
-			}
-			r = of_property_read_u32_array(node,
-				"goodix,key-of-pen",
-				&board_data->panel_key_map[board_data->panel_max_key],
-				prop->length / sizeof(u32));
-			if (r)
-				return r;
-			board_data->panel_max_key += (prop->length / sizeof(u32));
-		}
-	}
 	ts_info("***key:%d, %d, %d, %d, %d",
 			board_data->panel_key_map[0],
 			board_data->panel_key_map[1],
@@ -1794,9 +1776,6 @@ static int goodix_touch_handler(struct goodix_ts_device *dev,
 	touch_data->have_key = (coord_sta >> 4) & 0x01;
 	if (unlikely(touch_data->have_key)) {
 		touch_data->key_value = buffer[touch_num * BYTES_PER_COORD + 2];
-		if (dev->board_data->pen_enable)
-			touch_data->key_value = (touch_data->key_value & 0x0f) |
-				((touch_data->key_value & 0xf0) >> (4 - dev->board_data->tp_key_num));
 	}
 	/*ts_info("$$$$$$coord_sta:0x%02x, have_key:%d, key_value:0x%02x",
 			coord_sta, touch_data->have_key, touch_data->key_value);*/
@@ -1820,12 +1799,11 @@ static int goodix_touch_handler(struct goodix_ts_device *dev,
 
 	/*clear buffer*/
 	memset(touch_data->coords, 0x00, sizeof(touch_data->coords));
-	memset(touch_data->pen_coords, 0x00, sizeof(touch_data->pen_coords));
 
 	if (likely(touch_num >= 1)) {
 		/*"0 ~ touch_num - 2" is finger, "touch_num - 1" may be a finger or a pen*/
 		/*process "0 ~ touch_num -2"*/
-		for (i = 0; i < touch_num - 1; i++) {
+		for (i = 0; i < touch_num; i++) {
 			coords->id = buffer[i * BYTES_PER_COORD + 2] & 0x0f;
 			coords->x = buffer[i * BYTES_PER_COORD + 3] |
 							(buffer[i * BYTES_PER_COORD + 4] << 8);
@@ -1838,48 +1816,10 @@ static int goodix_touch_handler(struct goodix_ts_device *dev,
 			coords->area = buffer[i * BYTES_PER_COORD + 9];
 			coords++;
 		}
-
-		/*process "touch_num - 1", it may be a finger or a pen*/
-		/*it's a pen*/
-		i = touch_num - 1;
-		//ts_err("%s:i=%d touch_num=%d\n",__func__,i,touch_num);
-		if (unlikely(touch_num >= 1 && buffer[i * BYTES_PER_COORD + 2] >= 0x80)) {
-			if (dev->board_data->pen_enable) {/*pen_enable*/
-				touch_data->pen_down = true;
-				/*change pen's trace ID, let it equal to "panel_max_id - 1"*/
-				/*touch_data->pen_coords[0].id = dev->board_data->panel_max_id - 1;*/
-				touch_data->pen_coords[0].id = dev->board_data->panel_max_id * 2;
-				touch_data->pen_coords[0].x = buffer[i * BYTES_PER_COORD + 3] |
-					(buffer[i * BYTES_PER_COORD + 4] << 8);
-				touch_data->pen_coords[0].y = buffer[i * BYTES_PER_COORD + 5] |
-					(buffer[i * BYTES_PER_COORD + 6] << 8);
-				touch_data->pen_coords[0].w = 6;
-				touch_data->pen_coords[0].p =
-					buffer[i * BYTES_PER_COORD + 7] |
-					(buffer[i * BYTES_PER_COORD + 8] << 8);
-				}
-			} else {/*it's a finger*/
-					coords->id = buffer[i * BYTES_PER_COORD + 2] & 0x0f;
-					coords->x = buffer[i * BYTES_PER_COORD + 3] |
-									(buffer[i * BYTES_PER_COORD + 4] << 8);
-					coords->y = buffer[i * BYTES_PER_COORD + 5] |
-									(buffer[i * BYTES_PER_COORD + 6] << 8);
-					coords->w = coords->p / 16;
-					coords->p = buffer[i * BYTES_PER_COORD + 7] |
-							(buffer[i * BYTES_PER_COORD + 8] << 8);
-					coords->overlapping_area = buffer[8];
-					coords->area = buffer[i * BYTES_PER_COORD + 9];
-					/*ts_debug("EF:[%d](%d, %d)", coords->id, coords->x, coords->y);*/
-					if (touch_data->pen_down == true) {
-						touch_data->pen_down = false;
-						/*ts_info("***pen leave");*/
-				}
-			}
 	}
 
 	/*swap coord*/
 	goodix_swap_coords(dev, &touch_data->coords[0], touch_num);
-	goodix_swap_coords(dev, &touch_data->pen_coords[0], 1);
 
 	touch_data->touch_num = touch_num;
 	/* mark this event as touch event */