sunxi 6.12: Switch to v6.12.9

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

patch/kernel/archive/sunxi-6.12/patches.armbian/ASoC-AC200-Initial-driver.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From aed3ef1a2bc21b7b6341a6454487fbade8499aab Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <[email protected]>
 Date: Thu, 1 Sep 2022 17:36:53 +0200
 Subject: ASoC: AC200: Initial driver
@@ -7,11 +7,12 @@ Signed-off-by: Jernej Skrabec <[email protected]>
 ---
  sound/soc/codecs/Kconfig  |  10 +
  sound/soc/codecs/Makefile |   2 +
- sound/soc/codecs/ac200.c  | 772 ++++++++++
+ sound/soc/codecs/ac200.c  | 772 ++++++++++++++++++++++++++++++++++++++
  3 files changed, 784 insertions(+)
+ create mode 100644 sound/soc/codecs/ac200.c
 
 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index 111111111111..222222222222 100644
+index 602a815dfaee..d61b8abcdcbf 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
 @@ -16,6 +16,7 @@ config SND_SOC_ALL_CODECS
@@ -39,7 +40,7 @@ index 111111111111..222222222222 100644
  	tristate "Build generic ASoC AC97 CODEC driver"
  	select SND_AC97_CODEC
 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index 111111111111..222222222222 100644
+index 76db4d730730..850c2f1c5070 100644
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
 @@ -1,6 +1,7 @@
@@ -60,7 +61,7 @@ index 111111111111..222222222222 100644
  obj-$(CONFIG_SND_SOC_AD193X)	+= snd-soc-ad193x.o
 diff --git a/sound/soc/codecs/ac200.c b/sound/soc/codecs/ac200.c
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..662de230dc83
 --- /dev/null
 +++ b/sound/soc/codecs/ac200.c
 @@ -0,0 +1,772 @@
@@ -837,5 +838,5 @@ index 000000000000..111111111111
 +MODULE_AUTHOR("Jernej Skrabec <[email protected]>");
 +MODULE_LICENSE("GPL");
 -- 
-Armbian
+2.35.3
 

patch/kernel/archive/sunxi-6.12/patches.armbian/Add-FB_TFT-ST7796S-driver.patch

@@ -1,16 +1,17 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 9fb2fda6cf1f8cc66d1c17453f83b3e0b677a41e Mon Sep 17 00:00:00 2001
 From: Alan <Alan>
 Date: Sat, 20 May 2023 14:33:52 +0800
 Subject: Add: FB_TFT ST7796S driver
 
 ---
- drivers/staging/fbtft/Kconfig      |  10 +
+ drivers/staging/fbtft/Kconfig      |  10 +++
  drivers/staging/fbtft/Makefile     |   1 +
- drivers/staging/fbtft/fb_st7796s.c | 100 ++++++++++
+ drivers/staging/fbtft/fb_st7796s.c | 100 +++++++++++++++++++++++++++++
  3 files changed, 111 insertions(+)
+ create mode 100644 drivers/staging/fbtft/fb_st7796s.c
 
 diff --git a/drivers/staging/fbtft/Kconfig b/drivers/staging/fbtft/Kconfig
-index 111111111111..222222222222 100644
+index 77ab44362f16..107065985eb4 100644
 --- a/drivers/staging/fbtft/Kconfig
 +++ b/drivers/staging/fbtft/Kconfig
 @@ -168,6 +168,16 @@ config FB_TFT_ST7789V
@@ -31,7 +32,7 @@ index 111111111111..222222222222 100644
  	tristate "FB driver for tinylcd.com display"
  	depends on FB_TFT
 diff --git a/drivers/staging/fbtft/Makefile b/drivers/staging/fbtft/Makefile
-index 111111111111..222222222222 100644
+index e9cdf0f0a7da..7b2098b8a1bd 100644
 --- a/drivers/staging/fbtft/Makefile
 +++ b/drivers/staging/fbtft/Makefile
 @@ -31,6 +31,7 @@ obj-$(CONFIG_FB_TFT_SSD1331)     += fb_ssd1331.o
@@ -44,7 +45,7 @@ index 111111111111..222222222222 100644
  obj-$(CONFIG_FB_TFT_UC1611)      += fb_uc1611.o
 diff --git a/drivers/staging/fbtft/fb_st7796s.c b/drivers/staging/fbtft/fb_st7796s.c
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..cad489cef595
 --- /dev/null
 +++ b/drivers/staging/fbtft/fb_st7796s.c
 @@ -0,0 +1,100 @@
@@ -149,5 +150,5 @@ index 000000000000..111111111111
 +MODULE_AUTHOR("Alan Ma");
 +MODULE_LICENSE("GPL");
 -- 
