sunxi-6.12: Switching to v6.12.16. Re-export megous patches

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.13"
+		declare -g KERNELBRANCH="tag:v6.12.16"
 		;;
 esac
 

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.13"
+		declare -g KERNELBRANCH="tag:v6.12.16"
 		;;
 esac
 

patch/kernel/archive/sunxi-6.12/patches.megous/Revert-usb-typec-tcpm-unregister-existing-source-caps-before-re.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 657d4a240139087cf93d8880c9c87fd60cd0339d Mon Sep 17 00:00:00 2001
 From: Ondrej Jirman <[email protected]>
 Date: Tue, 7 May 2024 18:39:12 +0200
 Subject: Revert "usb: typec: tcpm: unregister existing source caps before
@@ -10,10 +10,10 @@ This reverts commit 230ecdf71a644c9c73e0e6735b33173074ae3f94.
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
-index 111111111111..222222222222 100644
+index 48ddf2770461..cd97f1118e08 100644
 --- a/drivers/usb/typec/tcpm/tcpm.c
 +++ b/drivers/usb/typec/tcpm/tcpm.c
-@@ -3005,7 +3005,7 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
+@@ -3007,7 +3007,7 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
  {
  	struct usb_power_delivery_desc desc = { port->negotiated_rev };
  	struct usb_power_delivery_capabilities_desc caps = { };
@@ -22,7 +22,7 @@ index 111111111111..222222222222 100644
 
  	if (!port->partner_pd)
  		port->partner_pd = usb_power_delivery_register(NULL, &desc);
-@@ -3015,11 +3015,6 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
+@@ -3017,11 +3017,6 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
  	memcpy(caps.pdo, port->source_caps, sizeof(u32) * port->nr_source_caps);
  	caps.role = TYPEC_SOURCE;
 
@@ -35,5 +35,5 @@ index 111111111111..222222222222 100644
  	if (IS_ERR(cap))
  		return PTR_ERR(cap);
 -- 
-Armbian
+2.35.3
 

patch/kernel/archive/sunxi-6.12/patches.megous/arm64-dts-allwinner-a64-Add-hdmi-sound-card.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From f297df8dec806b120400d21b036681e8fe8f14aa Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <[email protected]>
 Date: Sun, 9 May 2021 10:39:56 +0200
 Subject: arm64: dts: allwinner: a64: Add hdmi sound card
@@ -7,11 +7,11 @@ A64 supports HDMI audio. Add a sound card node for it.
 
 Signed-off-by: Jernej Skrabec <[email protected]>
 ---
- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 15 ++++++++++
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 111111111111..222222222222 100644
+index 0fecf0abb204..9a43bcc2f489 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
 @@ -196,6 +196,20 @@ link0_codec: codec {
@@ -35,7 +35,7 @@ index 111111111111..222222222222 100644
  	timer {
  		compatible = "arm,armv8-timer";
  		allwinner,erratum-unknown1;
-@@ -1259,6 +1273,7 @@ deinterlace: deinterlace@1e00000 {
+@@ -1261,6 +1275,7 @@ deinterlace: deinterlace@1e00000 {
  		};
 
  		hdmi: hdmi@1ee0000 {
@@ -44,5 +44,5 @@ index 111111111111..222222222222 100644
  				     "allwinner,sun8i-a83t-dw-hdmi";
  			reg = <0x01ee0000 0x10000>;
 -- 
-Armbian
+2.35.3
 

patch/kernel/archive/sunxi-6.12/patches.megous/arm64-dts-allwinner-a64-Fix-LRADC-compatible.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From dc003fff9853d2fdd4b227fffa74c685f1245e41 Mon Sep 17 00:00:00 2001
 From: Icenowy Zheng <[email protected]>
 Date: Sun, 30 Jun 2019 22:45:34 +0800
 Subject: arm64: dts: allwinner: a64: Fix LRADC compatible
@@ -15,10 +15,10 @@ Signed-off-by: Icenowy Zheng <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 111111111111..222222222222 100644
+index d53a6f7e086a..c061387abe41 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-@@ -919,7 +919,7 @@ spdif: spdif@1c21000 {
+@@ -921,7 +921,7 @@ spdif: spdif@1c21000 {
 
  		lradc: lradc@1c21800 {
  			compatible = "allwinner,sun50i-a64-lradc",
@@ -28,5 +28,5 @@ index 111111111111..222222222222 100644
  			interrupt-parent = <&r_intc>;
  			interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
 -- 
-Armbian
+2.35.3
 

patch/kernel/archive/sunxi-6.12/patches.megous/arm64-dts-sun50i-a64-Set-fifo-size-for-uarts.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From b971f78b354d42ce6bd04a2cb0e624109d840832 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <[email protected]>
 Date: Sat, 1 Feb 2020 23:41:18 +0100
 Subject: arm64: dts: sun50i-a64: Set fifo-size for uarts
@@ -11,42 +11,42 @@ Signed-off-by: Ondrej Jirman <[email protected]>
  1 file changed, 5 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-index 111111111111..222222222222 100644
+index 9a43bcc2f489..d53a6f7e086a 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-@@ -1010,6 +1010,7 @@ uart0: serial@1c28000 {
+@@ -1012,6 +1012,7 @@ uart0: serial@1c28000 {
  			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
  			reg-shift = <2>;
  			reg-io-width = <4>;
 +			fifo-size = <64>;
  			clocks = <&ccu CLK_BUS_UART0>;
  			resets = <&ccu RST_BUS_UART0>;
  			status = "disabled";
-@@ -1021,6 +1022,7 @@ uart1: serial@1c28400 {
+@@ -1023,6 +1024,7 @@ uart1: serial@1c28400 {
  			interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
  			reg-shift = <2>;
  			reg-io-width = <4>;
 +			fifo-size = <64>;
  			clocks = <&ccu CLK_BUS_UART1>;
  			resets = <&ccu RST_BUS_UART1>;
  			status = "disabled";
-@@ -1032,6 +1034,7 @@ uart2: serial@1c28800 {
+@@ -1034,6 +1036,7 @@ uart2: serial@1c28800 {
  			interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
  			reg-shift = <2>;
  			reg-io-width = <4>;
 +			fifo-size = <64>;
  			clocks = <&ccu CLK_BUS_UART2>;
  			resets = <&ccu RST_BUS_UART2>;
  			status = "disabled";
-@@ -1043,6 +1046,7 @@ uart3: serial@1c28c00 {
+@@ -1045,6 +1048,7 @@ uart3: serial@1c28c00 {
  			interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
  			reg-shift = <2>;
  			reg-io-width = <4>;
 +			fifo-size = <64>;
  			clocks = <&ccu CLK_BUS_UART3>;
  			resets = <&ccu RST_BUS_UART3>;
  			status = "disabled";
-@@ -1054,6 +1058,7 @@ uart4: serial@1c29000 {
+@@ -1056,6 +1060,7 @@ uart4: serial@1c29000 {
  			interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
  			reg-shift = <2>;
  			reg-io-width = <4>;
@@ -55,5 +55,5 @@ index 111111111111..222222222222 100644
  			resets = <&ccu RST_BUS_UART4>;
  			status = "disabled";
 -- 
-Armbian
+2.35.3
 

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

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 759d82cec7e69f734d67f6b5dc7493875d871d12 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <[email protected]>
 Date: Mon, 14 Aug 2023 07:28:11 +0200
 Subject: clk: sunxi-ng: sun50i-a64: Switch parent of MIPI-DSI to periph0(1x)
@@ -9,11 +9,11 @@ and HDMI output at once.
 
 Signed-off-by: Ondrej Jirman <[email protected]>
 ---
- drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 10 +++++++++-
- 1 file changed, 9 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 111111111111..222222222222 100644
+index 801a716d806d..f535c427fbad 100644
 --- a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c
 +++ b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c
 @@ -962,6 +962,8 @@ static struct ccu_mux_nb sun50i_a64_cpu_nb = {
@@ -44,5 +44,5 @@ index 111111111111..222222222222 100644
  	ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a64_ccu_desc);
  	if (ret)
 -- 
-Armbian
+2.35.3
 

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

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 9cecbf32cae8b640e7f338cfed6388471cb5e508 Mon Sep 17 00:00:00 2001
 From: Frank Oltmanns <[email protected]>
 Date: Sun, 10 Mar 2024 14:32:29 +0100
 Subject: drm/sun4i: tcon: Support keeping dclk rate upon ancestor clock
@@ -18,15 +18,15 @@ constraint.
 
 Signed-off-by: Frank Oltmanns <[email protected]>
 ---
- drivers/gpu/drm/sun4i/sun4i_tcon.c | 70 +++++++++-
- drivers/gpu/drm/sun4i/sun4i_tcon.h | 12 ++
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 70 +++++++++++++++++++++++++++---
+ drivers/gpu/drm/sun4i/sun4i_tcon.h | 12 +++++
  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 111111111111..222222222222 100644
+index b78799dedf62..3675c87461e9 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 111111111111..222222222222 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 111111111111..222222222222 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 111111111111..222222222222 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 111111111111..222222222222 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 111111111111..222222222222 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 111111111111..222222222222 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,18 +147,18 @@ index 111111111111..222222222222 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 111111111111..222222222222 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 */
 +	bool	restores_rate;   /* restores the initial rate when rate changes */
  	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[];
 
@@ -175,5 +175,5 @@ index 111111111111..222222222222 100644
 +
  #endif /* __SUN4I_TCON_H__ */
 -- 
-Armbian
+2.35.3
 

patch/kernel/archive/sunxi-6.12/patches.megous/media-ov5640-Add-read-only-property-for-vblank.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 095327be94ec7f073433536d12a2fdd736bff74b Mon Sep 17 00:00:00 2001
 From: Adam Pigg <[email protected]>
 Date: Thu, 29 Dec 2022 11:10:41 +0000
 Subject: media: ov5640: Add read-only property for vblank
@@ -8,10 +8,10 @@ Subject: media: ov5640: Add read-only property for vblank
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
-index 111111111111..222222222222 100644
+index c8027858dae1..f4978f01561b 100644
 --- a/drivers/media/i2c/ov5640.c
 +++ b/drivers/media/i2c/ov5640.c
-@@ -3845,6 +3845,7 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
+@@ -3846,6 +3846,7 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
  	ctrls->pixel_rate->flags |= V4L2_CTRL_FLAG_READ_ONLY;
  	ctrls->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
  	ctrls->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
@@ -20,5 +20,5 @@ index 111111111111..222222222222 100644
  	ctrls->exposure->flags |= V4L2_CTRL_FLAG_VOLATILE;
 
 -- 
-Armbian
+2.35.3