From 55c805ce9e9c0d89bca9171606f8be886d2d74ad Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 10 Feb 2025 20:21:42 +0300 Subject: [PATCH] sunxi-6.12: Switch to v6.12.13 Delete pre-applied ones and re-export patches. --- .../families/include/sunxi64_common.inc | 2 +- .../sources/families/include/sunxi_common.inc | 2 +- ...ipts-add-overlay-compilation-support.patch | 2 +- ...unxi-sun4i-spdif-add-mclk_multiplier.patch | 69 ------------------- ...tch-parent-of-MIPI-DSI-to-periph0-1x.patch | 6 +- .../kernel/archive/sunxi-6.12/series.armbian | 1 - patch/kernel/archive/sunxi-6.12/series.conf | 1 - 7 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 patch/kernel/archive/sunxi-6.12/patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index f0c38fd339..272d841b2a 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -36,7 +36,7 @@ case $BRANCH in edge) declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.12.12" + declare -g KERNELBRANCH="tag:v6.12.13" ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 28c2e23e02..c3b7ada166 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -37,7 +37,7 @@ case $BRANCH in edge) declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.12.12" + declare -g KERNELBRANCH="tag:v6.12.13" ;; esac diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/scripts-add-overlay-compilation-support.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/scripts-add-overlay-compilation-support.patch index f028dab715..e92af80c7a 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/scripts-add-overlay-compilation-support.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/scripts-add-overlay-compilation-support.patch @@ -66,7 +66,7 @@ index 111111111111..222222222222 100644 ifneq ($(obj),.) @@ -377,6 +380,15 @@ quiet_cmd_lz4_with_size = LZ4 $@ - cmd_lz4_with_size = { cat $(real-prereqs) | $(LZ4) -l -c1 stdin stdout; \ + cmd_lz4_with_size = { cat $(real-prereqs) | $(LZ4) -l -9 - -; \ $(size_append); } > $@ +# Fixup script mkimage provided by Armbian diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch deleted file mode 100644 index 8569430015..0000000000 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/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 - diff --git a/patch/kernel/archive/sunxi-6.12/patches.megous/clk-sunxi-ng-sun50i-a64-Switch-parent-of-MIPI-DSI-to-periph0-1x.patch b/patch/kernel/archive/sunxi-6.12/patches.megous/clk-sunxi-ng-sun50i-a64-Switch-parent-of-MIPI-DSI-to-periph0-1x.patch index fbba0e3414..8720048a64 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.megous/clk-sunxi-ng-sun50i-a64-Switch-parent-of-MIPI-DSI-to-periph0-1x.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.megous/clk-sunxi-ng-sun50i-a64-Switch-parent-of-MIPI-DSI-to-periph0-1x.patch @@ -32,7 +32,7 @@ index 111111111111..222222222222 100644 - writel(0x515, reg + SUN50I_A64_PLL_MIPI_REG); + ret = of_property_read_u32_index(of_chosen, "p-boot,framebuffer-start", 0, &val); + if (ret) { -+ writel(0x515, reg + SUN50I_A64_PLL_MIPI_REG); ++ writel(0x515, reg + SUN50I_A64_PLL_MIPI_REG); + + /* Set MIPI-DSI clock parent to periph0(1x), so that video0(1x) is free to change. */ + val = readl(reg + CCU_MIPI_DSI_CLK); @@ -41,8 +41,8 @@ index 111111111111..222222222222 100644 + writel(val, reg + CCU_MIPI_DSI_CLK); + } - /* Set PLL MIPI as parent for TCON0 */ - val = readl(reg + SUN50I_A64_TCON0_CLK_REG); + ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a64_ccu_desc); + if (ret) -- Armbian diff --git a/patch/kernel/archive/sunxi-6.12/series.armbian b/patch/kernel/archive/sunxi-6.12/series.armbian index c8a7f4fb08..59841b9e25 100644 --- a/patch/kernel/archive/sunxi-6.12/series.armbian +++ b/patch/kernel/archive/sunxi-6.12/series.armbian @@ -17,7 +17,6 @@ patches.armbian/drv-media-dvb-frontends-si2168-fix-cmd-timeout.patch patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifier.patch patches.armbian/drv-clocksource-arm_arch_timer-fix-a64-timejump.patch - patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch patches.armbian/sound-soc-sunxi-sun8i-codec-analog-enable-sound.patch patches.armbian/sound-soc-sunxi-Provoke-the-early-load-of-sun8i-codec-analog.patch patches.armbian/sound-soc-sunxi-sun4i-codec-adcis-select-capture-source.patch diff --git a/patch/kernel/archive/sunxi-6.12/series.conf b/patch/kernel/archive/sunxi-6.12/series.conf index 0102330411..c0bc934b2e 100644 --- a/patch/kernel/archive/sunxi-6.12/series.conf +++ b/patch/kernel/archive/sunxi-6.12/series.conf @@ -306,7 +306,6 @@ patches.armbian/drv-media-dvb-frontends-si2168-fix-cmd-timeout.patch patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifier.patch patches.armbian/drv-clocksource-arm_arch_timer-fix-a64-timejump.patch - patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch patches.armbian/sound-soc-sunxi-sun8i-codec-analog-enable-sound.patch patches.armbian/sound-soc-sunxi-Provoke-the-early-load-of-sun8i-codec-analog.patch patches.armbian/sound-soc-sunxi-sun4i-codec-adcis-select-capture-source.patch