Merge branch 'main' of 192.168.1.238:vision/sl100_sdk into main
|
|
@ -1421,7 +1421,7 @@
|
||||||
ctp_twi_addr = <0x1a>;
|
ctp_twi_addr = <0x1a>;
|
||||||
ctp_screen_max_x = <0x2d0>;
|
ctp_screen_max_x = <0x2d0>;
|
||||||
ctp_screen_max_y = <0x500>;
|
ctp_screen_max_y = <0x500>;
|
||||||
ctp_revert_x_flag = <0x0>;
|
ctp_revert_x_flag = <0x0>; // ref to hynitron_core.h
|
||||||
ctp_revert_y_flag = <0x1>;
|
ctp_revert_y_flag = <0x1>;
|
||||||
ctp_exchange_x_y_flag = <0x1>;
|
ctp_exchange_x_y_flag = <0x1>;
|
||||||
ctp_int_port = <&pio PE 8 6 1 3 0xffffffff>;
|
ctp_int_port = <&pio PE 8 6 1 3 0xffffffff>;
|
||||||
|
|
@ -1432,7 +1432,7 @@
|
||||||
//<&pio PE 8 0 0 1 0>;
|
//<&pio PE 8 0 0 1 0>;
|
||||||
hynitron,reset-gpio = <&pio PE 9 1 1 3 0xffffffff>;
|
hynitron,reset-gpio = <&pio PE 9 1 1 3 0xffffffff>;
|
||||||
//<&pio PE 9 1 0 1 0>;
|
//<&pio PE 9 1 0 1 0>;
|
||||||
hynitron,max-touch-number = <5>;
|
hynitron,max-touch-number = <1>;
|
||||||
hynitron,display-coords = <720 1280>;
|
hynitron,display-coords = <720 1280>;
|
||||||
|
|
||||||
hynitron,have-key;
|
hynitron,have-key;
|
||||||
|
|
|
||||||
|
|
@ -2035,6 +2035,7 @@ CONFIG_LOGO_BACK=y
|
||||||
# CONFIG_LCD_SUPPORT_ICN6202 is not set
|
# CONFIG_LCD_SUPPORT_ICN6202 is not set
|
||||||
CONFIG_LCD_SUPPORT_ICN6202_2LANE=y
|
CONFIG_LCD_SUPPORT_ICN6202_2LANE=y
|
||||||
# CONFIG_LCD_SUPPORT_NT35510_MIPI is not set
|
# CONFIG_LCD_SUPPORT_NT35510_MIPI is not set
|
||||||
|
# CONFIG_LCD_REVERT_180_DEGREE is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Display engine feature select
|
# Display engine feature select
|
||||||
|
|
|
||||||
|
|
@ -1349,6 +1349,7 @@ CONFIG_SUNXI_DISP2_FB_DISABLE_ROTATE=y
|
||||||
# CONFIG_LCD_SUPPORT_ICN6202 is not set
|
# CONFIG_LCD_SUPPORT_ICN6202 is not set
|
||||||
CONFIG_LCD_SUPPORT_ICN6202_2LANE=y
|
CONFIG_LCD_SUPPORT_ICN6202_2LANE=y
|
||||||
# CONFIG_LCD_SUPPORT_NT35510_MIPI is not set
|
# CONFIG_LCD_SUPPORT_NT35510_MIPI is not set
|
||||||
|
# CONFIG_LCD_REVERT_180_DEGREE is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Display engine feature select
|
# Display engine feature select
|
||||||
|
|
|
||||||
|
|
@ -1436,7 +1436,7 @@
|
||||||
ctp_twi_addr = <0x5a>;
|
ctp_twi_addr = <0x5a>;
|
||||||
ctp_screen_max_x = <0x2d0>;
|
ctp_screen_max_x = <0x2d0>;
|
||||||
ctp_screen_max_y = <0x500>;
|
ctp_screen_max_y = <0x500>;
|
||||||
ctp_revert_x_flag = <0x0>;
|
ctp_revert_x_flag = <0x0>; // ref to hynitron_core.h
|
||||||
ctp_revert_y_flag = <0x1>;
|
ctp_revert_y_flag = <0x1>;
|
||||||
ctp_exchange_x_y_flag = <0x1>;
|
ctp_exchange_x_y_flag = <0x1>;
|
||||||
ctp_int_port = <&pio PH 13 7 1 3 0xffffffff>;
|
ctp_int_port = <&pio PH 13 7 1 3 0xffffffff>;
|
||||||
|
|
@ -1447,7 +1447,7 @@
|
||||||
//<&pio PH 13 0 0 1 0>;
|
//<&pio PH 13 0 0 1 0>;
|
||||||
hynitron,reset-gpio = <&pio PH 14 1 1 3 0xffffffff>;
|
hynitron,reset-gpio = <&pio PH 14 1 1 3 0xffffffff>;
|
||||||
//<&pio PH 14 1 0 1 0>;
|
//<&pio PH 14 1 0 1 0>;
|
||||||
hynitron,max-touch-number = <5>;
|
hynitron,max-touch-number = <1>;
|
||||||
hynitron,display-coords = <720 1280>;
|
hynitron,display-coords = <720 1280>;
|
||||||
|
|
||||||
hynitron,have-key;
|
hynitron,have-key;
|
||||||
|
|
|
||||||
|
|
@ -2153,6 +2153,7 @@ CONFIG_LCD_SUPPORT_T050K589=y
|
||||||
CONFIG_LCD_SUPPORT_ICN6202=y
|
CONFIG_LCD_SUPPORT_ICN6202=y
|
||||||
CONFIG_LCD_SUPPORT_ICN6202_2LANE=y
|
CONFIG_LCD_SUPPORT_ICN6202_2LANE=y
|
||||||
# CONFIG_LCD_SUPPORT_NT35510_MIPI is not set
|
# CONFIG_LCD_SUPPORT_NT35510_MIPI is not set
|
||||||
|
# CONFIG_LCD_REVERT_180_DEGREE is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Display engine feature select
|
# Display engine feature select
|
||||||
|
|
|
||||||
|
|
@ -1576,6 +1576,7 @@ CONFIG_LCD_SUPPORT_T050K589=y
|
||||||
CONFIG_LCD_SUPPORT_ICN6202=y
|
CONFIG_LCD_SUPPORT_ICN6202=y
|
||||||
CONFIG_LCD_SUPPORT_ICN6202_2LANE=y
|
CONFIG_LCD_SUPPORT_ICN6202_2LANE=y
|
||||||
# CONFIG_LCD_SUPPORT_NT35510_MIPI is not set
|
# CONFIG_LCD_SUPPORT_NT35510_MIPI is not set
|
||||||
|
# CONFIG_LCD_REVERT_180_DEGREE is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Display engine feature select
|
# Display engine feature select
|
||||||
|
|
|
||||||
|
|
@ -775,7 +775,7 @@ static void cst3xx_touch_report(struct work_struct *work)
|
||||||
buf[1] = 0x00;
|
buf[1] = 0x00;
|
||||||
ret = cst3xx_i2c_read_register(hyn_ts_data->client, buf, 7);
|
ret = cst3xx_i2c_read_register(hyn_ts_data->client, buf, 7);
|
||||||
if(ret < 0) {
|
if(ret < 0) {
|
||||||
HYN_ERROR(" iic read touch point data failed.\n");
|
pr_emerg(" iic read touch point data failed.\n");
|
||||||
goto OUT_PROCESS;
|
goto OUT_PROCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -82,12 +82,17 @@
|
||||||
|
|
||||||
#define HYN_X_DISPLAY_DEFAULT 600
|
#define HYN_X_DISPLAY_DEFAULT 600
|
||||||
#define HYN_Y_DISPLAY_DEFAULT 1024
|
#define HYN_Y_DISPLAY_DEFAULT 1024
|
||||||
|
#if defined(CONFIG_LCD_REVERT_180_DEGREE)
|
||||||
|
#define HYN_X_REVERT 1 // 180 degree
|
||||||
|
#define HYN_Y_REVERT 1 // 180 degree
|
||||||
|
#else
|
||||||
#define HYN_X_REVERT 0
|
#define HYN_X_REVERT 0
|
||||||
#define HYN_Y_REVERT 0
|
#define HYN_Y_REVERT 0
|
||||||
|
#endif
|
||||||
#define HYN_XY_EXCHANGE 0
|
#define HYN_XY_EXCHANGE 0
|
||||||
|
|
||||||
#define HYN_MAX_KEYS 3
|
#define HYN_MAX_KEYS 3
|
||||||
#define HYN_MAX_POINTS 5
|
#define HYN_MAX_POINTS 1
|
||||||
#define HYN_MAX_SELFCAP_ID 2
|
#define HYN_MAX_SELFCAP_ID 2
|
||||||
|
|
||||||
/**********************************************************/
|
/**********************************************************/
|
||||||
|
|
|
||||||
|
|
@ -239,3 +239,9 @@ config LCD_SUPPORT_NT35510_MIPI
|
||||||
help
|
help
|
||||||
If you want to support nt35510_mipi panel for display driver, select it.
|
If you want to support nt35510_mipi panel for display driver, select it.
|
||||||
|
|
||||||
|
config LCD_REVERT_180_DEGREE
|
||||||
|
bool "LCD revert 180 degree with TP"
|
||||||
|
default n
|
||||||
|
---help---
|
||||||
|
If you want to revert lcd 180 degree with TP, select it.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -235,7 +235,11 @@ static struct LCM_setting_table jd9365_initialization_setting[] = {
|
||||||
{0xC1,17,{0x53,0x80,0x32,0x32,0x77,0xE4,0xF7,0xF7,0xCC,0xCC,0x7F,0x7F,0x11,0x11,0x00,0x00,0x32}},//18
|
{0xC1,17,{0x53,0x80,0x32,0x32,0x77,0xE4,0xF7,0xF7,0xCC,0xCC,0x7F,0x7F,0x11,0x11,0x00,0x00,0x32}},//18
|
||||||
{0xC7,12,{0x10,0x00,0x0A,0x00,0x00,0x00,0x00,0x00,0xED,0xC7,0x00,0xA5}},//13
|
{0xC7,12,{0x10,0x00,0x0A,0x00,0x00,0x00,0x00,0x00,0xED,0xC7,0x00,0xA5}},//13
|
||||||
{0xC8,4,{0x10,0x40,0x1E,0x03}},//5
|
{0xC8,4,{0x10,0x40,0x1E,0x03}},//5
|
||||||
|
#if defined(CONFIG_LCD_REVERT_180_DEGREE)
|
||||||
|
{0xCC,1,{0x07}},//2
|
||||||
|
#else
|
||||||
{0xCC,1,{0x0b}},//2
|
{0xCC,1,{0x0b}},//2
|
||||||
|
#endif
|
||||||
{0xE0,34,{0x00,0x01,0x02,0x3D,0x3F,0x3F,0x2D,0x2F,0x04,0x09,0x0C,0x10,0x11,0x0F,0x12,0x0F,0x15,0x00,0x01,0x02,0x3D,0x3F,0x3F,0x2D,0x2F,0x04,0x09,0x0C,0x10,0x11,0x0F,0x12,0x0F,0x15}},//35
|
{0xE0,34,{0x00,0x01,0x02,0x3D,0x3F,0x3F,0x2D,0x2F,0x04,0x09,0x0C,0x10,0x11,0x0F,0x12,0x0F,0x15,0x00,0x01,0x02,0x3D,0x3F,0x3F,0x2D,0x2F,0x04,0x09,0x0C,0x10,0x11,0x0F,0x12,0x0F,0x15}},//35
|
||||||
{0xE1,7,{0x11,0x11,0x91,0x00,0x00,0x00,0x00}},//8
|
{0xE1,7,{0x11,0x11,0x91,0x00,0x00,0x00,0x00}},//8
|
||||||
{0xE3,14,{0x07,0x07,0x0B,0x0B,0x0B,0x0B,0x00,0x00,0x00,0x00,0xFF,0x04,0xC0,0x10}},//15
|
{0xE3,14,{0x07,0x07,0x0B,0x0B,0x0B,0x0B,0x00,0x00,0x00,0x00,0xFF,0x04,0xC0,0x10}},//15
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 481 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 136 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 393 B |
|
After Width: | Height: | Size: 455 B |
|
Before Width: | Height: | Size: 589 B After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 914 B |
|
Before Width: | Height: | Size: 1006 B |
|
Before Width: | Height: | Size: 799 B |
|
Before Width: | Height: | Size: 58 KiB |
|
Before Width: | Height: | Size: 949 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 674 B |
|
Before Width: | Height: | Size: 857 B |
|
Before Width: | Height: | Size: 725 B |
|
Before Width: | Height: | Size: 824 B |
|
After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 41 KiB |
|
Before Width: | Height: | Size: 987 B |
|
Before Width: | Height: | Size: 825 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 2.2 KiB |
|
After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 779 B |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 365 B |
|
Before Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 477 B |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 946 B |
|
Before Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 396 B |
|
After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 316 B After Width: | Height: | Size: 226 B |
|
Before Width: | Height: | Size: 837 B |
|
Before Width: | Height: | Size: 692 B After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 4.8 KiB |
|
After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 993 B After Width: | Height: | Size: 353 B |
|
Before Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 28 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 868 B |
|
After Width: | Height: | Size: 994 B |