-Armbian
+2.35.3
 

patch/kernel/archive/sunxi-6.12/patches.armbian/Add-board-BananaPi-BPI-M4-Zero.patch

@@ -1,7 +1,7 @@
-From 0db8b2bef6fdd2bda67296809de46ad57e08ab00 Mon Sep 17 00:00:00 2001
+From 4c92bf1cdc05ee6b7426c2450e9dcd6ffebad533 Mon Sep 17 00:00:00 2001
 From: Patrick Yavitz <[email protected]>
 Date: Tue, 7 Jan 2025 06:58:55 -0500
-Subject: [PATCH] Add board BananaPi BPI-M4-Zero
+Subject: Add board BananaPi BPI-M4-Zero
 
 Signed-off-by: Patrick Yavitz <[email protected]>
 ---
@@ -13,10 +13,10 @@ Signed-off-by: Patrick Yavitz <[email protected]>
  create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
 
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 87ecd81bcb9f..0a206c422625 100644
+index 67f738f9b513..a676c57aad1d 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
-@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-emmc.dtb
+@@ -59,6 +59,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-emmc.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-pi.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.dtb
@@ -26,7 +26,7 @@ index 87ecd81bcb9f..0a206c422625 100644
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero3.dtb
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts
 new file mode 100644
-index 000000000000..73da25a79fdd
+index 000000000000..46e07893c653
 --- /dev/null
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts
 @@ -0,0 +1,110 @@
@@ -142,7 +142,7 @@ index 000000000000..73da25a79fdd
 +};
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
 new file mode 100644
-index 000000000000..32359f169124
+index 000000000000..e9640439e02c
 --- /dev/null
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
 @@ -0,0 +1,256 @@
@@ -403,5 +403,5 @@ index 000000000000..32359f169124
 +	pinctrl-names = "default";
 +};
 -- 
-2.39.5
+2.35.3
 

patch/kernel/archive/sunxi-6.12/patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 0ebd4ab1a25d17cb321499d1ab328cd7d0efa033 Mon Sep 17 00:00:00 2001
 From: afaulkner420 <[email protected]>
 Date: Fri, 25 Mar 2022 19:28:00 +0000
 Subject: Add dump_reg and sunxi-sysinfo drivers
@@ -8,16 +8,24 @@ Subject: Add dump_reg and sunxi-sysinfo drivers
  drivers/char/Makefile                      |   2 +
  drivers/char/dump_reg/Kconfig              |  21 +
  drivers/char/dump_reg/Makefile             |   2 +
- drivers/char/dump_reg/dump_reg.c           | 887 ++++++++++
- drivers/char/dump_reg/dump_reg.h           | 132 ++
- drivers/char/dump_reg/dump_reg_misc.c      | 209 +++
+ drivers/char/dump_reg/dump_reg.c           | 887 +++++++++++++++++++++
+ drivers/char/dump_reg/dump_reg.h           | 132 +++
+ drivers/char/dump_reg/dump_reg_misc.c      | 209 +++++
  drivers/char/sunxi-sysinfo/Kconfig         |  10 +
  drivers/char/sunxi-sysinfo/Makefile        |   5 +
- drivers/char/sunxi-sysinfo/sunxi-sysinfo.c | 175 ++
+ drivers/char/sunxi-sysinfo/sunxi-sysinfo.c | 175 ++++
  10 files changed, 1445 insertions(+)
+ create mode 100644 drivers/char/dump_reg/Kconfig
+ create mode 100644 drivers/char/dump_reg/Makefile
+ create mode 100644 drivers/char/dump_reg/dump_reg.c
+ create mode 100644 drivers/char/dump_reg/dump_reg.h
+ create mode 100644 drivers/char/dump_reg/dump_reg_misc.c
+ create mode 100644 drivers/char/sunxi-sysinfo/Kconfig
+ create mode 100644 drivers/char/sunxi-sysinfo/Makefile
+ create mode 100644 drivers/char/sunxi-sysinfo/sunxi-sysinfo.c
 
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 111111111111..222222222222 100644
+index 7c8dd0abcfdf..aaa164708947 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 @@ -133,6 +133,8 @@ config POWERNV_OP_PANEL
@@ -30,7 +38,7 @@ index 111111111111..222222222222 100644
  config DS1620
  	tristate "NetWinder thermometer support"
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index 111111111111..222222222222 100644
+index e9b360cdc99a..3000e4bbde4e 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
 @@ -10,6 +10,7 @@ obj-$(CONFIG_ATARI_DSP56K)	+= dsp56k.o
