From d48bc9e3f33d966fb422d700c01b959effe07c08 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 8 Feb 2025 14:43:07 +0000 Subject: [PATCH 1/2] Revert "Allwinner: linux: add Armbian H2+/H3 spdif patch" This reverts commit dd5cef26b41f3ae20daa580617e56cb81980ac84. included in linux-6.12.13 --- ...unxi-sun4i-spdif-add-mclk_multiplier.patch | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 projects/Allwinner/patches/linux/0099-sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch diff --git a/projects/Allwinner/patches/linux/0099-sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch b/projects/Allwinner/patches/linux/0099-sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch deleted file mode 100644 index 8569430015..0000000000 --- a/projects/Allwinner/patches/linux/0099-sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: The-going <48602507+The-going@users.noreply.github.com> -Date: Sun, 23 Jan 2022 22:22:39 +0300 -Subject: sound:soc:sunxi:sun4i-spdif add mclk_multiplier - ---- - sound/soc/sunxi/sun4i-spdif.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c -index 111111111111..222222222222 100644 ---- a/sound/soc/sunxi/sun4i-spdif.c -+++ b/sound/soc/sunxi/sun4i-spdif.c -@@ -176,6 +176,7 @@ struct sun4i_spdif_quirks { - unsigned int reg_dac_txdata; - bool has_reset; - unsigned int val_fctl_ftx; -+ unsigned int mclk_multiplier; - }; - - struct sun4i_spdif_dev { -@@ -313,6 +314,7 @@ static int sun4i_spdif_hw_params(struct snd_pcm_substream *substream, - default: - return -EINVAL; - } -+ mclk *= host->quirks->mclk_multiplier; - - ret = clk_set_rate(host->spdif_clk, mclk); - if (ret < 0) { -@@ -347,6 +349,7 @@ static int sun4i_spdif_hw_params(struct snd_pcm_substream *substream, - default: - return -EINVAL; - } -+ mclk_div *= host->quirks->mclk_multiplier; - - reg_val = 0; - reg_val |= SUN4I_SPDIF_TXCFG_ASS; -@@ -540,24 +543,28 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = { - static const struct sun4i_spdif_quirks sun4i_a10_spdif_quirks = { - .reg_dac_txdata = SUN4I_SPDIF_TXFIFO, - .val_fctl_ftx = SUN4I_SPDIF_FCTL_FTX, -+ .mclk_multiplier = 1, - }; - - static const struct sun4i_spdif_quirks sun6i_a31_spdif_quirks = { - .reg_dac_txdata = SUN4I_SPDIF_TXFIFO, - .val_fctl_ftx = SUN4I_SPDIF_FCTL_FTX, - .has_reset = true, -+ .mclk_multiplier = 1, - }; - - static const struct sun4i_spdif_quirks sun8i_h3_spdif_quirks = { - .reg_dac_txdata = SUN8I_SPDIF_TXFIFO, - .val_fctl_ftx = SUN4I_SPDIF_FCTL_FTX, - .has_reset = true, -+ .mclk_multiplier = 4, - }; - - static const struct sun4i_spdif_quirks sun50i_h6_spdif_quirks = { - .reg_dac_txdata = SUN8I_SPDIF_TXFIFO, - .val_fctl_ftx = SUN50I_H6_SPDIF_FCTL_FTX, - .has_reset = true, -+ .mclk_multiplier = 1, - }; - - static const struct of_device_id sun4i_spdif_of_match[] = { --- -Armbian - From e4c3743fe51825dc282f2f2582af54cebf6c9ca7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 8 Feb 2025 14:38:37 +0000 Subject: [PATCH 2/2] linux: update to 6.12.13 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index d6417c3ff3..efa9c02b19 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -30,8 +30,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="raspberrypi rtlwifi/6.13 rtlwifi/after-6.13" ;; *) - PKG_VERSION="6.12.12" - PKG_SHA256="e98942d17ef7063b3f2d6d7692bf24899e2e021cf832d19b55308ec8e8e08eff" + PKG_VERSION="6.12.13" + PKG_SHA256="f3ebdeea9e555b4cface44e29670056f4024541e6bd222fbcf776c818974fbba" PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default rtlwifi/6.13 rtlwifi/after-6.13" ;;