From eaaf989fbdca284454f2dc74f27d9dfbd2473bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=85=9C?= <417887319@qq.com> Date: Fri, 14 Feb 2025 15:46:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=EF=BC=8COpenSource=E9=97=AE=E9=A2=98=20Signed-off-by:=E9=99=88?= =?UTF-8?q?=E7=85=9C=20<417887319@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OAT.xml | 85 +++++++++++++++++++++++++++++++++++++++++++++++ README.OpenSource | 11 ++++++ 2 files changed, 96 insertions(+) create mode 100644 OAT.xml create mode 100644 README.OpenSource diff --git a/OAT.xml b/OAT.xml new file mode 100644 index 0000000..cae7ccd --- /dev/null +++ b/OAT.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/README.OpenSource b/README.OpenSource new file mode 100644 index 0000000..388f61e --- /dev/null +++ b/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "vendor_hardmony", + "License": "Apache 2.0 License", + "License File": "LICENSE", + "Version Number": "", + "Owner": "", + "Upstream URL": "", + "Description": "" + } +] \ No newline at end of file -- Gitee From 969349cba0d143a42d5c77b3d22624993733d457 Mon Sep 17 00:00:00 2001 From: zhao_hanqing Date: Wed, 19 Feb 2025 14:16:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"=E6=B7=BB=E5=8A=A0chipone-tddi-ic?= =?UTF-8?q?nl9916=20hdf=20tp=E9=A9=B1=E5=8A=A8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 82ce4012626f2d5f09f4d9c873cdc199563814a6. --- .../khdf/device_info/device_info.hcs | 6 +- oriole/hdf_config/khdf/input/input_config.hcs | 62 +------------------ oriole/patch.yml | 1 - 3 files changed, 6 insertions(+), 63 deletions(-) diff --git a/oriole/hdf_config/khdf/device_info/device_info.hcs b/oriole/hdf_config/khdf/device_info/device_info.hcs index a700719..7908cda 100644 --- a/oriole/hdf_config/khdf/device_info/device_info.hcs +++ b/oriole/hdf_config/khdf/device_info/device_info.hcs @@ -316,9 +316,9 @@ priority = 130; preload = 0; permission = 0660; - moduleName = "HDF_TOUCH_ICNL9916"; - serviceName = "hdf_touch_icnl9916_service"; - deviceMatchAttr = "chipone_tddi_icnl9916"; + moduleName = "HDF_TOUCH_NT36XXX"; + serviceName = "hdf_touch_nt36xxx_service"; + deviceMatchAttr = "novatek_nt36xxx_nvt"; } } device_hdf_hid :: device { diff --git a/oriole/hdf_config/khdf/input/input_config.hcs b/oriole/hdf_config/khdf/input/input_config.hcs index 7d12d48..4954bfe 100644 --- a/oriole/hdf_config/khdf/input/input_config.hcs +++ b/oriole/hdf_config/khdf/input/input_config.hcs @@ -8,33 +8,11 @@ root { /* 0:touch 1:key 2:keyboard 3:mouse 4:button 5:crown 6:encoder */ inputType = 0; solutionX = 1080; - solutionY = 2400; + solutionY = 2408; devName = "main_touch"; } -// CHIPONE_TDDI_ICNL9916 - busConfig { - busType = 1; // 0:i2c 1:spi - busNum = 1; // spi 1 - csNum = 0; // cs 0 - clkGpio = 0; - csGpio = 0; - misoGpio = 1; - mosiGpio = 1; - regWidth = 2; // 2 bytes - spiClkReg = [0, 0]; - spiCsReg = [0, 0]; - spiMisoReg = [0, 0]; - spiMosiReg = [0, 0]; - } - - pinConfig { - rstGpio = 78; - intGpio = 77; - rstRegCfg = [0x112f0094, 0x400]; - intRegCfg = [0x112f0098, 0x400]; - } //NVT_NT36XXX - /*busConfig { + busConfig { busType = 1; // 0:i2c 1:spi busNum = 1; // spi1 clkGpio = 0; @@ -54,7 +32,7 @@ root { intGpio = 61; rstRegCfg = [0x112f0094, 0x400]; intRegCfg = [0x112f0098, 0x400]; - }*/ + } // Hi3516DV300-Runhe gt911--5p5 & 4p0 /* busConfig { @@ -239,40 +217,6 @@ root { 1, 0, 2, 20]; } } - - chip5 :: touchChip { - match_attr = "chipone_tddi_icnl9916"; - chipName = "icnl9916"; - vendorName = "chipone"; - chipInfo = "ICNL9916"; - busType = 1; // 0:i2c 1:spi - irqFlag = 1; // Rising - wordMode = 8; - commMode = 0; // 0 SPI_CLK_PHASE - transferMode = 0; // 0 Interrupt transfer mode 1 Polling transfer mode 2 Direct Memory Access (DMA) transfer mode - maxSpeed = 9600000; - csSetupTime = 25; - csHoldTime = 25; - csRecoveryTime = 2; - - powerSequence { - /* [type, status, dir , delay] - 0:none 1:vcc-1.8v 2:vci-3.3v 3:reset 4:int - 0:off or low 1:on or high 2:no ops - 0:input 1:output 2:no ops - meanings delay xms, 20: delay 20ms - */ - powerOnSeq = [3, 1, 1, 10, - 3, 0, 1, 10, - 3, 1, 1, 40]; - suspendSeq = [3, 0, 2, 10]; - resumeSeq = [3, 1, 1, 10, - 3, 0, 1, 10, - 3, 1, 1, 40]; - powerOffSeq = [3, 0, 2, 10, - 1, 0, 2, 20]; - } - } } } } diff --git a/oriole/patch.yml b/oriole/patch.yml index 4a5d0f9..e15d8ab 100644 --- a/oriole/patch.yml +++ b/oriole/patch.yml @@ -10,7 +10,6 @@ drivers/hdf_core: - device/soc/spreadtrum/patches/drivers/hdf_core/0002-hdf_core.patch - device/soc/spreadtrum/patches/drivers/hdf_core/0003-del-DevHostServiceFreeInstance.patch - device/soc/spreadtrum/patches/drivers/hdf_core/0004-add-sensor-sc7a20e.patch - - device/soc/spreadtrum/patches/drivers/hdf_core/0005-add-tp-chipone-icnl9916.patch drivers/peripheral: - device/soc/spreadtrum/patches/drivers/peripheral/0001-update-location-vintf.patch -- Gitee