Merge pull request #6981 from RT-Thread/masterserialX-dev

sync from master

5 files changed, 77 insertions, 0 deletions

diff --git a/bsp/at32/at32f425-start/README.md b/bsp/at32/at32f425-start/README.md
index 94b928a4bc..d03cd087fe 100644
--- a/bsp/at32/at32f425-start/README.md
+++ b/bsp/at32/at32f425-start/README.md
@@ -49,6 +49,7 @@ AT32F425-START板级包支持MDK4﹑MDK5﹑IAR开发环境和GCC编译器，以�
 | WDT       | 支持     |                            |
 | RTC       | 支持     |                            |
 | FLASH     | 支持     |                            |
+| USB       | 支持     |                            |
 
 ### IO在板级支持包中的映射情况
 
@@ -85,6 +86,8 @@ AT32F425-START板级包支持MDK4﹑MDK5﹑IAR开发环境和GCC编译器，以�
 | PC5  | ADC1_IN15      |
 | PB8  | CAN1_RX        |
 | PB9  | CAN1_TX        |
+| PA11 | USB_DM         |
+| PA12 | USB_DP         |
 
 ## 使用说明
 
diff --git a/bsp/at32/at32f425-start/SConstruct b/bsp/at32/at32f425-start/SConstruct
index 24bc4971ea..60560a95cd 100644
--- a/bsp/at32/at32f425-start/SConstruct
+++ b/bsp/at32/at32f425-start/SConstruct
@@ -52,6 +52,9 @@ rtconfig.BSP_LIBRARY_TYPE = at32_library
 # include libraries
 objs.extend(SConscript(os.path.join(libraries_path_prefix, at32_library, 'SConscript')))
 
+# include usb libraries
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'usbfs_library', 'SConscript')))
+
 # include drivers
 objs.extend(SConscript(os.path.join(libraries_path_prefix, 'rt_drivers', 'SConscript')))
 
diff --git a/bsp/at32/at32f425-start/board/Kconfig b/bsp/at32/at32f425-start/board/Kconfig
index 9622ae9b8d..97f33b9419 100644
--- a/bsp/at32/at32f425-start/board/Kconfig
+++ b/bsp/at32/at32f425-start/board/Kconfig
@@ -26,7 +26,27 @@ menu "On-chip Peripheral Drivers"
 
     config BSP_USING_ON_CHIP_FLASH
         bool "Enable on-chip FLASH"
+        default n 
+
+    menuconfig BSP_USING_USBFS
+        bool "Enable USB BUS"
         default n
+        if BSP_USING_USBFS
+            menuconfig BSP_USING_USBFS1
+                bool "Enable USB BUS1"
+                default n
+                if BSP_USING_USBFS1
+                    config BSP_USING_DEVICE_USBFS1
+                        bool "Enable USB1 Deivce"
+                        select RT_USING_USB_DEVICE
+                        default n
+
+                    config BSP_USING_HOST_USBFS1
+                        bool "Enable USB1 Host"
+                        select RT_USING_USB_HOST
+                        default n
+                endif
+        endif
 
     menuconfig BSP_USING_RTC
         bool "Enable RTC"
diff --git a/bsp/at32/at32f425-start/board/inc/at32_msp.h b/bsp/at32/at32f425-start/board/inc/at32_msp.h
index b3679d0c9a..c2eb468175 100644
--- a/bsp/at32/at32f425-start/board/inc/at32_msp.h
+++ b/bsp/at32/at32f425-start/board/inc/at32_msp.h
@@ -17,5 +17,6 @@ void at32_msp_tmr_init(void *instance);
 void at32_msp_adc_init(void *instance);
 void at32_msp_hwtmr_init(void *instance);
 void at32_msp_can_init(void *instance);
+void at32_msp_usb_init(void *instance);
 
 #endif /* __AT32_MSP_H__ */
diff --git a/bsp/at32/at32f425-start/board/src/at32_msp.c b/bsp/at32/at32f425-start/board/src/at32_msp.c
index 04aa73ceca..3fb1ea93fd 100644
--- a/bsp/at32/at32f425-start/board/src/at32_msp.c
+++ b/bsp/at32/at32f425-start/board/src/at32_msp.c
@@ -247,3 +247,53 @@ void at32_msp_can_init(void *instance)
 #endif
 }
 #endif /* BSP_USING_CAN */
+
+#ifdef BSP_USING_USBFS
+void at32_msp_usb_init(void *instance)
+{
+    /* defalut usb clock from hext */
+    usb_clk48_s clk_s = USB_CLK_HICK;
+
+    crm_periph_clock_enable(CRM_OTGFS1_PERIPH_CLOCK, TRUE);
+
+    if(clk_s == USB_CLK_HICK)
+    {
+        crm_usb_clock_source_select(CRM_USB_CLOCK_SOURCE_HICK);
+
+        /* enable the acc calibration ready interrupt */
+        crm_periph_clock_enable(CRM_ACC_PERIPH_CLOCK, TRUE);
+
+        /* update the c1\c2\c3 value */
+        acc_write_c1(7980);
+        acc_write_c2(8000);
+        acc_write_c3(8020);
+
+        /* open acc calibration */
+        acc_calibration_mode_enable(ACC_CAL_HICKTRIM, TRUE);
+    }
+    else
+    {
+        switch(system_core_clock)
+        {
+            /* 48MHz */
+            case 48000000:
+                crm_usb_clock_div_set(CRM_USB_DIV_1);
+                break;
+
+            /* 72MHz */
+            case 72000000:
+                crm_usb_clock_div_set(CRM_USB_DIV_1_5);
+                break;
+
+            /* 96MHz */
+            case 96000000:
+                crm_usb_clock_div_set(CRM_USB_DIV_2);
+                break;
+
+            default:
+                break;
+        }
+    }
+}
+
+#endif /* BSP_USING_USBFS */