From e127eb71e44cacf66496205b97bdf975803e87b8 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Wed, 9 Nov 2022 23:36:31 +0000 Subject: [PATCH] ANDROID: GKI: Add USB serial and ftdi sio modules CONFIG_USB_SERIAL: USB Serial Converter support CONFIG_USB_FTDI_SIO: FTDI SIO single port USB to serial converter device. Bug: 232431151 Test: TH Change-Id: I1522a9beb0f70740fdce11d1c50b606d81ddf6c6 Signed-off-by: Ramji Jiyani (cherry picked from commit 1383c8eae920fe95de79d0ce39e4468ad22034d6) --- BUILD.bazel | 2 ++ android/gki_system_dlkm_modules | 2 ++ arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ 4 files changed, 8 insertions(+) diff --git a/BUILD.bazel b/BUILD.bazel index c2982834e8db..a0ad8f3ada40 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -27,6 +27,8 @@ _common_gki_modules_list = [ "drivers/net/can/slcan/slcan.ko", "drivers/net/can/vcan.ko", "drivers/usb/class/cdc-acm.ko", + "drivers/usb/serial/ftdi_sio.ko", + "drivers/usb/serial/usbserial.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 f3e8227f37c8..f9b39a9a998b 100644 --- a/android/gki_system_dlkm_modules +++ b/android/gki_system_dlkm_modules @@ -3,6 +3,8 @@ drivers/net/can/dev/can-dev.ko drivers/net/can/slcan/slcan.ko drivers/net/can/vcan.ko drivers/usb/class/cdc-acm.ko +drivers/usb/serial/ftdi_sio.ko +drivers/usb/serial/usbserial.ko mm/zsmalloc.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 30ba42e749d1..4432cff24aa2 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -477,6 +477,8 @@ CONFIG_USB_ACM=m CONFIG_USB_STORAGE=y CONFIG_USB_UAS=y CONFIG_USB_DWC3=y +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_GADGET=y CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_UEVENT=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 6669b3d99658..663ab21c2e0f 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -436,6 +436,8 @@ CONFIG_USB_ACM=m CONFIG_USB_STORAGE=y CONFIG_USB_UAS=y CONFIG_USB_DWC3=y +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_GADGET=y CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_UEVENT=y