From 1aefd8f21c2b5614837bc6def64db5f79929c012 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 2 Jun 2020 09:15:41 +0200 Subject: [PATCH] ANDROID: GKI: enable a bunch of HID config options =y A bunch of HID config options are recommented to be =y in the default android configuration, and vendors are using them, so enable them in the GKI kernels as well to reduce the abi footprint. The options enabled are: CONFIG_HID_WACOM CONFIG_HID_LOGITECH CONFIG_HID_LOGITECH_DJ CONFIG_HID_ROCCAT CONFIG_HID_PRODIKEYS CONFIG_HID_PICOLCD CONFIG_HID_UCLOGIC CONFIG_HID_WIIMOTE Bug: 157965270 Signed-off-by: Greg Kroah-Hartman Change-Id: Idc8eae67ec81b5dd925c09db2f3600633c55d0c4 --- arch/arm64/configs/gki_defconfig | 11 ++++++++--- arch/x86/configs/gki_defconfig | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index b309e0e05a4e..0b99e4fee2e2 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -392,15 +392,23 @@ CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HIDRAW=y CONFIG_UHID=y CONFIG_HID_APPLE=y +CONFIG_HID_PRODIKEYS=y CONFIG_HID_ELECOM=y +CONFIG_HID_UCLOGIC=y +CONFIG_HID_LOGITECH=y +CONFIG_HID_LOGITECH_DJ=y CONFIG_HID_MAGICMOUSE=y CONFIG_HID_MICROSOFT=y CONFIG_HID_MULTITOUCH=y CONFIG_HID_NINTENDO=y +CONFIG_HID_PICOLCD=y CONFIG_HID_PLANTRONICS=y +CONFIG_HID_ROCCAT=y CONFIG_HID_SONY=y CONFIG_SONY_FF=y CONFIG_HID_STEAM=y +CONFIG_HID_WACOM=y +CONFIG_HID_WIIMOTE=y CONFIG_USB_HIDDEV=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_OTG=y @@ -432,10 +440,7 @@ CONFIG_MMC=y # CONFIG_PWRSEQ_SIMPLE is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=y -CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_EDAC=y CONFIG_RTC_CLASS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 02efa77bf3cc..c895b124887f 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -348,15 +348,23 @@ CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HIDRAW=y CONFIG_UHID=y CONFIG_HID_APPLE=y +CONFIG_HID_PRODIKEYS=y CONFIG_HID_ELECOM=y +CONFIG_HID_UCLOGIC=y +CONFIG_HID_LOGITECH=y +CONFIG_HID_LOGITECH_DJ=y CONFIG_HID_MAGICMOUSE=y CONFIG_HID_MICROSOFT=y CONFIG_HID_MULTITOUCH=y CONFIG_HID_NINTENDO=y +CONFIG_HID_PICOLCD=y CONFIG_HID_PLANTRONICS=y +CONFIG_HID_ROCCAT=y CONFIG_HID_SONY=y CONFIG_SONY_FF=y CONFIG_HID_STEAM=y +CONFIG_HID_WACOM=y +CONFIG_HID_WIIMOTE=y CONFIG_USB_HIDDEV=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_XHCI_HCD=y @@ -387,10 +395,7 @@ CONFIG_MMC=y # CONFIG_PWRSEQ_SIMPLE is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=y -CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_EDAC=y CONFIG_RTC_CLASS=y