Accumulated patchsets for bsp/cvitek (#8968)

* bsp: cvitek: kconfig: add wdt for cv18xx_riscv Add Watchdog timer in Kconfig. Signed-off-by: Chen Wang <unicorn_wang@outlook.com> * drv: cvitek: remove using macro from source file Building of source file should be controlled by SConscript, but not in source file itself. Signed-off-by: Chen Wang <unicorn_wang@outlook.com> * bsp: cvitek: kconfig: add i2c for cv18xx_riscv Add I2C in Kconfig for c906B. Note, the IRQ# is different from that of c906L. Signed-off-by: Chen Wang <unicorn_wang@outlook.com> * bsp: cvitek: kconfig: add rtc for cv18xx_riscv Add RTC in Kconfig for c906B. Signed-off-by: Chen Wang <unicorn_wang@outlook.com> * bsp: cvitek: fix channel issue for pwm driver The original code confuses the concepts of controllers and channels. Fixed it and do some code cleanup. Signed-off-by: Chen Wang <unicorn_wang@outlook.com> * bsp:cvitek: add i2c pinmux config for cv18xx_riscv Pinmux in driver code is controlled by SOC type, bcos driver code should be general and support all pins defined by SoC. Pinmux configuration in Kconfig is controlled by BOARD type, bcos when we operate on board, it does not expose all chip-level pin signals and we can only use part of them. Following is I2C signals exported by duo family. Details see https://milkv.io/docs/duo/overview. Note: we have not added support for duo-S. Duo === NAME I2C CV1800B/GPIO <PINNAME>__<FUNCNAME> ---- --- ------------ --------------------- GP0 I2C0_SCL XGPIOA[28] IIC0_SCL__IIC0_SCL GP1 I2C0_SDA XGPIOA[29] IIC0_SDA__IIC0_SDA GP4 I2C1_SCL PWR_GPIO[19] SD1_D2__IIC1_SCL GP9 I2C1_SCL PWR_GPIO[18] SD1_D3__IIC1_SCL GP11 I2C1_SCL XGPIOC[10] PAD_MIPIRX0N__IIC1_SCL GP5 I2C1_SDA PWR_GPIO[20] SD1_D1__IIC1_SDA GP8 I2C1_SDA PWR_GPIO[21] SD1_D0__IIC1_SDA GP10 I2C1_SDA XGPIOC[9] PAD_MIPIRX1P__IIC1_SDA GP7 I2C3_SCL PWR_GPIO[22] SD1_CMD__IIC3_SCL GP6 I2C3_SDA PWR_GPIO[23] SD1_CLK__IIC3_SDA Duo 256m ======== NAME I2C CV1800B/GPIO <PINNAME>__<FUNCNAME> ---- --- ------------ --------------------- GP4 I2C1_SCL PWR_GPIO[19] SD1_D2__IIC1_SCL GP9 I2C1_SCL PWR_GPIO[18] SD1_D3__IIC1_SCL GP5 I2C1_SDA PWR_GPIO[20] SD1_D1__IIC1_SDA GP8 I2C1_SDA PWR_GPIO[21] SD1_D0__IIC1_SDA GP11 I2C2_SCL XGPIOC[15] PAD_MIPI_TXP1__IIC2_SCL GP10 I2C2_SDA XGPIOC[14] PAD_MIPI_TXM1__IIC2_SDA GP7 I2C3_SCL PWR_GPIO[22] SD1_CMD__IIC3_SCL GP6 I2C3_SDA PWR_GPIO[23] SD1_CLK__IIC3_SDA Duo S ===== NAME I2C CV1800B/GPIO <PINNAME>__<FUNCNAME> ---- --- ------------ --------------------- J3-B18 I2C1_SCL XGPIOB[18] VIVO_D3__IIC1_SCL J3-B12 I2C1_SCL XGPIOB[12] VIVO_D9__IIC1_SCL J3-B11 I2C1_SDA XGPIOB[11] VIVO_D10__IIC1_SDA J3-B13 I2C2_SCL XGPIOB[13] VIVO_D8__IIC2_SCL J4-E1 I2C2_SCL PWR_GPIO[1] PWR_GPIO1__IIC2_SCL J3-B14 I2C2_SDA XGPIOB[14] VIVO_D7__IIC2_SDA J4-E2 I2C2_SDA PWR_GPIO[2] PWR_GPIO2__IIC2_SDA J3-B20 I2C4_SCL XGPIOB[20] VIVO_D1__IIC4_SCL J4-B1 I2C4_SCL XGPIOB[1] ADC3__IIC4_SCL J3-B21 I2C4_SDA XGPIOB[21] VIVO_D0__IIC4_SDA J4-B2 I2C4_SDA XGPIOB[2] ADC2__IIC4_SDA Signed-off-by: Chen Wang <unicorn_wang@outlook.com> Signed-off-by: flyingcys <flyingcys@163.com> * bsp:cvitek: remove using macro from source file for i2c Signed-off-by: Chen Wang <unicorn_wang@outlook.com> * bsp:cvitek: unify menu message text for i2c as other drivers Other dirvers has no extra word "HW". Signed-off-by: Chen Wang <unicorn_wang@outlook.com> * bsp:cvitek: add i2c pinmux config for c906_little Porting what we have done in commit "bsp:cvitek: add i2c pinmux config for cv18xx_riscv" to c906_little. Signed-off-by: Chen Wang <unicorn_wang@outlook.com> --------- Signed-off-by: Chen Wang <unicorn_wang@outlook.com> Signed-off-by: flyingcys <flyingcys@163.com> Co-authored-by: flyingcys <flyingcys@163.com>
RT-Thread · May 22, 2024 · 5dd3b74 · 5dd3b74
1 parent adf2b35
commit 5dd3b74
Show file tree

Hide file tree

Showing 10 changed files with 622 additions and 92 deletions.
diff --git a/bsp/cvitek/c906_little/Kconfig b/bsp/cvitek/c906_little/Kconfig
@@ -39,20 +39,32 @@ config TIMER_CLK_FREQ
     int
     default 25000000
 
+config SOC_TYPE_CV180X
+    bool
+    default n
+
+config SOC_TYPE_SG2002
+    bool
+    default n
+
 choice
     prompt "Board Type"
     default BOARD_TYPE_MILKV_DUO256M
 
     config BOARD_TYPE_MILKV_DUO
+        select SOC_TYPE_CV180X
         bool "milkv-duo"
 
     config BOARD_TYPE_MILKV_DUO_SPINOR
+        select SOC_TYPE_CV180X
         bool "milkv-duo-spinor"
 
     config BOARD_TYPE_MILKV_DUO256M
+        select SOC_TYPE_SG2002
         bool "milkv-duo256m"
 
     config BOARD_TYPE_MILKV_DUO256M_SPINOR
+        select SOC_TYPE_SG2002
         bool "milkv-duo256m-spinor"
 
 endchoice
diff --git a/bsp/cvitek/c906_little/board/Kconfig b/bsp/cvitek/c906_little/board/Kconfig
@@ -20,7 +20,7 @@ menu "General Drivers Configuration"
         endif
 
     menuconfig BSP_USING_I2C
-        bool "Using HW I2C"
+        bool "Using I2C"
         select RT_USING_I2C
         select RT_USING_I2C_BITOPS
         select RT_USING_PIN
@@ -29,15 +29,130 @@ menu "General Drivers Configuration"
         if BSP_USING_I2C
             config BSP_USING_I2C0
                 bool "Enable I2C0"
+                depends on BOARD_TYPE_MILKV_DUO || BOARD_TYPE_MILKV_DUO_SPINOR
                 default n
 
+                if BSP_USING_I2C0
+                    choice
+                        prompt "SCL"
+
+                        config BSP_USING_IIC0_SCL__IIC0_SCL
+                            bool "IIC0_SCL/GP0"
+                    endchoice
+
+                    choice
+                        prompt "SDA"
+
+                        config BSP_USING_IIC0_SDA__IIC0_SDA
+                            bool "IIC0_SDA/GP1"
+                    endchoice
+                endif
+
             config BSP_USING_I2C1
                 bool "Enable I2C1"
                 default n
 
+                if BSP_USING_I2C1
+                    choice
+                        prompt "SCL"
+
+                        if BOARD_TYPE_MILKV_DUO || BOARD_TYPE_MILKV_DUO_SPINOR
+                            config BSP_USING_SD1_D2__IIC1_SCL
+                                bool "SD1_D2/GP4"
+                            config BSP_USING_SD1_D3__IIC1_SCL
+                                bool "SD1_D3/GP9"
+                            config BSP_USING_PAD_MIPIRX0N__IIC1_SCL
+                                bool "PAD_MIPIRX0N/GP11"
+                        endif
+
+                        if BOARD_TYPE_MILKV_DUO256M || BOARD_TYPE_MILKV_DUO256M_SPINOR
+                            config BSP_USING_SD1_D2__IIC1_SCL
+                                bool "SD1_D2/GP4"
+                            config BSP_USING_SD1_D3__IIC1_SCL
+                                bool "SD1_D3/GP9"
+                        endif
+
+                    endchoice
+
+                    choice
+                        prompt "SDA"
+
+                        if BOARD_TYPE_MILKV_DUO || BOARD_TYPE_MILKV_DUO_SPINOR
+                            config BSP_USING_SD1_D1__IIC1_SDA
+                                bool "SD1_D1/GP5"
+                            config BSP_USING_SD1_D0__IIC1_SDA
+                                bool "SD1_D0/GP8"
+                            config BSP_USING_PAD_MIPIRX1P__IIC1_SDA
+                                bool "PAD_MIPIRX1P/GP10"
+                        endif
+
+                        if BOARD_TYPE_MILKV_DUO256M || BOARD_TYPE_MILKV_DUO256M_SPINOR
+                            config BSP_USING_SD1_D1__IIC1_SDA
+                                bool "SD1_D1/GP5"
+                            config BSP_USING_SD1_D0__IIC1_SDA
+                                bool "SD1_D0/GP8"
+                        endif
+                    endchoice
+                endif
+
+            config BSP_USING_I2C2
+                bool "Enable I2C2"
+                depends on BOARD_TYPE_MILKV_DUO256M || BOARD_TYPE_MILKV_DUO256M_SPINOR
+                default n
+
+                if BSP_USING_I2C2
+                    choice
+                        prompt "SCL"
+
+                        config BSP_USING_PAD_MIPI_TXP1__IIC2_SCL
+                            bool "PAD_MIPI_TXP1/GP11"
+                    endchoice
+
+                    choice
+                        prompt "SDA"
+
+                        config BSP_USING_PAD_MIPI_TXM1__IIC2_SDA
+                            bool "PAD_MIPI_TXM1/GP10"
+                    endchoice
+                endif
+
+            config BSP_USING_I2C3
+                bool "Enable I2C3"
+                default n
+
+                if BSP_USING_I2C3
+                    choice
+                        prompt "SCL"
+
+                        if BOARD_TYPE_MILKV_DUO || BOARD_TYPE_MILKV_DUO_SPINOR
+                            config BSP_USING_SD1_CMD__IIC3_SCL
+                                bool "SD1_CMD/GP7"
+                        endif
+
+                        if BOARD_TYPE_MILKV_DUO256M || BOARD_TYPE_MILKV_DUO256M_SPINOR
+                            config BSP_USING_SD1_CMD__IIC3_SCL
+                                bool "SD1_CMD/GP7"
+                        endif
+                    endchoice
+
+                    choice
+                        prompt "SDA"
+
+                        if BOARD_TYPE_MILKV_DUO || BOARD_TYPE_MILKV_DUO_SPINOR
+                            config BSP_USING_SD1_CLK__IIC3_SDA
+                                bool "SD1_CLK/GP6"
+                        endif
+
+                        if BOARD_TYPE_MILKV_DUO256M || BOARD_TYPE_MILKV_DUO256M_SPINOR
+                            config BSP_USING_SD1_CLK__IIC3_SDA
+                                bool "SD1_CLK/GP6"
+                        endif
+                    endchoice
+                endif
+
             config I2C_IRQ_BASE
-            int
-            default 32
+                int
+                default 32
         endif
 
     config BSP_USING_ADC

diff --git a/bsp/cvitek/cv18xx_risc-v/Kconfig b/bsp/cvitek/cv18xx_risc-v/Kconfig
@@ -46,20 +46,32 @@ config __STACKSIZE__
     int "stack size for interrupt"
     default 4096
 
+config SOC_TYPE_CV180X
+    bool
+    default n
+
+config SOC_TYPE_SG2002
+    bool
+    default n
+
 choice
     prompt "Board Type"
     default BOARD_TYPE_MILKV_DUO256M
 
     config BOARD_TYPE_MILKV_DUO
+        select SOC_TYPE_CV180X
         bool "milkv-duo"
 
     config BOARD_TYPE_MILKV_DUO_SPINOR
+        select SOC_TYPE_CV180X
         bool "milkv-duo-spinor"
 
     config BOARD_TYPE_MILKV_DUO256M
+        select SOC_TYPE_SG2002
         bool "milkv-duo256m"
 
     config BOARD_TYPE_MILKV_DUO256M_SPINOR
+        select SOC_TYPE_SG2002
         bool "milkv-duo256m-spinor"
 
 endchoice
diff --git a/bsp/cvitek/cv18xx_risc-v/board/Kconfig b/bsp/cvitek/cv18xx_risc-v/board/Kconfig
@@ -31,7 +31,143 @@ menu "General Drivers Configuration"
             default n
 
         endif
-
+
+    menuconfig BSP_USING_I2C
+        bool "Using I2C"
+        select RT_USING_I2C
+        select RT_USING_I2C_BITOPS
+        select RT_USING_PIN
+        default n
+
+        if BSP_USING_I2C
+            config BSP_USING_I2C0
+                bool "Enable I2C0"
+                depends on BOARD_TYPE_MILKV_DUO || BOARD_TYPE_MILKV_DUO_SPINOR
+                default n
+
+                if BSP_USING_I2C0
+                    choice
+                        prompt "SCL"
+
+                        config BSP_USING_IIC0_SCL__IIC0_SCL
+                            bool "IIC0_SCL/GP0"
+                    endchoice
+
+                    choice
+                        prompt "SDA"
+
+                        config BSP_USING_IIC0_SDA__IIC0_SDA
+                            bool "IIC0_SDA/GP1"
+                    endchoice
+                endif
+
+            config BSP_USING_I2C1
+                bool "Enable I2C1"
+                default n
+
+                if BSP_USING_I2C1
+                    choice
+                        prompt "SCL"
+
+                        if BOARD_TYPE_MILKV_DUO || BOARD_TYPE_MILKV_DUO_SPINOR
+                            config BSP_USING_SD1_D2__IIC1_SCL
+                                bool "SD1_D2/GP4"
+                            config BSP_USING_SD1_D3__IIC1_SCL
+                                bool "SD1_D3/GP9"
+                            config BSP_USING_PAD_MIPIRX0N__IIC1_SCL
+                                bool "PAD_MIPIRX0N/GP11"
+                        endif
+
+                        if BOARD_TYPE_MILKV_DUO256M || BOARD_TYPE_MILKV_DUO256M_SPINOR
+                            config BSP_USING_SD1_D2__IIC1_SCL
+                                bool "SD1_D2/GP4"
+                            config BSP_USING_SD1_D3__IIC1_SCL
+                                bool "SD1_D3/GP9"
+                        endif
+
+                    endchoice
+
+                    choice
+                        prompt "SDA"
+
+                        if BOARD_TYPE_MILKV_DUO || BOARD_TYPE_MILKV_DUO_SPINOR
+                            config BSP_USING_SD1_D1__IIC1_SDA
+                                bool "SD1_D1/GP5"
+                            config BSP_USING_SD1_D0__IIC1_SDA
+                                bool "SD1_D0/GP8"
+                            config BSP_USING_PAD_MIPIRX1P__IIC1_SDA
+                                bool "PAD_MIPIRX1P/GP10"
+                        endif
+
+                        if BOARD_TYPE_MILKV_DUO256M || BOARD_TYPE_MILKV_DUO256M_SPINOR
+                            config BSP_USING_SD1_D1__IIC1_SDA
+                                bool "SD1_D1/GP5"
+                            config BSP_USING_SD1_D0__IIC1_SDA
+                                bool "SD1_D0/GP8"
+                        endif
+                    endchoice
+                endif
+
+            config BSP_USING_I2C2
+                bool "Enable I2C2"
+                depends on BOARD_TYPE_MILKV_DUO256M || BOARD_TYPE_MILKV_DUO256M_SPINOR
+                default n
+
+                if BSP_USING_I2C2
+                    choice
+                        prompt "SCL"
+
+                        config BSP_USING_PAD_MIPI_TXP1__IIC2_SCL
+                            bool "PAD_MIPI_TXP1/GP11"
+                    endchoice
+
+                    choice
+                        prompt "SDA"
+
+                        config BSP_USING_PAD_MIPI_TXM1__IIC2_SDA
+                            bool "PAD_MIPI_TXM1/GP10"
+                    endchoice
+                endif
+
+            config BSP_USING_I2C3
+                bool "Enable I2C3"
+                default n
+
+                if BSP_USING_I2C3
+                    choice
+                        prompt "SCL"
+
+                        if BOARD_TYPE_MILKV_DUO || BOARD_TYPE_MILKV_DUO_SPINOR
+                            config BSP_USING_SD1_CMD__IIC3_SCL
+                                bool "SD1_CMD/GP7"
+                        endif
+
+                        if BOARD_TYPE_MILKV_DUO256M || BOARD_TYPE_MILKV_DUO256M_SPINOR
+                            config BSP_USING_SD1_CMD__IIC3_SCL
+                                bool "SD1_CMD/GP7"
+                        endif
+                    endchoice
+
+                    choice
+                        prompt "SDA"
+
+                        if BOARD_TYPE_MILKV_DUO || BOARD_TYPE_MILKV_DUO_SPINOR
+                            config BSP_USING_SD1_CLK__IIC3_SDA
+                                bool "SD1_CLK/GP6"
+                        endif
+
+                        if BOARD_TYPE_MILKV_DUO256M || BOARD_TYPE_MILKV_DUO256M_SPINOR
+                            config BSP_USING_SD1_CLK__IIC3_SDA
+                                bool "SD1_CLK/GP6"
+                        endif
+                    endchoice
+                endif
+
+            config I2C_IRQ_BASE
+                int
+                default 49
+        endif
+
     config BSP_USING_ADC
         bool "Using ADC"
         select RT_USING_ADC
@@ -42,6 +178,25 @@ menu "General Drivers Configuration"
         select RT_USING_SPI
         default n
 
+    menuconfig BSP_USING_WDT
+        bool "Enable Watchdog Timer"
+        select RT_USING_WDT
+        default n
+
+        if BSP_USING_WDT
+            config BSP_USING_WDT0
+                bool "Enable WDT0"
+                default n
+
+            config BSP_USING_WDT1
+                bool "Enable WDT1"
+                default n
+
+            config BSP_USING_WDT2
+                bool "Enable WDT2"
+                default n
+        endif
+
     menuconfig BSP_USING_PWM
         bool "Using PWM"
         select RT_USING_PWM
@@ -63,9 +218,13 @@ menu "General Drivers Configuration"
             config BSP_USING_PWM3
             bool "Enable PWM 3"
             default n
-
         endif
 
+    config BSP_USING_RTC
+        bool "Enable RTC"
+        select RT_USING_RTC
+        default n
+
     config BSP_USING_SDH
         select RT_USING_SDIO
         select RT_USING_DFS
@@ -80,4 +239,5 @@ menu "General Drivers Configuration"
         select RT_USING_LWIP
         select RT_USING_POSIX_FS
         select RT_USING_POSIX_SOCKET
+
 endmenu