qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sunxi-6.13: Switching to v6.13.6

This commit is contained in:
The-going 2025-03-10 18:54:05 +03:00 committed by Igor
parent b7f8bf1ee2
commit eb14fbdc83
5 changed files with 22 additions and 22 deletions
Show Stats 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) edge)
declare -g KERNEL_MAJOR_MINOR="6.13" # Major and minor versions of this kernel. declare -g KERNEL_MAJOR_MINOR="6.13" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.13.5" declare -g KERNELBRANCH="tag:v6.13.6"
;; ;;
esac esac

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

@ -37,7 +37,7 @@ case $BRANCH in
edge) edge)
declare -g KERNEL_MAJOR_MINOR="6.13" # Major and minor versions of this kernel. declare -g KERNEL_MAJOR_MINOR="6.13" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.13.5" declare -g KERNELBRANCH="tag:v6.13.6"
;; ;;
esac esac

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

@ -1,4 +1,4 @@
From 9448344e45c8df22db00c14491d18728b6e43bbd Mon Sep 17 00:00:00 2001 From 02f65cebb748acb2ae4fe5eb6750c8d18827aa3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz> From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Mon, 14 Aug 2023 07:28:11 +0200 Date: Mon, 14 Aug 2023 07:28:11 +0200
Subject: clk: sunxi-ng: sun50i-a64: Switch parent of MIPI-DSI to periph0(1x) Subject: clk: sunxi-ng: sun50i-a64: Switch parent of MIPI-DSI to periph0(1x)
@ -9,8 +9,8 @@ and HDMI output at once.
Signed-off-by: Ondrej Jirman <megi@xff.cz> Signed-off-by: Ondrej Jirman <megi@xff.cz>
--- ---
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 11 ++++++++++- drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 13 ++++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-) 1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c
index 4b3068bdfdf2..e76a1c10f390 100644 index 4b3068bdfdf2..e76a1c10f390 100644

24
patch/kernel/archive/sunxi-6.13/patches.megous/drm-sun4i-tcon-Support-keeping-dclk-rate-upon-ancestor-clock-ch.patch
View File

