feat(touchscreen) add send cfgs to gt9xx support

lin

2025-04-23 399353eb5dc7e9c1db94cc97c380dc7f66c51a4c

feat(touchscreen) add send cfgs to gt9xx support

Signed-off-by: lin <lin@kickpi.com>

 longan/kernel/linux-4.9/arch/arm64/boot/dts/sunxi/lcd-mipi-10-800-1280-v1.dtsi
..
..
@@ -212,6 +212,7 @@
212
212
                 ctp_twi_id = <0x0>;
213
213
         	ctp_name = "gt9xx";
214
214
                 reg = <0x5D>;
215
+                gtp_send_cfgs = <1>;
215
216
                 ctp_screen_max_x = <1280>;
216
217
                 ctp_screen_max_y = <800>;
217
218
                 ctp_revert_x_flag = <0x1>;
..
..
@@ -222,5 +223,26 @@
222
223
                 ctp_power_ldo = <3300>;
223
224
                 ctp_power_ldo_vol = <3300>;
224
225
                 ctp_power = <3300>;
226
+                goodix,cfg-group0 = [
227
+			00 00 05 20 03 0A 3D 20 11 08
228
+			28 08 5A 3C 03 05 00 00 00 00
229
+			11 11 00 18 1A 1E 14 8F 2F AA
230
+			1E 20 26 0D 00 00 00 1A 03 10
231
+			00 00 00 00 00 00 00 00 00 00
232
+			00 27 5A 94 15 02 07 00 00 04
233
+			96 2A 00 88 32 00 7E 3B 00 76
234
+			46 00 70 53 00 70 00 00 00 00
235
+			00 00 00 00 00 00 00 00 00 00
236
+			00 00 00 00 00 00 00 00 00 00
237
+			00 00 00 00 08 00 00 00 00 00
238
+			00 00 00 01 04 05 06 07 08 09
239
+			0C 0D 0E 0F 10 11 14 15 16 17
240
+			18 19 00 00 00 00 FF FF FF FF
241
+			FF FF 00 02 04 06 07 08 0A 0C
242
+			0D 0F 10 11 12 13 14 19 1B 1C
243
+			1E 1F 20 21 22 23 24 25 26 27
244
+			28 29 FF FF FF FF FF FF FF FF
245
+			FF FF FF FF 08 01
246
+	                ];
225
247
         };
226
248
 };
 longan/kernel/linux-4.9/drivers/input/touchscreen/gt9xx/gt9xx.c
..
..
@@ -84,6 +84,7 @@
84
84
 static int revert_x_flag = 0;
85
85
 static int revert_y_flag = 0;
86
86
 static int exchange_x_y_flag = 0;
87
+static int gtp_send_cfgs = 0;
87
88
 static __u32 twi_id = 0;
88
89
 static char irq_pin_name[8];
89
90
 
..
..
@@ -171,6 +172,25 @@
171
172
 		dprintk(DEBUG_INIT,"info.exchange_x_y_flag:%d\n",info.exchange_x_y_flag);
172
173
 		dprintk(DEBUG_INIT,"info.irq_gpio_number:%d\n",info.irq_gpio.gpio);
173
174
 		dprintk(DEBUG_INIT,"info.wakeup_gpio_number:%d\n",info.wakeup_gpio.gpio);
175
+	}
176
+}
177
+
178
+int gtp_parse_dt_cfg(struct device *dev, u8 *cfg, int *cfg_len, u8 sid)
179
+{
180
+	struct device_node *np = dev->of_node;
181
+	struct property *prop;
182
+	char cfg_name[18];
183
+
184
+ //rdzkj add for compatible of different screen by sensor_id
185
+		snprintf(cfg_name, sizeof(cfg_name), "goodix,cfg-group%d", sid);
186
+		GTP_INFO("get %s",cfg_name);
187
+		prop = of_find_property(np, cfg_name, cfg_len);
188
+ //add end
189
+	 if (!prop || !prop->value || *cfg_len == 0 || *cfg_len > GTP_CONFIG_MAX_LENGTH) {
190
+		return -1;/* failed */
191
+	 } else {
192
+		memcpy(cfg, prop->value, *cfg_len);
193
+		return 0;
174
194
 	}
175
195
 }
176
196
 
