rockchip: fixes drm module dependencies

DHDAXCW · Oct 23, 2022 · baf932f · baf932f · DHDAXCW · Oct 23, 2022
1 parent 390d65e
commit baf932f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
@@ -243,7 +243,7 @@ define KernelPackage/drm
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=Direct Rendering Manager (DRM) support
   HIDDEN:=1
-  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit  +PACKAGE_kmod-backlight:kmod-backlight \
+  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +PACKAGE_kmod-backlight:kmod-backlight \
 	+(LINUX_5_15||LINUX_6_0):kmod-fb
   KCONFIG:=	\
 	CONFIG_DRM	\
@@ -266,7 +266,7 @@ $(eval $(call KernelPackage,drm))
 define KernelPackage/drm-buddy
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=A page based buddy allocator
-  DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-drm @(LINUX_5_19||LINUX_6_0)
+  DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-drm @(LINUX_6_0)
   KCONFIG:=CONFIG_DRM_BUDDY
   FILES:= $(LINUX_DIR)/drivers/gpu/drm/drm_buddy.ko
   AUTOLOAD:=$(call AutoProbe,drm_buddy)
@@ -327,7 +327,7 @@ define KernelPackage/drm-amdgpu
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=AMDGPU DRM support
   DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-ttm \
-  +kmod-drm-kms-helper +kmod-i2c-algo-bit +amdgpu-firmware \
+	+kmod-drm-kms-helper +kmod-i2c-algo-bit +amdgpu-firmware \
 	+(LINUX_6_0):kmod-drm-display-helper
   KCONFIG:=CONFIG_DRM_AMDGPU \
 	CONFIG_DRM_AMDGPU_SI=y \
@@ -1121,7 +1121,8 @@ define KernelPackage/drm-i915
 	CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS=n \
 	CONFIG_DRM_I915_USERPTR=y \
 	CONFIG_DRM_I915_WERROR=n
-  FILES:=$(LINUX_DIR)/drivers/gpu/drm/i915/i915.ko
+  FILES:= \
+      $(LINUX_DIR)/drivers/gpu/drm/i915/i915.ko
   AUTOLOAD:=$(call AutoProbe,i915)
 endef
 

diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile
@@ -7,8 +7,8 @@ BOARDNAME:=Rockchip
 FEATURES:=ext4 audio usb usbgadget display gpio fpu pci pcie rootfs-part boot-part squashfs
 SUBTARGETS:=armv8
 
-KERNEL_PATCHVER=6.0
-KERNEL_TESTING_PATCHVER=5.15
+KERNEL_PATCHVER=5.4
+KERNEL_TESTING_PATCHVER=6.0
 
 define Target/Description
 	Build firmware image for Rockchip SoC devices.

diff --git a/target/linux/rockchip/modules.mk b/target/linux/rockchip/modules.mk
@@ -38,7 +38,6 @@ define KernelPackage/drm-rockchip
 	$(LINUX_DIR)/drivers/media/cec/cec.ko@lt5.10 \
 	$(LINUX_DIR)/drivers/media/cec/core/cec.ko@ge5.10 \
 	$(LINUX_DIR)/drivers/phy/rockchip/phy-rockchip-inno-hdmi.ko \
-	$(LINUX_DIR)/drivers/gpu/drm/drm_dp_aux_bus.ko@ge5.15 \
 	$(LINUX_DIR)/drivers/gpu/drm/drm_cma_helper.ko@ge6.0 \
 	$(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko \
 	$(LINUX_DIR)/drivers/gpu/drm/rockchip/rockchipdrm.ko
@@ -51,23 +50,20 @@ endef
 
 $(eval $(call KernelPackage,drm-rockchip))
 
-define KernelPackage/gpu-lima
-  SUBMENU:=$(VIDEO_MENU)
-  TITLE:=Mali-4xx GPU support
-  DEPENDS:=@TARGET_rockchip +kmod-drm
+define KernelPackage/saradc-rockchip
+  SUBMENU:=$(IIO_MENU)
+  TITLE:=Rockchip SARADC support
+  DEPENDS:=@TARGET_rockchip +kmod-industrialio-triggered-buffer
   KCONFIG:= \
-	CONFIG_DRM_VGEM \
-	CONFIG_DRM_GEM_CMA_HELPER=y \
-	CONFIG_DRM_LIMA
+	CONFIG_RESET_CONTROLLER=y \
+	CONFIG_ROCKCHIP_SARADC
   FILES:= \
-	$(LINUX_DIR)/drivers/gpu/drm/vgem/vgem.ko \
-	$(LINUX_DIR)/drivers/gpu/drm/scheduler/gpu-sched.ko \
-	$(LINUX_DIR)/drivers/gpu/drm/lima/lima.ko
-  AUTOLOAD:=$(call AutoProbe,lima vgem)
+	$(LINUX_DIR)/drivers/iio/adc/rockchip_saradc.ko
+  AUTOLOAD:=$(call AutoProbe,rockchip_saradc)
 endef
 
-define KernelPackage/gpu-lima/description
-  Open-source reverse-engineered driver for Mali-4xx GPUs
+define KernelPackage/saradc-rockchip/description
+  Support for the SARADC found in SoCs from Rockchip
 endef
 
-$(eval $(call KernelPackage,gpu-lima))
+$(eval $(call KernelPackage,saradc-rockchip))