diff options
| author | Atlas Luo <atlas.luo@starfivetech.com> | 2025-09-29 13:17:34 +0300 |
|---|---|---|
| committer | Atlas Luo <atlas.luo@starfivetech.com> | 2025-09-29 13:17:34 +0300 |
| commit | 4cecf169f38eb94b40e307f5f870055e4d9d64f1 (patch) | |
| tree | 4d3f9bcc5ee4d00143567c7130242aac76554ea1 | |
| parent | a01f094ed33420e71c5cab5fb7a229889153ac25 (diff) | |
| parent | 118f030f433cac721e2bd40fc512976f6d4e66d9 (diff) | |
| download | linux-JH7110_VisionFive2_6.12.y_devel.tar.xz | |
Merge branch 'CR_20404_VF2_lite_bluetooth_ziv.xu' into 'vf2-6.12.y-devel'JH7110_VF2_6.12_v6.0.0JH7110_VisionFive2_6.12.y_devel
CR_20404_VF2_lite_bluetooth_ziv.xu
See merge request sbc/linux!252
| -rw-r--r-- | drivers/net/wireless/aic8800/aic_load_fw/aicbluetooth.c | 2 | ||||
| -rwxr-xr-x | drivers/net/wireless/aic8800D80/aic8800D80_bsp/aic_bsp_driver.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/aic8800/aic_load_fw/aicbluetooth.c b/drivers/net/wireless/aic8800/aic_load_fw/aicbluetooth.c index c4e7cd1c3266..12083bb24274 100644 --- a/drivers/net/wireless/aic8800/aic_load_fw/aicbluetooth.c +++ b/drivers/net/wireless/aic8800/aic_load_fw/aicbluetooth.c @@ -169,7 +169,7 @@ enum aicbsp_cpmode_type { #define AICBT_BTMODE_DEFAULT AICBT_BTMODE_BT_ONLY #define AICBT_BTPORT_DEFAULT AICBT_BTPORT_MB -#define AICBT_UART_BAUD_DEFAULT AICBT_UART_BAUD_1_5M +#define AICBT_UART_BAUD_DEFAULT AICBT_UART_BAUD_115200 #define AICBT_UART_FC_DEFAULT AICBT_UART_FLOWCTRL_ENABLE #define AICBT_LPM_ENABLE_DEFAULT 0 #define AICBT_TXPWR_LVL_DEFAULT AICBT_TXPWR_LVL diff --git a/drivers/net/wireless/aic8800D80/aic8800D80_bsp/aic_bsp_driver.h b/drivers/net/wireless/aic8800D80/aic8800D80_bsp/aic_bsp_driver.h index 935fc06a95ab..50bcd775c578 100755 --- a/drivers/net/wireless/aic8800D80/aic8800D80_bsp/aic_bsp_driver.h +++ b/drivers/net/wireless/aic8800D80/aic8800D80_bsp/aic_bsp_driver.h @@ -516,7 +516,7 @@ enum chip_rev { #else #define AICBT_BTPORT_DEFAULT AICBT_BTPORT_UART #endif -#define AICBT_UART_BAUD_DEFAULT AICBT_UART_BAUD_1_5M +#define AICBT_UART_BAUD_DEFAULT AICBT_UART_BAUD_115200 #define AICBT_UART_FC_DEFAULT AICBT_UART_FLOWCTRL_ENABLE #define AICBT_LPM_ENABLE_DEFAULT 0 #define AICBT_TXPWR_LVL_DEFAULT AICBT_TXPWR_LVL |