From b0279491475b0761c2dedfbc793a5c23e2d97e14 Mon Sep 17 00:00:00 2001 From: Hsin-chen Chuang Date: Tue, 18 Mar 2025 20:24:52 +0800 Subject: [PATCH] ANDROID: GKI: Enable CONFIG_BT_HCIBTUSB_AUTO_ISOC_ALT This config is necessary for the HFP (bi-direction audio) on USB Bluetooth controller + HCI User Channel Socket. Since the btusb module was not compiled in ACK before, this means the module was not used by any other projects and it shall be safe to enable the config on ACK by default. Bug: 387425332 Test: Verify HFP works on USB Bluetooth controller Change-Id: Ib03c38f78929dbd4fbf335e2fe16d5627a211b9b Signed-off-by: Hsin-chen Chuang --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ modules.bzl | 3 +++ 3 files changed, 7 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index c41984342982..ad7d4ad6555b 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -288,6 +288,8 @@ CONFIG_BT=m CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_HIDP=m +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTUSB_AUTO_ISOC_ALT=y CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_LL=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 8bf88d07c8ed..cb1d16a5a1b9 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -280,6 +280,8 @@ CONFIG_BT=m CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_HIDP=m +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTUSB_AUTO_ISOC_ALT=y CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_LL=y diff --git a/modules.bzl b/modules.bzl index 5e613e7e78b2..ebbb90ddaf6e 100644 --- a/modules.bzl +++ b/modules.bzl @@ -11,8 +11,11 @@ _COMMON_GKI_MODULES_LIST = [ "drivers/block/virtio_blk.ko", "drivers/block/zram/zram.ko", "drivers/bluetooth/btbcm.ko", + "drivers/bluetooth/btintel.ko", "drivers/bluetooth/btqca.ko", + "drivers/bluetooth/btrtl.ko", "drivers/bluetooth/btsdio.ko", + "drivers/bluetooth/btusb.ko", "drivers/bluetooth/hci_uart.ko", "drivers/char/virtio_console.ko", "drivers/gnss/gnss.ko",