From 4a60142272eb6e89d374c4610ebf7d34a238ae5f Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Sat, 7 May 2022 14:52:27 +0000 Subject: [PATCH 1/5] Signed-off-by: liu_wei01 --- model/input/driver/touchscreen/touch_gt911.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/input/driver/touchscreen/touch_gt911.c b/model/input/driver/touchscreen/touch_gt911.c index b9b443ea..55e054af 100644 --- a/model/input/driver/touchscreen/touch_gt911.c +++ b/model/input/driver/touchscreen/touch_gt911.c @@ -53,8 +53,8 @@ static int32_t ChipDetect(ChipDevice *device) xSolution = (buf[GT_SOLU_X_HIGH] << ONE_BYTE_OFFSET) | buf[GT_SOLU_X_LOW]; ySolution = (buf[GT_SOLU_Y_HIGH] << ONE_BYTE_OFFSET) | buf[GT_SOLU_Y_LOW]; #if defined(CONFIG_ARCH_ROCKCHIP) - if (version != 0x100 || buf[GT_PROD_ID_1ST] != '5' || buf[GT_PROD_ID_2ND] != '6') { - HDF_LOGE("%s: version or ID wrong", __func__); + if (version != 0x100 || buf[GT_PROD_ID_1ST] != '5' || buf[GT_PROD_ID_2ND] != '6' || buf[GT_PROD_ID_3RD] != '8' || buf[GT_PROD_ID_4TH] != '8') { + HDF_LOGE("%s: ID wrong,IC FW version is 0x%x", __func__,version); return HDF_FAILURE; } #endif From 7d44f875af96a3eddca9953b293976d831213fb7 Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Sat, 7 May 2022 14:53:10 +0000 Subject: [PATCH 2/5] Signed-off-by: liu_wei01 --- model/input/driver/hdf_touch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/input/driver/hdf_touch.c b/model/input/driver/hdf_touch.c index 83dea9c4..08c07116 100644 --- a/model/input/driver/hdf_touch.c +++ b/model/input/driver/hdf_touch.c @@ -557,7 +557,7 @@ static int32_t ChipDriverInit(ChipDevice *chipDev) ret = SetPowerOnTiming(chipDev, false); CHECK_RETURN_VALUE(ret); #endif - + OsalMSleep(100); ret = ChipCheckResetRetry(chipDev); CHECK_RETURN_VALUE(ret); From c2c290e31633e3c569bb88273d0ef1a53e7291b6 Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Sat, 7 May 2022 14:54:26 +0000 Subject: [PATCH 3/5] Signed-off-by: liu_wei01 --- model/input/driver/touchscreen/touch_gt911.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/input/driver/touchscreen/touch_gt911.c b/model/input/driver/touchscreen/touch_gt911.c index 55e054af..1ece8679 100644 --- a/model/input/driver/touchscreen/touch_gt911.c +++ b/model/input/driver/touchscreen/touch_gt911.c @@ -53,7 +53,7 @@ static int32_t ChipDetect(ChipDevice *device) xSolution = (buf[GT_SOLU_X_HIGH] << ONE_BYTE_OFFSET) | buf[GT_SOLU_X_LOW]; ySolution = (buf[GT_SOLU_Y_HIGH] << ONE_BYTE_OFFSET) | buf[GT_SOLU_Y_LOW]; #if defined(CONFIG_ARCH_ROCKCHIP) - if (version != 0x100 || buf[GT_PROD_ID_1ST] != '5' || buf[GT_PROD_ID_2ND] != '6' || buf[GT_PROD_ID_3RD] != '8' || buf[GT_PROD_ID_4TH] != '8') { + if (buf[GT_PROD_ID_1ST] != '5' || buf[GT_PROD_ID_2ND] != '6' || buf[GT_PROD_ID_3RD] != '8' || buf[GT_PROD_ID_4TH] != '8') { HDF_LOGE("%s: ID wrong,IC FW version is 0x%x", __func__,version); return HDF_FAILURE; } From 4651958fdf6cecd350a21a32c81135b8ac7b7547 Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Mon, 9 May 2022 01:24:59 +0000 Subject: [PATCH 4/5] Signed-off-by: liu_wei01 --- model/input/driver/hdf_touch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/input/driver/hdf_touch.c b/model/input/driver/hdf_touch.c index 08c07116..b6012e2a 100644 --- a/model/input/driver/hdf_touch.c +++ b/model/input/driver/hdf_touch.c @@ -557,7 +557,7 @@ static int32_t ChipDriverInit(ChipDevice *chipDev) ret = SetPowerOnTiming(chipDev, false); CHECK_RETURN_VALUE(ret); #endif - OsalMSleep(100); + OsalMSleep(100); // 100 : delay time ret = ChipCheckResetRetry(chipDev); CHECK_RETURN_VALUE(ret); From 98b9cd78e4bf7e640121387bcd19e5c8bf1b29ef Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Mon, 9 May 2022 01:27:29 +0000 Subject: [PATCH 5/5] Signed-off-by: liu_wei01 --- model/input/driver/touchscreen/touch_gt911.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/model/input/driver/touchscreen/touch_gt911.c b/model/input/driver/touchscreen/touch_gt911.c index 1ece8679..e815bff5 100644 --- a/model/input/driver/touchscreen/touch_gt911.c +++ b/model/input/driver/touchscreen/touch_gt911.c @@ -53,8 +53,9 @@ static int32_t ChipDetect(ChipDevice *device) xSolution = (buf[GT_SOLU_X_HIGH] << ONE_BYTE_OFFSET) | buf[GT_SOLU_X_LOW]; ySolution = (buf[GT_SOLU_Y_HIGH] << ONE_BYTE_OFFSET) | buf[GT_SOLU_Y_LOW]; #if defined(CONFIG_ARCH_ROCKCHIP) - if (buf[GT_PROD_ID_1ST] != '5' || buf[GT_PROD_ID_2ND] != '6' || buf[GT_PROD_ID_3RD] != '8' || buf[GT_PROD_ID_4TH] != '8') { - HDF_LOGE("%s: ID wrong,IC FW version is 0x%x", __func__,version); + if (buf[GT_PROD_ID_1ST] != '5' || buf[GT_PROD_ID_2ND] != '6' || \ + buf[GT_PROD_ID_3RD] != '8' || buf[GT_PROD_ID_4TH] != '8') { + HDF_LOGE("%s: ID wrong,IC FW version is 0x%x", __func__, version); return HDF_FAILURE; } #endif