From ddb8089a96da32e39a0756170f863265d66c27f6 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sat, 3 May 2025 11:39:42 +0300 Subject: [PATCH] sunxi-6.14: Swtching to v6.14.5 and re-export patches --- .../families/include/sunxi64_common.inc | 2 +- .../sources/families/include/sunxi_common.inc | 2 +- ...tch-parent-of-MIPI-DSI-to-periph0-1x.patch | 6 ++--- ...etected-CPU-bin-for-easier-debugging.patch | 6 ++--- ...ing-dclk-rate-upon-ancestor-clock-ch.patch | 24 +++++++++---------- ...2145-Galaxycore-camera-module-driver.patch | 6 ++--- ...river-for-Himax-HM5065-camera-sensor.patch | 6 ++--- ..._probe-to-handle-EPROBE_DEFER-errors.patch | 10 ++++---- ...set_resume-callback-for-WWAN-devices.patch | 6 ++--- 9 files changed, 34 insertions(+), 34 deletions(-) diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 999fcaec4..60f13316b 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.14" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.14.4" + declare -g KERNELBRANCH="tag:v6.14.5" ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 6eea68583..56430d14b 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.14" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.14.4" + declare -g KERNELBRANCH="tag:v6.14.5" ;; esac diff --git a/patch/kernel/archive/sunxi-6.14/patches.megous/clk-sunxi-ng-sun50i-a64-Switch-parent-of-MIPI-DSI-to-periph0-1x.patch b/patch/kernel/archive/sunxi-6.14/patches.megous/clk-sunxi-ng-sun50i-a64-Switch-parent-of-MIPI-DSI-to-periph0-1x.patch index b12fb911e..d754dc1ac 100644 --- a/patch/kernel/archive/sunxi-6.14/patches.megous/clk-sunxi-ng-sun50i-a64-Switch-parent-of-MIPI-DSI-to-periph0-1x.patch +++ b/patch/kernel/archive/sunxi-6.14/patches.megous/clk-sunxi-ng-sun50i-a64-Switch-parent-of-MIPI-DSI-to-periph0-1x.patch @@ -1,4 +1,4 @@ -From 99e1ff82c84ee35099cd1dade28df0c963fdbf20 Mon Sep 17 00:00:00 2001 +From ca29006df14a1f3d0f292e207753bd5925604259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Mon, 14 Aug 2023 07:28:11 +0200 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 --- - drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 13 ++++++++++++- + 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 index 4b3068bdfdf2..e76a1c10f390 100644 diff --git a/patch/kernel/archive/sunxi-6.14/patches.megous/cpufreq-sun50i-Show-detected-CPU-bin-for-easier-debugging.patch b/patch/kernel/archive/sunxi-6.14/patches.megous/cpufreq-sun50i-Show-detected-CPU-bin-for-easier-debugging.patch index 208baf6df..491989f8f 100644 --- a/patch/kernel/archive/sunxi-6.14/patches.megous/cpufreq-sun50i-Show-detected-CPU-bin-for-easier-debugging.patch +++ b/patch/kernel/archive/sunxi-6.14/patches.megous/cpufreq-sun50i-Show-detected-CPU-bin-for-easier-debugging.patch @@ -1,4 +1,4 @@ -From 2489a1cedce4d285ac0f18f5ff39ecb07e178f4a Mon Sep 17 00:00:00 2001 +From dd65bf79988be12849efef080d4ecb86e225cd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Thu, 31 Oct 2019 18:31:32 +0100 Subject: cpufreq: sun50i: Show detected CPU bin, for easier debugging @@ -12,10 +12,10 @@ Signed-off-by: Ondrej Jirman 1 file changed, 2 insertions(+) diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c -index 47d6840b3489..8992d281a818 100644 +index 744312a44279..d8c1be2b30fb 100644 --- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c +++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c -@@ -262,6 +262,8 @@ static int sun50i_cpufreq_nvmem_probe(struct platform_device *pdev) +@@ -268,6 +268,8 @@ static int sun50i_cpufreq_nvmem_probe(struct platform_device *pdev) snprintf(name, sizeof(name), "speed%d", speed); config.prop_name = name; diff --git a/patch/kernel/archive/sunxi-6.14/patches.megous/drm-sun4i-tcon-Support-keeping-dclk-rate-upon-ancestor-clock-ch.patch b/patch/kernel/archive/sunxi-6.14/patches.megous/drm-sun4i-tcon-Support-keeping-dclk-rate-upon-ancestor-clock-ch.patch index cbfa0952d..733079732 100644 --- a/patch/kernel/archive/sunxi-6.14/patches.megous/drm-sun4i-tcon-Support-keeping-dclk-rate-upon-ancestor-clock-ch.patch +++ b/patch/kernel/archive/sunxi-6.14/patches.megous/drm-sun4i-tcon-Support-keeping-dclk-rate-upon-ancestor-clock-ch.patch @@ -1,4 +1,4 @@ -From 47d49fbc4a674b45279c3dbc20ab911e3ea470fe Mon Sep 17 00:00:00 2001 +From acc83b9c1798eb38d27e8bb273d5fd1f79f8c33a Mon Sep 17 00:00:00 2001 From: Frank Oltmanns Date: Sun, 10 Mar 2024 14:32:29 +0100 Subject: drm/sun4i: tcon: Support keeping dclk rate upon ancestor clock @@ -23,10 +23,10 @@ Signed-off-by: Frank Oltmanns 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 -index b36c1ea0948c..221df37406d8 100644 +index fca95b76e258..0a493142b100 100644 --- a/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) { clk_prepare_enable(clk); @@ -40,7 +40,7 @@ index b36c1ea0948c..221df37406d8 100644 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); } @@ -94,7 +94,7 @@ index b36c1ea0948c..221df37406d8 100644 static void sun4i_tcon0_mode_set_cpu(struct sun4i_tcon *tcon, const struct drm_encoder *encoder, 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_max_div = SUN6I_DSI_TCON_DIV; @@ -105,7 +105,7 @@ index b36c1ea0948c..221df37406d8 100644 /* Set the resolution */ 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_max_div = 7; @@ -114,7 +114,7 @@ index b36c1ea0948c..221df37406d8 100644 /* Set the resolution */ 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_max_div = 127; @@ -123,7 +123,7 @@ index b36c1ea0948c..221df37406d8 100644 /* Set the resolution */ 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, }; @@ -138,7 +138,7 @@ index b36c1ea0948c..221df37406d8 100644 static const struct sun4i_tcon_quirks sun8i_a83t_lcd_quirks = { .supports_lvds = 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,sun20i-d1-tcon-lcd", .data = &sun20i_d1_lcd_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); 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 +++ 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 supports_lvds; /* Does the TCON support an LVDS output? */ 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 */ /* 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[]; diff --git a/patch/kernel/archive/sunxi-6.14/patches.megous/media-gc2145-Galaxycore-camera-module-driver.patch b/patch/kernel/archive/sunxi-6.14/patches.megous/media-gc2145-Galaxycore-camera-module-driver.patch index 8c14e25c5..3ea449ebe 100644 --- a/patch/kernel/archive/sunxi-6.14/patches.megous/media-gc2145-Galaxycore-camera-module-driver.patch +++ b/patch/kernel/archive/sunxi-6.14/patches.megous/media-gc2145-Galaxycore-camera-module-driver.patch @@ -1,4 +1,4 @@ -From 3226585412fac36bbcb0dc88f54020aeb25feadb Mon Sep 17 00:00:00 2001 +From 57c06d951021ac23bc4850ca6bbf1513848a6a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Tue, 23 Jun 2020 19:51:18 +0200 Subject: media: gc2145: Galaxycore camera module driver @@ -14,10 +14,10 @@ Signed-off-by: Ondrej Jirman create mode 100644 drivers/media/i2c/gc2145.c diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 43be07cc5b37..2b3b4635c2f0 100644 +index 0cc793fc7910..017d993a8c49 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig -@@ -711,6 +711,16 @@ config VIDEO_HM5065 +@@ -712,6 +712,16 @@ config VIDEO_HM5065 This is a V4L2 sensor-level driver for Himax HM5065 5 Mpixel camera. diff --git a/patch/kernel/archive/sunxi-6.14/patches.megous/media-hm5065-Add-subdev-driver-for-Himax-HM5065-camera-sensor.patch b/patch/kernel/archive/sunxi-6.14/patches.megous/media-hm5065-Add-subdev-driver-for-Himax-HM5065-camera-sensor.patch index 9b7294ef1..a9b0d8c5a 100644 --- a/patch/kernel/archive/sunxi-6.14/patches.megous/media-hm5065-Add-subdev-driver-for-Himax-HM5065-camera-sensor.patch +++ b/patch/kernel/archive/sunxi-6.14/patches.megous/media-hm5065-Add-subdev-driver-for-Himax-HM5065-camera-sensor.patch @@ -1,4 +1,4 @@ -From b6f1f790b9f8dafcf115391cb36d80c8d7b75fb2 Mon Sep 17 00:00:00 2001 +From 198b881fede9a9acae6cf9dc4e100735985e2785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Sat, 30 Sep 2017 02:39:48 +0200 Subject: media: hm5065: Add subdev driver for Himax HM5065 camera sensor @@ -21,10 +21,10 @@ Signed-off-by: Ondrej Jirman create mode 100644 drivers/media/i2c/hm5065.c diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 8ba096b8ebca..e7da18f3da3c 100644 +index 85ecb2aeefdb..2be73870045c 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig -@@ -701,6 +701,16 @@ config VIDEO_VGXY61 +@@ -702,6 +702,16 @@ config VIDEO_VGXY61 source "drivers/media/i2c/ccs/Kconfig" source "drivers/media/i2c/et8ek8/Kconfig" diff --git a/patch/kernel/archive/sunxi-6.14/patches.megous/sunxi-Use-dev_err_probe-to-handle-EPROBE_DEFER-errors.patch b/patch/kernel/archive/sunxi-6.14/patches.megous/sunxi-Use-dev_err_probe-to-handle-EPROBE_DEFER-errors.patch index 7ae868ce5..34bc969e9 100644 --- a/patch/kernel/archive/sunxi-6.14/patches.megous/sunxi-Use-dev_err_probe-to-handle-EPROBE_DEFER-errors.patch +++ b/patch/kernel/archive/sunxi-6.14/patches.megous/sunxi-Use-dev_err_probe-to-handle-EPROBE_DEFER-errors.patch @@ -1,4 +1,4 @@ -From d4a21d660b3fd92157aef4a08d0451c171c529e9 Mon Sep 17 00:00:00 2001 +From a30a50421a3d54842e8f42974617c24aa7512fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Mon, 2 Sep 2019 14:51:17 +0200 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 -index 8e359c9e0a09..ff6871e93730 100644 +index 6d3ad83be141..18afc2aff29c 100644 --- a/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); if (ret < 0) { @@ -124,10 +124,10 @@ index 3a42865f9a5b..3d8d94594bc5 100644 } 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 +++ 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", regs, &sun6i_dphy_regmap_config); if (IS_ERR(dphy->regs)) { diff --git a/patch/kernel/archive/sunxi-6.14/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch b/patch/kernel/archive/sunxi-6.14/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch index 9001f922a..6bba1f6bd 100644 --- a/patch/kernel/archive/sunxi-6.14/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch +++ b/patch/kernel/archive/sunxi-6.14/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch @@ -1,4 +1,4 @@ -From 0e8b72e264443819a1e8674ac9318ec382c84050 Mon Sep 17 00:00:00 2001 +From cf701dfb5650ddb3cd4b83baa0715c6cb7c3fc5e Mon Sep 17 00:00:00 2001 From: Thomas Thorne Date: Tue, 20 Sep 2022 20:34:57 -0400 Subject: usb: serial: option: add 'reset_resume' callback for WWAN devices @@ -17,10 +17,10 @@ However the rest of the patch is not needed/already upstreamed. 1 file changed, 1 insertion(+) diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c -index 5cd26dac2069..f65c1d78a2cc 100644 +index 27879cc57536..4adc2f535ce4 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -2471,6 +2471,7 @@ static struct usb_serial_driver option_1port_device = { +@@ -2474,6 +2474,7 @@ static struct usb_serial_driver option_1port_device = { #ifdef CONFIG_PM .suspend = usb_wwan_suspend, .resume = usb_wwan_resume,