@@ -48,7 +56,7 @@ index 111111111111..222222222222 100644
 +obj-$(CONFIG_DUMP_REG)          += dump_reg/
 diff --git a/drivers/char/dump_reg/Kconfig b/drivers/char/dump_reg/Kconfig
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..dbf24c59fd40
 --- /dev/null
 +++ b/drivers/char/dump_reg/Kconfig
 @@ -0,0 +1,21 @@
@@ -75,15 +83,15 @@ index 000000000000..111111111111
 +
 diff --git a/drivers/char/dump_reg/Makefile b/drivers/char/dump_reg/Makefile
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..e953f413b128
 --- /dev/null
 +++ b/drivers/char/dump_reg/Makefile
 @@ -0,0 +1,2 @@
 +obj-$(CONFIG_DUMP_REG) += dump_reg.o
 +obj-$(CONFIG_DUMP_REG_MISC) += dump_reg_misc.o
 diff --git a/drivers/char/dump_reg/dump_reg.c b/drivers/char/dump_reg/dump_reg.c
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..f5d64c4af036
 --- /dev/null
 +++ b/drivers/char/dump_reg/dump_reg.c
 @@ -0,0 +1,887 @@
@@ -976,7 +984,7 @@ index 000000000000..111111111111
 +MODULE_DESCRIPTION("dump registers driver");
 diff --git a/drivers/char/dump_reg/dump_reg.h b/drivers/char/dump_reg/dump_reg.h
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..85af5c96ed50
 --- /dev/null
 +++ b/drivers/char/dump_reg/dump_reg.h
 @@ -0,0 +1,132 @@
@@ -1114,7 +1122,7 @@ index 000000000000..111111111111
 +#endif /* _DUMP_REG_H_ */
 diff --git a/drivers/char/dump_reg/dump_reg_misc.c b/drivers/char/dump_reg/dump_reg_misc.c
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..238ddd147533
 --- /dev/null
 +++ b/drivers/char/dump_reg/dump_reg_misc.c
 @@ -0,0 +1,209 @@
@@ -1329,7 +1337,7 @@ index 000000000000..111111111111
 +MODULE_DESCRIPTION("misc dump registers driver");
 diff --git a/drivers/char/sunxi-sysinfo/Kconfig b/drivers/char/sunxi-sysinfo/Kconfig
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..9b6e2f06d708
 --- /dev/null
 +++ b/drivers/char/sunxi-sysinfo/Kconfig
 @@ -0,0 +1,10 @@
@@ -1345,7 +1353,7 @@ index 000000000000..111111111111
 +	  If you don't know whether need it, please select y.
 diff --git a/drivers/char/sunxi-sysinfo/Makefile b/drivers/char/sunxi-sysinfo/Makefile
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..188696592114
 --- /dev/null
 +++ b/drivers/char/sunxi-sysinfo/Makefile
 @@ -0,0 +1,5 @@
@@ -1356,7 +1364,7 @@ index 000000000000..111111111111
 +obj-$(CONFIG_SUNXI_SYS_INFO) += sunxi-sysinfo.o
 diff --git a/drivers/char/sunxi-sysinfo/sunxi-sysinfo.c b/drivers/char/sunxi-sysinfo/sunxi-sysinfo.c
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..21f59363cabf
 --- /dev/null
 +++ b/drivers/char/sunxi-sysinfo/sunxi-sysinfo.c
 @@ -0,0 +1,175 @@
@@ -1536,5 +1544,5 @@ index 000000000000..111111111111
 +MODULE_AUTHOR("xiafeng<[email protected]>");
 +MODULE_DESCRIPTION("sunxi sys info.");
 -- 
-Armbian
+2.35.3
 

patch/kernel/archive/sunxi-6.12/patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From e482c7efb866cd72b6529ba99d5c071985290732 Mon Sep 17 00:00:00 2001
 From: afaulkner420 <[email protected]>
 Date: Fri, 25 Mar 2022 20:18:18 +0000
 Subject: Add sunxi-addr driver - Used to fix uwe5622 bluetooth MAC addresses
@@ -8,12 +8,16 @@ Subject: Add sunxi-addr driver - Used to fix uwe5622 bluetooth MAC addresses
  drivers/misc/Makefile                |   1 +
  drivers/misc/sunxi-addr/Kconfig      |   6 +
  drivers/misc/sunxi-addr/Makefile     |   5 +
- drivers/misc/sunxi-addr/sha256.c     | 178 +++++
- drivers/misc/sunxi-addr/sunxi-addr.c | 356 ++++++++++
+ drivers/misc/sunxi-addr/sha256.c     | 178 ++++++++++++++
+ drivers/misc/sunxi-addr/sunxi-addr.c | 356 +++++++++++++++++++++++++++
  6 files changed, 547 insertions(+)
