From c5392e44c6b1e2923784a73d825ff9e2c603874f Mon Sep 17 00:00:00 2001
From: jzlv <jzlv@bouffalolab.com>
Date: Mon, 12 Jul 2021 17:00:31 +0800
Subject: [PATCH] [feat][keyscan] add keyscan gpio func definition and clock
 config

---
 drivers/bl702_driver/hal_drv/src/hal_clock.c  | 12 ++++++------
 drivers/bl702_driver/std_drv/inc/bl702_gpio.h |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/bl702_driver/hal_drv/src/hal_clock.c b/drivers/bl702_driver/hal_drv/src/hal_clock.c
index 18fc8435..c3f3eaeb 100644
--- a/drivers/bl702_driver/hal_drv/src/hal_clock.c
+++ b/drivers/bl702_driver/hal_drv/src/hal_clock.c
@@ -182,13 +182,13 @@ void peripheral_clock_init(void)
 #endif
 #endif
 
-#if defined(BSP_USING_QDEC)
-#if BSP_QDEC_CLOCK_SOURCE == ROOT_CLOCK_SOURCE_32K_CLK
-    GLB_Set_QDEC_CLK(ENABLE, GLB_QDEC_CLK_F32K, BSP_QDEC_CLOCK_DIV);
-#elif BSP_QDEC_CLOCK_SOURCE == ROOT_CLOCK_SOURCE_XCLK
-    GLB_Set_QDEC_CLK(ENABLE, GLB_QDEC_CLK_XCLK, BSP_QDEC_CLOCK_DIV);
+#if defined(BSP_USING_QDEC) || defined(BSP_USING_KEYSCAN)
+#if BSP_QDEC_KEYSCAN_CLOCK_SOURCE == ROOT_CLOCK_SOURCE_32K_CLK
+    GLB_Set_QDEC_CLK(GLB_QDEC_CLK_F32K, BSP_QDEC_KEYSCAN_CLOCK_DIV);
+#elif BSP_QDEC_KEYSCAN_CLOCK_SOURCE == ROOT_CLOCK_SOURCE_XCLK
+    GLB_Set_QDEC_CLK(GLB_QDEC_CLK_XCLK, BSP_QDEC_KEYSCAN_CLOCK_DIV);
 #else
-#error "please select correct qdec clock source"
+#error "please select correct qdec or keyscan clock source"
 #endif
 #endif
 
diff --git a/drivers/bl702_driver/std_drv/inc/bl702_gpio.h b/drivers/bl702_driver/std_drv/inc/bl702_gpio.h
index b0e6a2b4..8fc700ae 100644
--- a/drivers/bl702_driver/std_drv/inc/bl702_gpio.h
+++ b/drivers/bl702_driver/std_drv/inc/bl702_gpio.h
@@ -134,6 +134,8 @@ typedef enum {
     GPIO_FUN_CAM = 9,
     GPIO_FUN_ANALOG = 10,
     GPIO_FUN_USB = 10,
+    GPIO_FUN_DAC = 10,
+    GPIO_FUN_ADC = 10,
     GPIO_FUN_GPIO = 11,
     GPIO_FUN_RF_TEST = 12,
     GPIO_FUN_SCAN = 13,
@@ -146,7 +148,9 @@ typedef enum {
     GPIO_FUN_EMAC = 19,
     GPIO_FUN_QDEC = 20,
     GPIO_FUN_KEY_SCAN_IN = 21,
+    GPIO_FUN_KEY_SCAN_ROW = 21,
     GPIO_FUN_KEY_SCAN_DRIVE = 22,
+    GPIO_FUN_KEY_SCAN_COL = 22,
     GPIO_FUN_CAM_MISC = 23,
     GPIO_FUN_GPIO_INPUT_UP = 0x0B,
     GPIO_FUN_GPIO_INPUT_DOWN = 0x1B,
@@ -166,8 +170,6 @@ typedef enum {
     GPIO_FUN_UART1_CTS = 0x75,
     GPIO_FUN_UART1_TX = 0x76,
     GPIO_FUN_UART1_RX = 0x77,
-    GPIO_FUN_DAC = 0xa0,
-    GPIO_FUN_ADC = 0xa1,
     GPIO_FUN_UNUSED = 255
 } GLB_GPIO_FUNC_Type;