aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbelgin <contact@belgin.ro>2021-09-30 11:17:15 +0300
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2021-10-07 17:19:39 +0200
commit3795ca8bbf5d4c03b4b943bc52fa6e2825fa8df6 (patch)
tree8e9665383b9028b74cc9fef61b4c023f287be5e5
parent9ea775b18b9847705b5b76e34e1422811038e15a (diff)
downloadkernel_replicant_linux-history/replicant-11/linux-5.10.71.tar.gz
kernel_replicant_linux-history/replicant-11/linux-5.10.71.tar.bz2
kernel_replicant_linux-history/replicant-11/linux-5.10.71.zip
Enabled driver for touchkeys.history/replicant-11/linux-5.10.71
This fixes several regression: - CONFIG_KEYBOARD_TM2_TOUCHKEY=y was accidentally removed by the "ARM: replicant_defconfig: sync with make savedefconfig for v5.10.64" commit (680699d46e55e3b5184272918cccd7787a3ae8be). - CONFIG_NEW_LEDS and CONFIG_LEDS_CLASS were removed by the following commit: "ARM: replicant_defconfig: Add ath9k_htc and carl9170 support". It could have happened due to rebases of these commits: the CONFIGs being removed could still have been in the .config after doing make replicant_defconfig at first but after rebasing that commit, the same change on top of another git revision could actually remove these configuration from .config. It could also have happened due to a human error. Signed-off-by: belgin <contact@belgin.ro> GNUtoo: Add information about the commits that broke touchkeys Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--arch/arm/configs/replicant_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/replicant_defconfig b/arch/arm/configs/replicant_defconfig
index b30a8e7aae13..07a259a5d7d0 100644
--- a/arch/arm/configs/replicant_defconfig
+++ b/arch/arm/configs/replicant_defconfig
@@ -234,6 +234,7 @@ CONFIG_NET_SAMSUNG_IPC=y
CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_SAMSUNG=y
+CONFIG_KEYBOARD_TM2_TOUCHKEY=y
# CONFIG_MOUSE_PS2 is not set
CONFIG_MOUSE_CYAPA=y
CONFIG_INPUT_TOUCHSCREEN=y
@@ -346,6 +347,8 @@ CONFIG_MMC_SDHCI_S3C=y
CONFIG_MMC_SDHCI_S3C_DMA=y
CONFIG_MMC_DW=y
CONFIG_MMC_DW_EXYNOS=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_MAX8997=y
CONFIG_RTC_DRV_MAX77686=y