From d0bdbdcadf547044e8be402f597a0ecc7ce341eb 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 --- BUILD.bazel | 1 + android/gki_aarch64_modules | 1 + android/gki_system_dlkm_modules | 2 ++ arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index a5f4a0023e88..27eed0d86648 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -34,6 +34,7 @@ _common_gki_modules_list = [ "drivers/net/can/dev/can-dev.ko", "drivers/net/can/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_aarch64_modules b/android/gki_aarch64_modules index fb7a74eeb2c5..e81622365844 100644 --- a/android/gki_aarch64_modules +++ b/android/gki_aarch64_modules @@ -3,6 +3,7 @@ drivers/block/zram/zram.ko drivers/net/can/dev/can-dev.ko drivers/net/can/vcan.ko drivers/net/can/slcan.ko +drivers/usb/class/cdc-acm.ko net/can/can-raw.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 51dd4101202f..ccd5b83ebdaf 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.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 662227929ce2..58d1c14515b9 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -492,7 +492,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 8c61c97d3214..5ce3e37ae670 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -441,7 +441,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