+ create mode 100644 drivers/misc/sunxi-addr/Kconfig
+ create mode 100644 drivers/misc/sunxi-addr/Makefile
+ create mode 100644 drivers/misc/sunxi-addr/sha256.c
+ create mode 100644 drivers/misc/sunxi-addr/sunxi-addr.c
 
 diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
-index 111111111111..222222222222 100644
+index 5970a309c5b5..53f60280cee1 100644
 --- a/drivers/misc/Kconfig
 +++ b/drivers/misc/Kconfig
 @@ -635,4 +635,5 @@ source "drivers/misc/uacce/Kconfig"
@@ -23,7 +27,7 @@ index 111111111111..222222222222 100644
 +source "drivers/misc/sunxi-addr/Kconfig"
  endmenu
 diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
-index 111111111111..222222222222 100644
+index eddebeb36117..d07149af7084 100644
 --- a/drivers/misc/Makefile
 +++ b/drivers/misc/Makefile
 @@ -73,3 +73,4 @@ obj-$(CONFIG_NSM)		+= nsm.o
@@ -33,7 +37,7 @@ index 111111111111..222222222222 100644
 +obj-$(CONFIG_SUNXI_ADDR_MGT)    += sunxi-addr/
 diff --git a/drivers/misc/sunxi-addr/Kconfig b/drivers/misc/sunxi-addr/Kconfig
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..801dd2c02a56
 --- /dev/null
 +++ b/drivers/misc/sunxi-addr/Kconfig
 @@ -0,0 +1,6 @@
@@ -45,7 +49,7 @@ index 000000000000..111111111111
 +    allwinner network mac address management
 diff --git a/drivers/misc/sunxi-addr/Makefile b/drivers/misc/sunxi-addr/Makefile
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..f01fd4783566
 --- /dev/null
 +++ b/drivers/misc/sunxi-addr/Makefile
 @@ -0,0 +1,5 @@
@@ -56,7 +60,7 @@ index 000000000000..111111111111
 +obj-$(CONFIG_SUNXI_ADDR_MGT)   += sunxi_addr.o
 diff --git a/drivers/misc/sunxi-addr/sha256.c b/drivers/misc/sunxi-addr/sha256.c
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..78825810c53f
 --- /dev/null
 +++ b/drivers/misc/sunxi-addr/sha256.c
 @@ -0,0 +1,178 @@
@@ -240,7 +244,7 @@ index 000000000000..111111111111
 +}
 diff --git a/drivers/misc/sunxi-addr/sunxi-addr.c b/drivers/misc/sunxi-addr/sunxi-addr.c
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..c8a50c8dbac6
 --- /dev/null
 +++ b/drivers/misc/sunxi-addr/sunxi-addr.c
 @@ -0,0 +1,356 @@
@@ -601,5 +605,5 @@ index 000000000000..111111111111
 +MODULE_DESCRIPTION("Network MAC Addess Manager");
 +MODULE_LICENSE("GPL");
 -- 
-Armbian
+2.35.3
 

patch/kernel/archive/sunxi-6.12/patches.armbian/Add-wifi-nodes-for-Inovato-Quadra.patch

@@ -1,15 +1,16 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From d10d89d8f6a6737fae866e636bbbcc0741a8cc11 Mon Sep 17 00:00:00 2001
 From: Gunjan Gupta <[email protected]>
 Date: Tue, 19 Sep 2023 11:06:01 +0000
 Subject: Add wifi nodes for Inovato Quadra
 
 ---
- arch/arm64/boot/dts/allwinner/Makefile                     |  1 +
- arch/arm64/boot/dts/allwinner/sun50i-h6-inovato-quadra.dts | 56 ++++++++++
+ arch/arm64/boot/dts/allwinner/Makefile        |  1 +
+ .../allwinner/sun50i-h6-inovato-quadra.dts    | 56 +++++++++++++++++++
  2 files changed, 57 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-inovato-quadra.dts
 
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 111111111111..222222222222 100644
+index dc922a71cfc1..95d2886defc8 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
 @@ -49,6 +49,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
@@ -22,7 +23,7 @@ index 111111111111..222222222222 100644
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-manta.dtb
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-inovato-quadra.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-inovato-quadra.dts
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..551ad69f18a6
 --- /dev/null
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-inovato-quadra.dts
 @@ -0,0 +1,56 @@
@@ -83,5 +84,5 @@ index 000000000000..111111111111
 +	post-power-on-delay-ms = <0xc8>;
 +};
 -- 
-Armbian
+2.35.3