From cb0faf060fe33b1b236565e96d2629dc7778e730 Mon Sep 17 00:00:00 2001 From: Hsin-chen Chuang Date: Wed, 16 Apr 2025 20:24:43 -0700 Subject: [PATCH] Revert "ANDROID: GKI: Enable CONFIG_BT_HCIBTUSB_AUTO_ISOC_ALT" This reverts commit b0279491475b0761c2dedfbc793a5c23e2d97e14. Reason for revert: The feature behind this Kconfig doesn't work quite well and is already reverted upstream. NO_IFTTT=The original CL missed editing gki/aarch64/protected_exports and was done in another CL, which is also reverted by https://r.android.com/3594839 Bug: 387425332 Change-Id: I2a927c270d409722b0b359e77a68db5429e79439 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 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 9438d7bafcfa..d520eaa69cf8 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -296,8 +296,6 @@ 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 a37d08ad636f..f7bc7e8f7005 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -286,8 +286,6 @@ 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 a31aaeff5f93..34a2000cbec3 100644 --- a/modules.bzl +++ b/modules.bzl @@ -12,11 +12,8 @@ _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",