From db102bc6beefc9befa8dc5a63330a9268e8f88ed Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 19 Nov 2020 16:26:58 +0100 Subject: [PATCH] ANDROID: GKI: Enable CONFIG_USB_XHCI_HCD Almost all systems support the USB XHCI controller these days, so build it into the kernel so that everyone can share the same codebase. If platform-specific XHCI changes are needed, do it in a platform-specific XHCI driver using the provided api for that. Bug: 157965270 Signed-off-by: Greg Kroah-Hartman Change-Id: I6e8b5d1fbcde86415f43d942aad0f828ab346928 --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 45190e55272a..b309e0e05a4e 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -404,6 +404,8 @@ CONFIG_HID_STEAM=y 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 diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 018288787d2a..02efa77bf3cc 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -359,6 +359,8 @@ CONFIG_SONY_FF=y CONFIG_HID_STEAM=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