summaryrefslogtreecommitdiff
path: root/arch/riscv
diff options
context:
space:
mode:
authorandy.hu <andy.hu@starfivetech.com>2023-12-07 13:56:17 +0300
committerandy.hu <andy.hu@starfivetech.com>2023-12-07 13:56:17 +0300
commite5fa0ea74fd6a52ba65b6fb70006a92e1cbc1ad2 (patch)
tree82b4ee7bc4ad7d83d0501b32f1ebdf4482d365ae /arch/riscv
parent1ac9a37599ceacc58caa90a59f4c5f86f2581687 (diff)
parent55887cbfe5454d6e623b161b939b77e21ba517a5 (diff)
downloadlinux-e5fa0ea74fd6a52ba65b6fb70006a92e1cbc1ad2.tar.xz
Merge branch 'CR_5735_VF2_BT_SCO_5.15_ziv.xu' into 'vf2-515-devel'
CR_5735_VF2_BT_SCO_5.15_ziv.xu See merge request sbc/linux!179
Diffstat (limited to 'arch/riscv')
-rw-r--r--arch/riscv/configs/starfive_visionfive2_defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/riscv/configs/starfive_visionfive2_defconfig b/arch/riscv/configs/starfive_visionfive2_defconfig
index ef93c628aa89..81a113682672 100644
--- a/arch/riscv/configs/starfive_visionfive2_defconfig
+++ b/arch/riscv/configs/starfive_visionfive2_defconfig
@@ -82,8 +82,9 @@ CONFIG_BT_BNEP=y
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIBTUSB_BCM is not set
+# CONFIG_BT_HCIBTUSB_RTL is not set
+CONFIG_BT_AICUSB=y
CONFIG_CFG80211=y
CONFIG_MAC80211=y
CONFIG_NET_9P=y