From 416a0f5d4f7095a5c92bc6aa985ca8dfebdf84d7 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Wed, 9 Nov 2022 22:28:29 +0000 Subject: [PATCH] ANDROID: GKI: Convert USB ACM as GKI module CONFIG_USB_ACM: This driver supports USB modems and ISDN adapters which support the Communication Device Class Abstract Control Model interface. Bug: 232431151 Test: TH Change-Id: I15e07607121546eee4e6fa6b8bd8a8fd510a02d9 Signed-off-by: Ramji Jiyani (cherry picked from commit d0bdbdcadf547044e8be402f597a0ecc7ce341eb) --- BUILD.bazel | 1 + android/gki_system_dlkm_modules | 2 ++ arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index d4fd6999f027..c2982834e8db 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -26,6 +26,7 @@ _common_gki_modules_list = [ "drivers/net/can/dev/can-dev.ko", "drivers/net/can/slcan/slcan.ko", "drivers/net/can/vcan.ko", + "drivers/usb/class/cdc-acm.ko", "mm/zsmalloc.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 6979b422cce8..f3e8227f37c8 100644 --- a/android/gki_system_dlkm_modules +++ b/android/gki_system_dlkm_modules @@ -2,9 +2,11 @@ drivers/block/zram/zram.ko drivers/net/can/dev/can-dev.ko drivers/net/can/slcan/slcan.ko drivers/net/can/vcan.ko +drivers/usb/class/cdc-acm.ko mm/zsmalloc.ko net/can/can-bcm.ko net/can/can-gw.ko net/can/can-raw.ko net/mac80211/mac80211.ko net/wireless/cfg80211.ko + diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 40a9dce53c3d..30ba42e749d1 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -473,7 +473,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_ACM=y +CONFIG_USB_ACM=m CONFIG_USB_STORAGE=y CONFIG_USB_UAS=y CONFIG_USB_DWC3=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index e4e201fc336a..6669b3d99658 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -432,7 +432,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_ACM=y +CONFIG_USB_ACM=m CONFIG_USB_STORAGE=y CONFIG_USB_UAS=y CONFIG_USB_DWC3=y