[openwrt/openwrt] kernel: modules: input: adapt for kernel 6.6

LEDE Commits lede-commits at lists.infradead.org
Mon Mar 11 12:17:54 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/0c98d99c5e8178ee8e578e67afa7bee7da9e4a14

commit 0c98d99c5e8178ee8e578e67afa7bee7da9e4a14
Author: Weijie Gao <hackpascal at gmail.com>
AuthorDate: Sat Jan 6 15:08:41 2024 +0800

    kernel: modules: input: adapt for kernel 6.6
    
    Adapt input kmods for building under kernel 6.6:
    * kmod-input-touchscreen-edt-ft5x06 depends on kmod-regmap-i2c
    from 6.3 as it starts to use regmap to access registers
    * CONFIG_HID_SUPPORT needs to be set in addition to CONFIG_HID.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
    Signed-off-by: Weijie Gao <hackpascal at gmail.com>
---
 package/kernel/linux/modules/input.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/kernel/linux/modules/input.mk b/package/kernel/linux/modules/input.mk
index 92587b1874..89fba29005 100644
--- a/package/kernel/linux/modules/input.mk
+++ b/package/kernel/linux/modules/input.mk
@@ -11,7 +11,7 @@ define KernelPackage/hid
   SUBMENU:=$(INPUT_MODULES_MENU)
   TITLE:=HID Devices
   DEPENDS:=+kmod-input-core +kmod-input-evdev
-  KCONFIG:=CONFIG_HID CONFIG_HIDRAW=y CONFIG_HID_BATTERY_STRENGTH=y
+  KCONFIG:=CONFIG_HID CONFIG_HID_SUPPORT=y CONFIG_HIDRAW=y CONFIG_HID_BATTERY_STRENGTH=y
   FILES:=$(LINUX_DIR)/drivers/hid/hid.ko
   AUTOLOAD:=$(call AutoLoad,61,hid)
 endef
@@ -179,7 +179,7 @@ $(eval $(call KernelPackage,input-touchscreen-ads7846))
 define KernelPackage/input-touchscreen-edt-ft5x06
   SUBMENU:=$(INPUT_MODULES_MENU)
   TITLE:=EDT FT5x06 and Focaltech FT6236 based touchscreens
-  DEPENDS:=+kmod-i2c-core +kmod-input-core
+  DEPENDS:=+kmod-i2c-core +kmod-input-core +LINUX_6_6:kmod-regmap-i2c
   KCONFIG:= \
 	CONFIG_INPUT_TOUCHSCREEN=y \
 	CONFIG_TOUCHSCREEN_EDT_FT5X06




More information about the lede-commits mailing list