From 3790f4f1340661fb0029d01878460a7bde3eec95 Mon Sep 17 00:00:00 2001
From: aiamadeus <42570690+aiamadeus@users.noreply.github.com>
Date: Sun, 22 Dec 2024 19:20:29 +0800
Subject: [PATCH] kernel: fixes some modules build on 6.12

Fixes: #13224
---
 package/kernel/linux/modules/leds.mk  | 2 +-
 package/kernel/linux/modules/video.mk | 8 +++++---
 target/linux/rockchip/modules.mk      | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/package/kernel/linux/modules/leds.mk b/package/kernel/linux/modules/leds.mk
index de9b19a20..3d4821d97 100644
--- a/package/kernel/linux/modules/leds.mk
+++ b/package/kernel/linux/modules/leds.mk
@@ -118,7 +118,7 @@ $(eval $(call KernelPackage,ledtrig-pattern))
 define KernelPackage/ledtrig-tty
   SUBMENU:=$(LEDS_MENU)
   TITLE:=LED Trigger for TTY devices
-  DEPENDS:=@(LINUX_5_15||LINUX_6_1||LINUX_6_6)
+  DEPENDS:=@!(LINUX_5_4||LINUX_5_10)
   KCONFIG:=CONFIG_LEDS_TRIGGER_TTY
   FILES:=$(LED_TRIGGER_DIR)/ledtrig-tty.ko
   AUTOLOAD:=$(call AutoLoad,50,ledtrig-tty)
diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
index e8ff6b55c..e3f5d64da 100644
--- a/package/kernel/linux/modules/video.mk
+++ b/package/kernel/linux/modules/video.mk
@@ -103,7 +103,7 @@ define KernelPackage/fb
 	CONFIG_VT_HW_CONSOLE_BINDING=y
   FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/fb.ko \
 	$(LINUX_DIR)/lib/fonts/font.ko \
-	$(LINUX_DIR)/drivers/video/fbdev/core/fb_io_fops.ko@ge6.6
+	$(LINUX_DIR)/drivers/video/fbdev/core/fb_io_fops.ko@eq6.6
   AUTOLOAD:=$(call AutoLoad,06,fb font)
 endef
 
@@ -170,7 +170,9 @@ define KernelPackage/fb-sys-fops
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=Framebuffer software sys ops support
   DEPENDS:=+kmod-fb
-  KCONFIG:=CONFIG_FB_SYS_FOPS
+  KCONFIG:= \
+	CONFIG_FB_SYS_FOPS@lt6.8 \
+	CONFIG_FB_SYSMEM_FOPS@ge6.8
   FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/fb_sys_fops.ko
   AUTOLOAD:=$(call AutoLoad,07,fb_sys_fops)
 endef
@@ -578,7 +580,7 @@ $(eval $(call KernelPackage,drm-radeon))
 define KernelPackage/drm-sched
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=DRM helper for ARM GPUs
-  DEPENDS:=+kmod-drm
+  DEPENDS:=+kmod-drm +LINUX_6_12:kmod-drm-kms-helper
   HIDDEN:=1
   KCONFIG:=CONFIG_DRM_SCHED
   FILES:= \
diff --git a/target/linux/rockchip/modules.mk b/target/linux/rockchip/modules.mk
index 35823ff76..60bfb7015 100644
--- a/target/linux/rockchip/modules.mk
+++ b/target/linux/rockchip/modules.mk
@@ -6,7 +6,8 @@ define KernelPackage/drm-rockchip
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=Rockchip DRM support
   DEPENDS:=@TARGET_rockchip +kmod-backlight +kmod-drm-kms-helper \
-	+kmod-multimedia-input +(LINUX_6_1||LINUX_6_6):kmod-drm-display-helper
+	+(LINUX_6_1||LINUX_6_6||LINUX_6_12):kmod-drm-display-helper \
+	+kmod-multimedia-input
   KCONFIG:= \
 	CONFIG_DRM_ROCKCHIP \
 	CONFIG_DRM_LOAD_EDID_FIRMWARE=y \