@ -1,4 +1,4 @@
From e059bfffce9f61ed77f34709de676c4227b70c18 Mon Sep 17 00:00:00 2001 From 1a3f11b7d74f011dbd79f0712a1c6f12dd6ea632 Mon Sep 17 00:00:00 2001
From: Frank Oltmanns <frank@oltmanns.dev> From: Frank Oltmanns <frank@oltmanns.dev>
Date: Sun, 10 Mar 2024 14:32:29 +0100 Date: Sun, 10 Mar 2024 14:32:29 +0100
Subject: drm/sun4i: tcon: Support keeping dclk rate upon ancestor clock Subject: drm/sun4i: tcon: Support keeping dclk rate upon ancestor clock
@ -23,10 +23,10 @@ Signed-off-by: Frank Oltmanns <frank@oltmanns.dev>
2 files changed, 76 insertions(+), 6 deletions(-) 2 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index b36c1ea0948c..221df37406d8 100644 index fca95b76e258..0a493142b100 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -110,9 +110,11 @@ static void sun4i_tcon_channel_set_status(struct sun4i_tcon *tcon, int channel, @@ -108,9 +108,11 @@ static void sun4i_tcon_channel_set_status(struct sun4i_tcon *tcon, int channel,
if (enabled) { if (enabled) {
clk_prepare_enable(clk); clk_prepare_enable(clk);
@ -40,7 +40,7 @@ index b36c1ea0948c..221df37406d8 100644
clk_disable_unprepare(clk); clk_disable_unprepare(clk);
} }
} }
@@ -373,6 +375,53 @@ static void sun4i_tcon0_mode_set_dithering(struct sun4i_tcon *tcon, @@ -343,6 +345,53 @@ static void sun4i_tcon0_mode_set_dithering(struct sun4i_tcon *tcon,
regmap_write(tcon->regs, SUN4I_TCON_FRM_CTL_REG, val); regmap_write(tcon->regs, SUN4I_TCON_FRM_CTL_REG, val);
} }
@ -94,7 +94,7 @@ index b36c1ea0948c..221df37406d8 100644
static void sun4i_tcon0_mode_set_cpu(struct sun4i_tcon *tcon, static void sun4i_tcon0_mode_set_cpu(struct sun4i_tcon *tcon,
const struct drm_encoder *encoder, const struct drm_encoder *encoder,
const struct drm_display_mode *mode) const struct drm_display_mode *mode)
@@ -390,8 +439,8 @@ static void sun4i_tcon0_mode_set_cpu(struct sun4i_tcon *tcon, @@ -360,8 +409,8 @@ static void sun4i_tcon0_mode_set_cpu(struct sun4i_tcon *tcon,
*/ */
tcon->dclk_min_div = SUN6I_DSI_TCON_DIV; tcon->dclk_min_div = SUN6I_DSI_TCON_DIV;
tcon->dclk_max_div = SUN6I_DSI_TCON_DIV; tcon->dclk_max_div = SUN6I_DSI_TCON_DIV;
@ -105,7 +105,7 @@ index b36c1ea0948c..221df37406d8 100644
/* Set the resolution */ /* Set the resolution */
regmap_write(tcon->regs, SUN4I_TCON0_BASIC0_REG, regmap_write(tcon->regs, SUN4I_TCON0_BASIC0_REG,
@@ -464,7 +513,7 @@ static void sun4i_tcon0_mode_set_lvds(struct sun4i_tcon *tcon, @@ -434,7 +483,7 @@ static void sun4i_tcon0_mode_set_lvds(struct sun4i_tcon *tcon,
tcon->dclk_min_div = 7; tcon->dclk_min_div = 7;
tcon->dclk_max_div = 7; tcon->dclk_max_div = 7;
@ -114,7 +114,7 @@ index b36c1ea0948c..221df37406d8 100644
/* Set the resolution */ /* Set the resolution */
regmap_write(tcon->regs, SUN4I_TCON0_BASIC0_REG, regmap_write(tcon->regs, SUN4I_TCON0_BASIC0_REG,
@@ -548,7 +597,7 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon, @@ -518,7 +567,7 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
tcon->dclk_min_div = tcon->quirks->dclk_min_div; tcon->dclk_min_div = tcon->quirks->dclk_min_div;
tcon->dclk_max_div = 127; tcon->dclk_max_div = 127;
@ -123,7 +123,7 @@ index b36c1ea0948c..221df37406d8 100644
/* Set the resolution */ /* Set the resolution */
regmap_write(tcon->regs, SUN4I_TCON0_BASIC0_REG, regmap_write(tcon->regs, SUN4I_TCON0_BASIC0_REG,
@@ -1561,6 +1610,14 @@ static const struct sun4i_tcon_quirks sun8i_a33_quirks = { @@ -1505,6 +1554,14 @@ static const struct sun4i_tcon_quirks sun8i_a33_quirks = {
.supports_lvds = true, .supports_lvds = true,
}; };
@ -138,7 +138,7 @@ index b36c1ea0948c..221df37406d8 100644
static const struct sun4i_tcon_quirks sun8i_a83t_lcd_quirks = { static const struct sun4i_tcon_quirks sun8i_a83t_lcd_quirks = {
.supports_lvds = true, .supports_lvds = true,
.has_channel_0 = true, .has_channel_0 = true,
@@ -1619,6 +1676,7 @@ const struct of_device_id sun4i_tcon_of_table[] = { @@ -1563,6 +1620,7 @@ const struct of_device_id sun4i_tcon_of_table[] = {
{ .compatible = "allwinner,sun9i-a80-tcon-tv", .data = &sun9i_a80_tcon_tv_quirks }, { .compatible = "allwinner,sun9i-a80-tcon-tv", .data = &sun9i_a80_tcon_tv_quirks },
{ .compatible = "allwinner,sun20i-d1-tcon-lcd", .data = &sun20i_d1_lcd_quirks }, { .compatible = "allwinner,sun20i-d1-tcon-lcd", .data = &sun20i_d1_lcd_quirks },
{ .compatible = "allwinner,sun20i-d1-tcon-tv", .data = &sun8i_r40_tv_quirks }, { .compatible = "allwinner,sun20i-d1-tcon-tv", .data = &sun8i_r40_tv_quirks },
@ -147,10 +147,10 @@ index b36c1ea0948c..221df37406d8 100644
}; };
MODULE_DEVICE_TABLE(of, sun4i_tcon_of_table); MODULE_DEVICE_TABLE(of, sun4i_tcon_of_table);
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.h b/drivers/gpu/drm/sun4i/sun4i_tcon.h diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.h b/drivers/gpu/drm/sun4i/sun4i_tcon.h
index 864d70b9d242..729d64b78846 100644 index fa23aa23fe4a..bd4abc90062b 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.h --- a/drivers/gpu/drm/sun4i/sun4i_tcon.h
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h
@@ -250,6 +250,7 @@ struct sun4i_tcon_quirks { @@ -243,6 +243,7 @@ struct sun4i_tcon_quirks {
bool needs_edp_reset; /* a80 edp reset needed for tcon0 access */ bool needs_edp_reset; /* a80 edp reset needed for tcon0 access */
bool supports_lvds; /* Does the TCON support an LVDS output? */ bool supports_lvds; /* Does the TCON support an LVDS output? */
bool polarity_in_ch0; /* some tcon1 channels have polarity bits in tcon0 pol register */ bool polarity_in_ch0; /* some tcon1 channels have polarity bits in tcon0 pol register */
@ -158,7 +158,7 @@ index 864d70b9d242..729d64b78846 100644
u8 dclk_min_div; /* minimum divider for TCON0 DCLK */ u8 dclk_min_div; /* minimum divider for TCON0 DCLK */
/* callback to handle tcon muxing options */ /* callback to handle tcon muxing options */
@@ -312,4 +313,15 @@ void sun4i_tcon_enable_gamma(struct sun4i_tcon *tcon, bool enable); @@ -300,4 +301,15 @@ void sun4i_tcon_set_status(struct sun4i_tcon *crtc,
extern const struct of_device_id sun4i_tcon_of_table[]; extern const struct of_device_id sun4i_tcon_of_table[];

10
patch/kernel/archive/sunxi-6.13/patches.megous/sunxi-Use-dev_err_probe-to-handle-EPROBE_DEFER-errors.patch
View File

@ -1,4 +1,4 @@
From 3fd8464b88bccb9dabe04e75b97011b10b2cbbe6 Mon Sep 17 00:00:00 2001 From 7429dd30ff99afa75bc65907d694bd546e195dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz> From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Date: Mon, 2 Sep 2019 14:51:17 +0200 Date: Mon, 2 Sep 2019 14:51:17 +0200
Subject: sunxi: Use dev_err_probe to handle EPROBE_DEFER errors Subject: sunxi: Use dev_err_probe to handle EPROBE_DEFER errors
@ -28,10 +28,10 @@ index 2336ee2aa44a..20efde3cb1c2 100644
} }
diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
index 8e359c9e0a09..ff6871e93730 100644 index 6d3ad83be141..18afc2aff29c 100644
--- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c --- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c
+++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c +++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
@@ -904,7 +904,7 @@ static int st7703_probe(struct mipi_dsi_device *dsi) @@ -887,7 +887,7 @@ static int st7703_probe(struct mipi_dsi_device *dsi)
ret = mipi_dsi_attach(dsi); ret = mipi_dsi_attach(dsi);
if (ret < 0) { if (ret < 0) {
@ -124,10 +124,10 @@ index 3829c79871e0..eb1f846f4988 100644
} }
diff --git a/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c b/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c diff --git a/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c b/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c
index a19a27cea860..0107514e7d2b 100644 index 36eab95271b2..f83df7554aac 100644
--- a/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c --- a/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c
+++ b/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c +++ b/drivers/phy/allwinner/phy-sun6i-mipi-dphy.c
@@ -584,13 +584,15 @@ static int sun6i_dphy_probe(struct platform_device *pdev) @@ -570,13 +570,15 @@ static int sun6i_dphy_probe(struct platform_device *pdev)
dphy->regs = devm_regmap_init_mmio_clk(&pdev->dev, "bus", dphy->regs = devm_regmap_init_mmio_clk(&pdev->dev, "bus",
regs, &sun6i_dphy_regmap_config); regs, &sun6i_dphy_regmap_config);
if (IS_ERR(dphy->regs)) { if (IS_ERR(dphy->regs)) {