mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 21:26:49 +00:00
Merge pull request #8174 from HiassofT/le11-kernel-6.1.46
[le11] linux (RPi): update to 6.1.54
This commit is contained in:
CvH
GitHub
commit
cb1ada5a77
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="7cb8f19514cd01ba53fff6792c519f88ed31963b"
|
||||
PKG_SHA256="4600e72874713ddcf09f4fbaea2bbd47ea4e32c532892fd5cbd79f94c4219efc"
|
||||
PKG_VERSION="6b37a457122714aa14b2c7df0926455173fd04f1"
|
||||
PKG_SHA256="3f4de02666cae0d0417c12f5e3abecd4c3edf59f892a9cc481e742c1d6c19a31"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
|
||||
@ -23,8 +23,8 @@ case "${LINUX}" in
|
||||
PKG_PATCH_DIRS="default"
|
||||
;;
|
||||
raspberrypi)
|
||||
PKG_VERSION="19a1b03529363945fbbb4b9160fe8645809a9dce" # 6.1.45
|
||||
PKG_SHA256="d349aa0a032c251cd186316b48419125f306874ecfafaeb03d0e1804cfdfc980"
|
||||
PKG_VERSION="cc08810f89e52337a99cc6ae5f53f08588357c5f" # 6.1.54
|
||||
PKG_SHA256="9f05e721292dc9de12a22f6c005f79da1421c76dcf9b2f99eac6754e978472de"
|
||||
PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||
;;
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
From a154f37e6803ffeb77156ba2c3e23c00c511c60d Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Thu, 7 Sep 2023 20:33:25 +0200
|
||||
Subject: [PATCH] ASoC: hdmi-codec: Fix broken channel map reporting
|
||||
|
||||
Commit 5fe680b23327 ("ASoC: hdmi-codec: fix channel info for
|
||||
compressed formats") accidentally changed hcp->chmap_idx from
|
||||
ca_id, the CEA channel allocation ID, to idx, the index to
|
||||
the table of channel mappings ordered by preference.
|
||||
|
||||
This resulted in wrong channel maps being reported to userspace,
|
||||
eg for 5.1 "FL,FR,LFE,FC" was reported instead of the expected
|
||||
"FL,FR,LFE,FC,RL,RR":
|
||||
|
||||
~ # speaker-test -c 6 -t sine
|
||||
...
|
||||
0 - Front Left
|
||||
3 - Front Center
|
||||
1 - Front Right
|
||||
2 - LFE
|
||||
4 - Unknown
|
||||
5 - Unknown
|
||||
|
||||
~ # amixer cget iface=PCM,name='Playback Channel Map' | grep ': values'
|
||||
: values=3,4,8,7,0,0,0,0
|
||||
|
||||
Revert this incorrect change so that channel maps are properly
|
||||
reported again.
|
||||
|
||||
Fixes: 5fe680b23327 ("ASoC: hdmi-codec: fix channel info for compressed formats")
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
sound/soc/codecs/hdmi-codec.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
|
||||
index 13689e718d36f..c8e48225598f8 100644
|
||||
--- a/sound/soc/codecs/hdmi-codec.c
|
||||
+++ b/sound/soc/codecs/hdmi-codec.c
|
||||
@@ -531,7 +531,7 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai,
|
||||
hp->sample_rate = sample_rate;
|
||||
hp->channels = channels;
|
||||
|
||||
- hcp->chmap_idx = idx;
|
||||
+ hcp->chmap_idx = ca_id;
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="7cb8f19514cd01ba53fff6792c519f88ed31963b"
|
||||
PKG_SHA256="2ae355c40e56996da5f3fbc5fe0fd7637b6fcafe4e963454d14ed8faa1cbcf1b"
|
||||
PKG_VERSION="6b37a457122714aa14b2c7df0926455173fd04f1"
|
||||
PKG_SHA256="e1de7ccea4b64ebaada43cdfc0dd420bbceea586a7b68d1210a54df6479279d2"
|
||||
PKG_ARCH="arm aarch64"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 6.1.44 Kernel Configuration
|
||||
# Linux/arm 6.1.53 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@ -2882,11 +2882,14 @@ CONFIG_DVB_CORE=m
|
||||
# Video4Linux options
|
||||
#
|
||||
CONFIG_VIDEO_V4L2_I2C=y
|
||||
CONFIG_VIDEO_V4L2_SUBDEV_API=y
|
||||
# CONFIG_VIDEO_ADV_DEBUG is not set
|
||||
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
|
||||
CONFIG_VIDEO_TUNER=m
|
||||
CONFIG_V4L2_MEM2MEM_DEV=m
|
||||
# CONFIG_V4L2_FLASH_LED_CLASS is not set
|
||||
CONFIG_V4L2_FWNODE=m
|
||||
CONFIG_V4L2_ASYNC=m
|
||||
# end of Video4Linux options
|
||||
|
||||
#
|
||||
@ -3146,10 +3149,7 @@ CONFIG_MEDIA_ATTACH=y
|
||||
# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
|
||||
#
|
||||
CONFIG_VIDEO_IR_I2C=m
|
||||
|
||||
#
|
||||
# Camera sensor devices
|
||||
#
|
||||
CONFIG_VIDEO_CAMERA_SENSOR=y
|
||||
# CONFIG_VIDEO_AR0521 is not set
|
||||
# CONFIG_VIDEO_ARDUCAM_64MP is not set
|
||||
# CONFIG_VIDEO_ARDUCAM_PIVARIETY is not set
|
||||
@ -3222,7 +3222,6 @@ CONFIG_VIDEO_IR_I2C=m
|
||||
# CONFIG_VIDEO_CCS is not set
|
||||
# CONFIG_VIDEO_ET8EK8 is not set
|
||||
# CONFIG_VIDEO_M5MOLS is not set
|
||||
# end of Camera sensor devices
|
||||
|
||||
#
|
||||
# Lens drivers
|
||||
@ -5170,7 +5169,7 @@ CONFIG_DNOTIFY=y
|
||||
CONFIG_INOTIFY_USER=y
|
||||
CONFIG_FANOTIFY=y
|
||||
# CONFIG_QUOTA is not set
|
||||
CONFIG_AUTOFS4_FS=y
|
||||
# CONFIG_AUTOFS4_FS is not set
|
||||
CONFIG_AUTOFS_FS=y
|
||||
CONFIG_FUSE_FS=m
|
||||
# CONFIG_CUSE is not set
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 6.1.44 Kernel Configuration
|
||||
# Linux/arm 6.1.53 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@ -3114,11 +3114,14 @@ CONFIG_DVB_CORE=m
|
||||
# Video4Linux options
|
||||
#
|
||||
CONFIG_VIDEO_V4L2_I2C=y
|
||||
CONFIG_VIDEO_V4L2_SUBDEV_API=y
|
||||
# CONFIG_VIDEO_ADV_DEBUG is not set
|
||||
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
|
||||
CONFIG_VIDEO_TUNER=m
|
||||
CONFIG_V4L2_MEM2MEM_DEV=m
|
||||
# CONFIG_V4L2_FLASH_LED_CLASS is not set
|
||||
CONFIG_V4L2_FWNODE=m
|
||||
CONFIG_V4L2_ASYNC=m
|
||||
# end of Video4Linux options
|
||||
|
||||
#
|
||||
@ -3378,10 +3381,7 @@ CONFIG_MEDIA_ATTACH=y
|
||||
# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
|
||||
#
|
||||
CONFIG_VIDEO_IR_I2C=m
|
||||
|
||||
#
|
||||
# Camera sensor devices
|
||||
#
|
||||
CONFIG_VIDEO_CAMERA_SENSOR=y
|
||||
# CONFIG_VIDEO_AR0521 is not set
|
||||
# CONFIG_VIDEO_ARDUCAM_64MP is not set
|
||||
# CONFIG_VIDEO_ARDUCAM_PIVARIETY is not set
|
||||
@ -3454,7 +3454,6 @@ CONFIG_VIDEO_IR_I2C=m
|
||||
# CONFIG_VIDEO_CCS is not set
|
||||
# CONFIG_VIDEO_ET8EK8 is not set
|
||||
# CONFIG_VIDEO_M5MOLS is not set
|
||||
# end of Camera sensor devices
|
||||
|
||||
#
|
||||
# Lens drivers
|
||||
@ -5412,7 +5411,7 @@ CONFIG_DNOTIFY=y
|
||||
CONFIG_INOTIFY_USER=y
|
||||
CONFIG_FANOTIFY=y
|
||||
# CONFIG_QUOTA is not set
|
||||
CONFIG_AUTOFS4_FS=y
|
||||
# CONFIG_AUTOFS4_FS is not set
|
||||
CONFIG_AUTOFS_FS=y
|
||||
CONFIG_FUSE_FS=m
|
||||
# CONFIG_CUSE is not set
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 6.1.44 Kernel Configuration
|
||||
# Linux/arm64 6.1.53 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@ -3704,11 +3704,14 @@ CONFIG_DVB_CORE=m
|
||||
# Video4Linux options
|
||||
#
|
||||
CONFIG_VIDEO_V4L2_I2C=y
|
||||
CONFIG_VIDEO_V4L2_SUBDEV_API=y
|
||||
# CONFIG_VIDEO_ADV_DEBUG is not set
|
||||
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
|
||||
CONFIG_VIDEO_TUNER=m
|
||||
CONFIG_V4L2_MEM2MEM_DEV=m
|
||||
# CONFIG_V4L2_FLASH_LED_CLASS is not set
|
||||
CONFIG_V4L2_FWNODE=m
|
||||
CONFIG_V4L2_ASYNC=m
|
||||
# end of Video4Linux options
|
||||
|
||||
#
|
||||
@ -3972,10 +3975,7 @@ CONFIG_MEDIA_ATTACH=y
|
||||
# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
|
||||
#
|
||||
CONFIG_VIDEO_IR_I2C=m
|
||||
|
||||
#
|
||||
# Camera sensor devices
|
||||
#
|
||||
CONFIG_VIDEO_CAMERA_SENSOR=y
|
||||
# CONFIG_VIDEO_AR0521 is not set
|
||||
# CONFIG_VIDEO_ARDUCAM_64MP is not set
|
||||
# CONFIG_VIDEO_ARDUCAM_PIVARIETY is not set
|
||||
@ -4048,7 +4048,6 @@ CONFIG_VIDEO_IR_I2C=m
|
||||
# CONFIG_VIDEO_CCS is not set
|
||||
# CONFIG_VIDEO_ET8EK8 is not set
|
||||
# CONFIG_VIDEO_M5MOLS is not set
|
||||
# end of Camera sensor devices
|
||||
|
||||
#
|
||||
# Lens drivers
|
||||
@ -6146,7 +6145,7 @@ CONFIG_DNOTIFY=y
|
||||
CONFIG_INOTIFY_USER=y
|
||||
CONFIG_FANOTIFY=y
|
||||
# CONFIG_QUOTA is not set
|
||||
CONFIG_AUTOFS4_FS=y
|
||||
# CONFIG_AUTOFS4_FS is not set
|
||||
CONFIG_AUTOFS_FS=y
|
||||
CONFIG_FUSE_FS=m
|
||||
# CONFIG_CUSE is not set
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user