..
..
@@ -345,18 +365,18 @@
345
365
 {
346
366
 	s32 ret = 0;
347
367
 
348
-#if GTP_DRIVER_SEND_CFG
368
+if( gtp_send_cfgs == 1 ) {
349
369
 	s32 retry = 0;
350
370
 
351
371
 	for (retry = 0; retry < 5; retry++)
352
372
 	{
353
-		//ret = gtp_i2c_write(client, config , GTP_CONFIG_MAX_LENGTH + GTP_ADDR_LENGTH);
354
-		// if (ret > 0)
355
-		// {
356
-		// break;
357
-		// }
373
+		ret = gtp_i2c_write(client, config , GTP_CONFIG_MAX_LENGTH + GTP_ADDR_LENGTH);
374
+		if (ret > 0)
375
+		{
376
+		break;
377
+		}
358
378
 	}
359
-#endif
379
+ }
360
380
 
361
381
 	return ret;
362
382
 }
..
..
@@ -768,8 +788,10 @@
768
788
 static s32 gtp_init_panel(struct goodix_ts_data *ts)
769
789
 {
770
790
 	s32 ret = -1;
791
+if ( gtp_send_cfgs == 1) // Device tree determines whether to send_cfgs
792
+{
793
+	GTP_DEBUG("gtp_send_cfgs==1 into send_cfgs");
771
794
 
772
-#if GTP_DRIVER_SEND_CFG
773
795
 	s32 i;
774
796
 	u8 check_sum = 0;
775
797
 	u8 rd_cfg_buf[16];
..
..
@@ -870,18 +892,35 @@
870
892
 	GTP_DEBUG("gt9xx:index = %d\n",index);
871
893
 }
872
894
 
873
-printk("config send_cfg_buf******** \n");
874
-//index = rd_cfg_buf[GTP_ADDR_LENGTH];
875
-ts->gtp_cfg_len = cfg_info_len[index];
876
-GTP_DEBUG("gandy---SENSOR ID:%d\n", rd_cfg_buf[GTP_ADDR_LENGTH]);
895
+// printk("config send_cfg_buf******** \n");
896
+// //index = rd_cfg_buf[GTP_ADDR_LENGTH];
897
+// ts->gtp_cfg_len = cfg_info_len[index];
898
+// GTP_DEBUG("gandy---SENSOR ID:%d\n", rd_cfg_buf[GTP_ADDR_LENGTH]);
899
+// memset(&config[GTP_ADDR_LENGTH], 0, GTP_CONFIG_MAX_LENGTH);
900
+// memcpy(&config[GTP_ADDR_LENGTH], send_cfg_buf[index], ts->gtp_cfg_len);
901
+
902
+GTP_DEBUG("Get config data from device tree.");
877
903
 memset(&config[GTP_ADDR_LENGTH], 0, GTP_CONFIG_MAX_LENGTH);
878
-memcpy(&config[GTP_ADDR_LENGTH], send_cfg_buf[index], ts->gtp_cfg_len);
904
+ret = gtp_parse_dt_cfg(&ts->client->dev, &config[GTP_ADDR_LENGTH], &ts->gtp_cfg_len, 0);
905
+if (ret < 0) {
906
+	GTP_ERROR("Failed to parse config data form device tree.");
907
+	return -1;
908
+}
879
909
 
880
910
 #if GTP_CUSTOM_CFG
881
-config[RESOLUTION_LOC]	   = (u8)GTP_MAX_WIDTH;
882
-config[RESOLUTION_LOC + 1] = (u8)(GTP_MAX_WIDTH>>8);
883
-config[RESOLUTION_LOC + 2] = (u8)GTP_MAX_HEIGHT;
884
-config[RESOLUTION_LOC + 3] = (u8)(GTP_MAX_HEIGHT>>8);
911
+if ( exchange_x_y_flag == 1 ) {
912
+	config[RESOLUTION_LOC]	   = (u8)screen_max_y;
913
+	config[RESOLUTION_LOC + 1] = (u8)(screen_max_y>>8);
914
+	config[RESOLUTION_LOC + 2] = (u8)screen_max_x;
915
+	config[RESOLUTION_LOC + 3] = (u8)(screen_max_x>>8);
916
+}
917
+else {
918
+	config[RESOLUTION_LOC]	   = (u8)screen_max_x;
919
+	config[RESOLUTION_LOC + 1] = (u8)(screen_max_x>>8);
920
+	config[RESOLUTION_LOC + 2] = (u8)screen_max_y;
921
+	config[RESOLUTION_LOC + 3] = (u8)(screen_max_y>>8);
922
+}
923
+
885
924
 
886
925
 if (GTP_INT_TRIGGER == 0)  //RISING
887
926
 {
..
..
@@ -900,7 +939,7 @@
900
939
 }
901
940
 config[ts->gtp_cfg_len] = (~check_sum) + 1;
902
941
 
903
-#else //else DRIVER NEED NOT SEND CONFIG
942
+}else{ //else DRIVER NEED NOT SEND CONFIG
904
943
 
905
944
 if(ts->gtp_cfg_len == 0)
906
945
 {
..
..
@@ -914,7 +953,7 @@
914
953
 	ts->abs_y_max = GTP_MAX_HEIGHT;
915
954
 	ts->int_trigger_type = GTP_INT_TRIGGER;
916
955
 }
917
-#endif //endif GTP_DRIVER_SEND_CFG
956
+}
918
957
 
