From bb0471d04794d3cb0ee8a87ba4ed41b5c4516e2a Mon Sep 17 00:00:00 2001 From: Jack Pham Date: Thu, 17 Sep 2020 10:57:36 -0700 Subject: [PATCH] defconfig: Disable USB_CONFIGFS_RNDIS for Lahaina/Holi QGKI USB_CONFIGFS_RNDIS is currently enabled by gki_defconfig. Although the upstream F_RNDIS driver can coexist with the USB GSI driver, currently there is a conflict in userspace that can result in choosing the wrong one. Disable the SW-only F_RNDIS driver to allow the GSI driver to be enabled exclusively. Change-Id: I272b632dda1e792931102f94554cd26065389b34 Signed-off-by: Jack Pham --- arch/arm64/configs/vendor/holi_QGKI.config | 1 + arch/arm64/configs/vendor/lahaina_QGKI.config | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/vendor/holi_QGKI.config b/arch/arm64/configs/vendor/holi_QGKI.config index 6cac46ae2dbd..76db11bbb396 100644 --- a/arch/arm64/configs/vendor/holi_QGKI.config +++ b/arch/arm64/configs/vendor/holi_QGKI.config @@ -177,3 +177,4 @@ CONFIG_QTI_HW_MEMLAT_SCMI_CLIENT=y CONFIG_SRAM=y CONFIG_QTI_HW_MEMLAT_LOG=y CONFIG_MSM_PERFORMANCE=y +# CONFIG_USB_CONFIGFS_RNDIS is not set diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config index 139ab593d035..35601c6241a1 100644 --- a/arch/arm64/configs/vendor/lahaina_QGKI.config +++ b/arch/arm64/configs/vendor/lahaina_QGKI.config @@ -199,6 +199,7 @@ CONFIG_HID_WACOM=y CONFIG_HID_WIIMOTE=y CONFIG_USB_DUMMY_HCD=y CONFIG_USB_CONFIGFS_ACM=y +# CONFIG_USB_CONFIGFS_RNDIS is not set CONFIG_USB_CONFIGFS_F_HID=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EROFS_FS=y