JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

sunxi-6.12: Switch to v6.12.13

Browse Source 
Delete pre-applied ones and re-export patches.
This commit is contained in:
The-going
2025-02-10 20:21:42 +03:00
committed by Igor
parent 781550decf
commit 55c805ce9e
7 changed files with 6 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/sources/families/include/sunxi64_common.inc
View File

@@ -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

2
config/sources/families/include/sunxi_common.inc
View File

@@ -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

2
patch/kernel/archive/sunxi-6.12/patches.armbian/scripts-add-overlay-compilation-support.patch
View File

@@ -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

69
patch/kernel/archive/sunxi-6.12/patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch
View File

@@ -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

6
patch/kernel/archive/sunxi-6.12/patches.megous/clk-sunxi-ng-sun50i-a64-Switch-parent-of-MIPI-DSI-to-periph0-1x.patch
View File

@@ -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

1
patch/kernel/archive/sunxi-6.12/series.armbian
View File

@@ -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

1
patch/kernel/archive/sunxi-6.12/series.conf
View File

@@ -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