From 0f6f03da2c3128360b14a3526f66deb7a6667a87 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 15 Sep 2023 12:11:32 +0200 Subject: [PATCH] linux (RPi): update to 6.1.53-e079555 Drop hdmi-codec patch as it's now in RPi kernel Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 +- ...dec-Fix-broken-channel-map-reporting.patch | 52 ------------------- 2 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 packages/linux/patches/raspberrypi/linux-022-ASoC-hdmi-codec-Fix-broken-channel-map-reporting.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 392ae83439..e6168d2f58 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="ba774164c90ffbb005bed333e278b32c607e0bc6" # 6.1.52 - PKG_SHA256="9f994ade0a38ac6859bab811ceaf8c1c5583bb634fb338dbc597168db92c5158" + PKG_VERSION="e079555a4c68356e58249cfc041b28f6eb455bd5" # 6.1.53 + PKG_SHA256="32a2fb023a5e81f9fd5ed89db587007d733394fc1969271287a6610c7bb28823" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; diff --git a/packages/linux/patches/raspberrypi/linux-022-ASoC-hdmi-codec-Fix-broken-channel-map-reporting.patch b/packages/linux/patches/raspberrypi/linux-022-ASoC-hdmi-codec-Fix-broken-channel-map-reporting.patch deleted file mode 100644 index cd46cc1b21..0000000000 --- a/packages/linux/patches/raspberrypi/linux-022-ASoC-hdmi-codec-Fix-broken-channel-map-reporting.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a154f37e6803ffeb77156ba2c3e23c00c511c60d Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -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 ---- - 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 -