From 42d1d3ffd7ca37ab32da42cb892ce756aa85dfc6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 20 Nov 2020 16:09:52 +0100 Subject: [PATCH] ANDROID: GKI: enable CONFIG_USB_DWC3 to be build in Everyone relies on the DWC3 USB host/gadget controller, so build the core into the kernel to be shared by all. If platform specific changes are needed, enable the platform-specific dwc3 driver. Bug: 157965270 Signed-off-by: Greg Kroah-Hartman Change-Id: I3fc2c4d05f46eebf30c2e222cb85928d9f6a83c5 --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 9780171b3513..5dd051a51ce7 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -417,12 +417,12 @@ CONFIG_USB_HIDDEV=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_PLATFORM=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_ACM=y CONFIG_USB_STORAGE=y CONFIG_USB_UAS=y +CONFIG_USB_DWC3=y 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 a1992b2d1f7d..a916847cef05 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -371,12 +371,12 @@ CONFIG_HID_WIIMOTE=y CONFIG_USB_HIDDEV=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_PLATFORM=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_ACM=y CONFIG_USB_STORAGE=y CONFIG_USB_UAS=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_UEVENT=y