Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master

2022-11-21 11:30:48 +08:00
parent 68cdcbdcce 164614a75a
commit e31199a104
157 changed files with 18447 additions and 348 deletions
@@ -80,8 +80,7 @@ static struct io_config
    IOCONFIG(BSP_I2C_SCL, FUNC_GPIO4),
 #endif
 #ifdef BSP_USING_TOUCH
-    // IOCONFIG(BSP_TOUCH_TP_INT, HS_GPIO(FPIOA_TOUCH_TP_INT)),
-    IOCONFIG(BSP_TOUCH_TP_INT, HS_GPIO(FUNC_GPIOHS30)),
+    IOCONFIG(BSP_TOUCH_TP_INT, HS_GPIO(FPIOA_TOUCH_TP_INT)),
 #endif

 #ifdef BSP_USING_SOFT_SPI