919
958
 GTP_DEBUG_FUNC();
920
959
 
..
..
@@ -932,10 +971,10 @@
932
971
 ret = gtp_send_cfg(ts->client);
933
972
 if (ret < 0)
934
973
 {
935
-	printk("\ngandy-----send config error.ret=%d\n",ret);
974
+	GTP_DEBUG("\ngandy-----send config error.ret=%d\n",ret);
936
975
 	GTP_ERROR("Send config error.");
937
976
 }
938
-printk("X_MAX = %d,Y_MAX = %d,TRIGGER = 0x%02x",
977
+GTP_DEBUG("X_MAX = %d,Y_MAX = %d,TRIGGER = 0x%02x",
939
978
 		ts->abs_x_max,ts->abs_y_max,ts->int_trigger_type);
940
979
 
941
980
 msleep(10);
..
..
@@ -1588,6 +1627,7 @@
1588
1627
 	of_property_read_u32(np, "ctp_revert_x_flag", &revert_x_flag);
1589
1628
 	of_property_read_u32(np, "ctp_revert_y_flag", &revert_y_flag);
1590
1629
 	of_property_read_u32(np, "ctp_exchange_x_y_flag", &exchange_x_y_flag);
1630
+	of_property_read_u32(np, "gtp_send_cfgs", &gtp_send_cfgs);
1591
1631
 #endif
1592
1632
 	sunxi_gpio_to_name(CTP_IRQ_NUMBER,irq_pin_name);
1593
1633
 	pr_err("gt %s, line:%d irq_pin_name = %s \n",__FUNCTION__, __LINE__, irq_pin_name);
 longan/kernel/linux-4.9/drivers/input/touchscreen/gt9xx/gt9xx_ts.h
..
..
@@ -81,7 +81,7 @@
81
81
     u8  enter_update;
82
82
     u8  gtp_is_suspend;
83
83
     u8  gtp_rawdiff_mode;
84
-    u8  gtp_cfg_len;
84
+    u32  gtp_cfg_len;
85
85
 };
86
86
 
87
87
 extern u16 show_len;
..
..
@@ -89,7 +89,7 @@
89
89
 extern struct ctp_config_info config_info;
90
90
 
91
91
 //***************************PART1:ON/OFF define*******************************
92
-#define GTP_CUSTOM_CFG        0
92
+#define GTP_CUSTOM_CFG        1
93
93
 //#define GTP_DRIVER_SEND_CFG   1 
94
94
 #define GTP_DRIVER_SEND_CFG                    0
95
95
 
..
..
@@ -104,7 +104,7 @@
104
104
 #define GTP_HEADER_FW_UPDATE  1     
105
105
 #define GTP_SLIDING_WAKEUP    0     
106
106
 
107
-#define GTP_DEBUG_ON          0
107
+#define GTP_DEBUG_ON          1
108
108
 #define GTP_DEBUG_ARRAY_ON    0
109
109
 #define GTP_DEBUG_FUNC_ON     0
110
110
 
..
..
@@ -317,8 +317,8 @@
317
317
 
318
318
 //STEP_3(optional):Custom set some config by themself,if need.
319
319
 #if GTP_CUSTOM_CFG
320
-  #define GTP_MAX_HEIGHT   2048
321
-  #define GTP_MAX_WIDTH    1536
320
+  #define GTP_MAX_HEIGHT   1280
321
+  #define GTP_MAX_WIDTH    800
322
322
   #define GTP_INT_TRIGGER  0    //0:Rising 1:Falling
323
323
 #else
324
324
   #define GTP_MAX_HEIGHT   4096