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

sync from master

3 files changed, 73 insertions, 0 deletions

diff --git a/bsp/at32/at32f407-start/board/Kconfig b/bsp/at32/at32f407-start/board/Kconfig
index f3b44c094c..9c0cd20df0 100644
--- a/bsp/at32/at32f407-start/board/Kconfig
+++ b/bsp/at32/at32f407-start/board/Kconfig
@@ -45,6 +45,11 @@ menu "On-chip Peripheral Drivers"
             endchoice
         endif
 
+    config BSP_USING_USBD
+        bool "Enable USB BUS"
+        select RT_USING_USB_DEVICE
+        default n
+
     menuconfig BSP_USING_RTC
         bool "Enable RTC"
         select RT_USING_RTC
diff --git a/bsp/at32/at32f407-start/board/inc/at32_msp.h b/bsp/at32/at32f407-start/board/inc/at32_msp.h
index 21673cb290..6e6141ab75 100644
--- a/bsp/at32/at32f407-start/board/inc/at32_msp.h
+++ b/bsp/at32/at32f407-start/board/inc/at32_msp.h
@@ -20,5 +20,6 @@ void at32_msp_adc_init(void *instance);
 void at32_msp_hwtmr_init(void *instance);
 void at32_msp_can_init(void *instance);
 void at32_msp_emac_init(void *instance);
+void at32_msp_usb_init(void *instance);
 
 #endif /* __AT32_MSP_H__ */
diff --git a/bsp/at32/at32f407-start/board/src/at32_msp.c b/bsp/at32/at32f407-start/board/src/at32_msp.c
index 927bce5bd5..b995ee8c64 100644
--- a/bsp/at32/at32f407-start/board/src/at32_msp.c
+++ b/bsp/at32/at32f407-start/board/src/at32_msp.c
@@ -358,3 +358,70 @@ void at32_msp_emac_init(void *instance)
     gpio_init(GPIOD, &gpio_init_struct);
 }
 #endif /* BSP_USING_EMAC */
+
+#ifdef BSP_USING_USBD
+void at32_msp_usb_init(void *instance)
+{
+    usb_clk48_s clk_s;
+
+    /* default usb clock source from hick */
+    clk_s = USB_CLK_HICK;
+
+    /* enable usb clock */
+    crm_periph_clock_enable(CRM_USB_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;
+            /* 120MHz */
+            case 120000000:
+                crm_usb_clock_div_set(CRM_USB_DIV_2_5);
+                break;
+            /* 144MHz */
+            case 144000000:
+                crm_usb_clock_div_set(CRM_USB_DIV_3);
+                break;
+            /* 168MHz */
+            case 168000000:
+                crm_usb_clock_div_set(CRM_USB_DIV_3_5);
+                break;
+            /* 192MHz */
+            case 192000000:
+                crm_usb_clock_div_set(CRM_USB_DIV_4);
+                break;
+            default:
+                break;
+        }
+    }
+}
+
+#endif /* BSP_USING_USBD */
+