Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/coolsnowwolf/lede:
  kernel: bump 5.15 to 5.15.143
  kernel: fixes usb-audio depends (coolsnowwolf#11713)
  • Loading branch information
github-actions[bot] committed Dec 17, 2023
2 parents bbcb014 + 67dcd38 commit 9d2954f
Show file tree
Hide file tree
Showing 27 changed files with 1,157 additions and 661 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.15
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .142
LINUX_KERNEL_HASH-5.15.142 = 8d76c95277dc5ab0a6cd0069432af2ceb759d0ac2b6f5401330d390196095676
LINUX_VERSION-5.15 = .143
LINUX_KERNEL_HASH-5.15.143 = 096bb16ec07232f27f6a07998c41b655883a8d0a6bb613d39bf524a9ffd99e02
1 change: 1 addition & 0 deletions package/kernel/linux/modules/usb.mk
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,7 @@ define KernelPackage/usb-audio
CONFIG_SND_USB_AUDIO
$(call AddDepends/usb)
$(call AddDepends/sound)
DEPENDS += +LINUX_6_1:kmod-media-core
FILES:= \
$(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \
$(LINUX_DIR)/sound/usb/snd-usb-audio.ko
Expand Down
24 changes: 20 additions & 4 deletions package/kernel/linux/modules/video.mk
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,23 @@ endef

$(eval $(call KernelPackage,fb-tft-ili9486))

define KernelPackage/media-core
SUBMENU:=$(VIDEO_MENU)
TITLE=Multimedia support
HIDDEN:=1
KCONFIG:= \
CONFIG_MEDIA_SUPPORT \
CONFIG_MEDIA_CAMERA_SUPPORT=y
FILES:=$(LINUX_DIR)/drivers/media/mc/mc.ko
AUTOLOAD:=$(call AutoProbe,mc)
endef

define KernelPackage/media-core/description
Kernel modules for media controller support
endef

$(eval $(call KernelPackage,media-core))

define KernelPackage/multimedia-input
SUBMENU:=$(VIDEO_MENU)
TITLE:=Multimedia input support
Expand Down Expand Up @@ -541,13 +558,12 @@ $(eval $(call KernelPackage,drm-nouveau))
define KernelPackage/video-core
SUBMENU:=$(VIDEO_MENU)
TITLE=Video4Linux support
DEPENDS:=+PACKAGE_kmod-i2c-core:kmod-i2c-core
DEPENDS:=+PACKAGE_kmod-i2c-core:kmod-i2c-core \
+LINUX_6_1:kmod-media-core
KCONFIG:= \
CONFIG_MEDIA_SUPPORT \
CONFIG_MEDIA_CAMERA_SUPPORT=y \
CONFIG_VIDEO_DEV \
CONFIG_V4L_PLATFORM_DRIVERS=y
FILES:=$(LINUX_DIR)/drivers/media/mc/mc.ko@ge6.1 \
FILES:= \
$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko
AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common)
endef
Expand Down
Loading

0 comments on commit 9d2954f

Please sign in to comment.