From d39c7fb8b05fe5bc609ca1f457e313d79f72a195 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Tue, 15 Nov 2022 19:33:44 +0000 Subject: [PATCH] ANDROID: GKI: Covnert Bluetooth HIDP as module CONFIG_BT_HIDP: HIDP protocol support HIDP (Human Interface Device Protocol) is a transport layer for HID reports. HIDP is required for the Bluetooth Human Interface Device Profile. Bug: 232431151 Test: TH Change-Id: Ibe9ed98370ecc9c9825c3a735070817d16254138 Signed-off-by: Ramji Jiyani (cherry picked from commit 4747c631a478866edd2cd6e0c98ce8febedf6ab1) --- BUILD.bazel | 1 + android/gki_system_dlkm_modules | 1 + arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 701972a2c251..8dc5ba0e72a6 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -31,6 +31,7 @@ _common_gki_modules_list = [ "drivers/usb/serial/usbserial.ko", "mm/zsmalloc.ko", "net/8021q/8021q.ko", + "net/bluetooth/hidp/hidp.ko", "net/bluetooth/rfcomm/rfcomm.ko", "net/can/can-bcm.ko", "net/can/can-gw.ko", diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules index 95a80cdc12f5..c22a1d4f23a5 100644 --- a/android/gki_system_dlkm_modules +++ b/android/gki_system_dlkm_modules @@ -7,6 +7,7 @@ drivers/usb/serial/ftdi_sio.ko drivers/usb/serial/usbserial.ko mm/zsmalloc.ko net/8021q/8021q.ko +net/bluetooth/hidp/hidp.ko net/bluetooth/rfcomm/rfcomm.ko net/can/can-bcm.ko net/can/can-gw.ko diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 4398b5c5074d..83ba885f292a 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -260,7 +260,7 @@ CONFIG_CAN_GW=m CONFIG_BT=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_HIDP=y +CONFIG_BT_HIDP=m CONFIG_BT_HCIBTSDIO=y CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_LL=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 735d5fac238e..ea7c25c52b7d 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -250,7 +250,7 @@ CONFIG_CAN_GW=m CONFIG_BT=y CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_HIDP=y +CONFIG_BT_HIDP=m CONFIG_BT_HCIBTSDIO=y CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_LL=y