From d55c01c608c1a06e88a719ed8599bbb159eba130 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Tue, 15 Nov 2022 21:51:01 +0000 Subject: [PATCH] ANDROID: GKI: Convert BT HCI sdio & uart as modules Converts BT host controller sdio & uart interface drivers as modules: CONFIG_BT_HCIBTSDIO: HCI SDIO driver CONFIG_BT_HCIUART: HCI UART driver Converts HCI uart dependent protocol drivers as modules due to dependency on the CONFIG_BT_HCIUART. CONFIG_BT_HCIUART_QCA: Qualcomm Atheros protocol support CONFIG_BT_HCIUART_BCM: Broadcom protocol support Bug: 232431151 Test: TH Change-Id: I3a3a7ae03140774a78a56ac306b8aef1042b1ceb Signed-off-by: Ramji Jiyani (cherry picked from commit 78a20156d1fc07d4a5960a86935d4a3dd26d3fb1) --- BUILD.bazel | 4 ++++ android/gki_system_dlkm_modules | 4 ++++ arch/arm64/configs/gki_defconfig | 4 ++-- arch/x86/configs/gki_defconfig | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 8dc5ba0e72a6..9e9183b58793 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -23,6 +23,10 @@ load("//build/kernel/kleaf:kernel.bzl", "ddk_headers") _common_gki_modules_list = [ # keep sorted "drivers/block/zram/zram.ko", + "drivers/bluetooth/btbcm.ko", + "drivers/bluetooth/btqca.ko", + "drivers/bluetooth/btsdio.ko", + "drivers/bluetooth/hci_uart.ko", "drivers/net/can/dev/can-dev.ko", "drivers/net/can/slcan/slcan.ko", "drivers/net/can/vcan.ko", diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules index c22a1d4f23a5..ecef27a870e2 100644 --- a/android/gki_system_dlkm_modules +++ b/android/gki_system_dlkm_modules @@ -1,4 +1,8 @@ drivers/block/zram/zram.ko +drivers/bluetooth/btbcm.ko +drivers/bluetooth/btqca.ko +drivers/bluetooth/btsdio.ko +drivers/bluetooth/hci_uart.ko drivers/net/can/dev/can-dev.ko drivers/net/can/slcan/slcan.ko drivers/net/can/vcan.ko diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 83ba885f292a..797f6ae63705 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -261,8 +261,8 @@ CONFIG_BT=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_HIDP=m -CONFIG_BT_HCIBTSDIO=y -CONFIG_BT_HCIUART=y +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index ea7c25c52b7d..f6cfed0bf282 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -251,8 +251,8 @@ CONFIG_BT=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_HIDP=m -CONFIG_BT_HCIBTSDIO=y -CONFIG_BT_HCIUART=y +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y