From 1383c8eae920fe95de79d0ce39e4468ad22034d6 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 --- BUILD.bazel | 2 ++ android/gki_aarch64_modules | 2 ++ android/gki_system_dlkm_modules | 2 ++ arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ 5 files changed, 10 insertions(+) diff --git a/BUILD.bazel b/BUILD.bazel index 27eed0d86648..d925f0475910 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -35,6 +35,8 @@ _common_gki_modules_list = [ "drivers/net/can/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_aarch64_modules b/android/gki_aarch64_modules index e81622365844..d4dbb8e2bd0b 100644 --- a/android/gki_aarch64_modules +++ b/android/gki_aarch64_modules @@ -4,6 +4,8 @@ drivers/net/can/dev/can-dev.ko drivers/net/can/vcan.ko drivers/net/can/slcan.ko drivers/usb/class/cdc-acm.ko +drivers/usb/serial/usbserial.ko +drivers/usb/serial/ftdi_sio.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 ccd5b83ebdaf..3a80a849b6d2 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.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 58d1c14515b9..7904d0d29f6a 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -496,6 +496,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 5ce3e37ae670..a347a0869164 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -445,6 +445,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