sunxi 6.11: Switch kernel version to v6.11.2, Re-extract patches

config/sources/families/include/sunxi64_common.inc

@@ -36,7 +36,7 @@ case $BRANCH in
 
 	edge)
 		declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.11.1"
+		declare -g KERNELBRANCH="tag:v6.11.2"
 		;;
 esac
 

config/sources/families/include/sunxi_common.inc

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

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

@@ -1,4 +1,4 @@
-From c83ad4e6eaec26f1cafa2765968b9fa1d71fe3c1 Mon Sep 17 00:00:00 2001
+From 8c08442e2c5d2d57a109b05d35276e4f04416a8e Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@gmail.com>
 Date: Thu, 1 Sep 2022 17:36:53 +0200
 Subject: ASoC: AC200: Initial driver
@@ -7,8 +7,8 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
 ---
  sound/soc/codecs/Kconfig  |  10 +
  sound/soc/codecs/Makefile |   2 +
- sound/soc/codecs/ac200.c  | 774 ++++++++++++++++++++++++++++++++++++++
- 3 files changed, 786 insertions(+)
+ 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
@@ -61,7 +61,7 @@ index 571c08fdeae3..3e5614fe4d60 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..113a45408116
+index 000000000000..662de230dc83
 --- /dev/null
 +++ b/sound/soc/codecs/ac200.c
 @@ -0,0 +1,772 @@

patch/kernel/archive/sunxi-6.11/patches.armbian/Add-BPI-M4-ZERO-sdio-wifi-bt-overlay.patch

@@ -1,19 +1,19 @@
-From b9d3b6e919bf6c82e8fd3cdaed11d212b066e61d Mon Sep 17 00:00:00 2001
+From 57f3aa16ec2a46967b56f7849eaf7f34c09fe5b8 Mon Sep 17 00:00:00 2001
 From: Patrick Yavitz <pyavitz@armbian.com>
-Date: Thu, 3 Oct 2024 12:59:06 -0400
+Date: Wed, 9 Oct 2024 08:05:54 -0400
 Subject: [PATCH] Add BPI-M4-ZERO sdio wifi bt overlay
 
 sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
 
 Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
 ---
  .../arm64/boot/dts/allwinner/overlay/Makefile |  3 +-
- .../sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 45 +++++++++++++++++++
- 2 files changed, 47 insertions(+), 1 deletion(-)
+ .../sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 29 +++++++++++++++++++
+ 2 files changed, 31 insertions(+), 1 deletion(-)
  create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
 
 diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile
-index 76a4952e3ecc..cd4dda360f3c 100644
+index 76a4952e3ecc..b10db212cdf2 100644
 --- a/arch/arm64/boot/dts/allwinner/overlay/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/overlay/Makefile
 @@ -66,7 +66,8 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
@@ -28,21 +28,13 @@ index 76a4952e3ecc..cd4dda360f3c 100644
  	sun50i-a64-fixup.scr \
 diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
 new file mode 100644
-index 000000000000..d73673cc38ba
+index 000000000000..b672807fab66
 --- /dev/null
 +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,29 @@
 +/dts-v1/;
 +/plugin/;
 +
-+#include <dt-bindings/clock/sun50i-h616-ccu.h>
-+#include <dt-bindings/clock/sun50i-h6-r-ccu.h>
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/interrupt-controller/arm-gic.h>
-+#include <dt-bindings/clock/sun6i-rtc.h>
-+#include <dt-bindings/reset/sun50i-h616-ccu.h>
-+#include <dt-bindings/reset/sun50i-h6-r-ccu.h>
-+
 +/ {
 +	compatible = "sinovoip,bpi-m4-zero", "allwinner,sun50i-h616", "allwinner,sun50i-h618";
 +
@@ -65,47 +57,10 @@ index 000000000000..d73673cc38ba
 +	fragment@2 {
 +		target = <&uart1>;
 +		__overlay__ {
-+			bluetooth {
-+				compatible = "brcm,bcm43438-bt";
-+				host-wakeup-gpios = <&pio 6 16 GPIO_ACTIVE_HIGH>;
-+				device-wakeup-gpios = <&pio 6 17 GPIO_ACTIVE_HIGH>;
-+				shutdown-gpios = <&pio 6 19 GPIO_ACTIVE_HIGH>;
-+				max-speed = <1500000>;
-+				vbat-supply = <&reg_dldo1>;
-+				vddio-supply = <&reg_aldo1>;
-+			};
++			status = "okay";
 +		};
 +	};
 +};
 -- 
 2.39.5
 
-From 3d9f8f85c01d3e0fe1cf4a28aeab938c34b7eb76 Mon Sep 17 00:00:00 2001
-From: Patrick Yavitz <pyavitz@gmail.com>
-Date: Fri, 4 Oct 2024 09:59:31 -0400
-Subject: [PATCH] Disable bluetooth as it wont load in Armbian
-
-Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
----
- .../overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso        | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
-index d73673cc38ba..352e8bdc2360 100644
---- a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
-+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
-@@ -31,6 +31,11 @@ __overlay__ {
- 	fragment@2 {
- 		target = <&uart1>;
- 		__overlay__ {
-+		/*
-+		 * Until figured out disable bluetooth as it won't currently load properly in Armbian.
-+		 */
-+			status = "disabled";
-+
- 			bluetooth {
- 				compatible = "brcm,bcm43438-bt";
- 				host-wakeup-gpios = <&pio 6 16 GPIO_ACTIVE_HIGH>;
--- 
-2.39.5
-

patch/kernel/archive/sunxi-6.11/patches.armbian/Add-board-BananaPi-BPI-M4-ZERO.patch

@@ -1,6 +1,6 @@
-From fa35b83620c8bd415487197eba69d09b998c964f Mon Sep 17 00:00:00 2001
+From 946c4756a270d64c9a128e629ff7c4789a5ff8c4 Mon Sep 17 00:00:00 2001
 From: Patrick Yavitz <pyavitz@armbian.com>
-Date: Thu, 3 Oct 2024 12:46:14 -0400
+Date: Mon, 7 Oct 2024 08:37:08 -0400
 Subject: [PATCH] Add board BananaPi BPI-M4-ZERO
 
 sun50i-h618-bananapi-m4-zero.dts
@@ -10,8 +10,8 @@ Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
 ---
  arch/arm64/boot/dts/allwinner/Makefile        |   1 +
  .../sun50i-h618-bananapi-m4-zero.dts          |  73 +++++
- .../allwinner/sun50i-h618-bananapi-m4.dtsi    | 252 ++++++++++++++++++
- 3 files changed, 326 insertions(+)
+ .../allwinner/sun50i-h618-bananapi-m4.dtsi    | 280 ++++++++++++++++++
+ 3 files changed, 354 insertions(+)
  create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts
  create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
 
@@ -108,10 +108,10 @@ index 000000000000..61829ab55218
 +};
 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..8a73b9e81fdb
+index 000000000000..32fa9588efda
 --- /dev/null
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
-@@ -0,0 +1,252 @@
+@@ -0,0 +1,280 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2024 Patrick Yavitz <pyavitz@armbian.com>
@@ -147,16 +147,6 @@ index 000000000000..8a73b9e81fdb
 +		};
 +	};
 +
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+		key-sw3 {
-+			label = "sw3";
-+			linux,code = <BTN_0>;
-+			gpios = <&pio 2 7 GPIO_ACTIVE_LOW>;	/* PC7 */
-+		};
-+	};
-+
 +	leds {
 +		compatible = "gpio-leds";
 +
@@ -171,19 +161,37 @@ index 000000000000..8a73b9e81fdb
 +	reg_usb_vbus: regulator-usb-vbus {
 +		/* Separate discrete regulator for the USB ports */
 +		compatible = "regulator-fixed";
-+		regulator-name = "usb-vbus";
 +		regulator-min-microvolt = <5000000>;
 +		regulator-max-microvolt = <5000000>;
++		regulator-name = "usb-vbus";
 +		vin-supply = <&reg_vcc5v>;
 +	};
 +
 +	reg_vcc5v: regulator-vcc5v {
 +		/* Board wide 5V supply directly from the USB-C socket */
 +		compatible = "regulator-fixed";
-+		regulator-name = "vcc-5v";
++		regulator-always-on;
 +		regulator-min-microvolt = <5000000>;
 +		regulator-max-microvolt = <5000000>;
++		regulator-name = "vcc-5v";
++	};
++
++	reg_vcc3v3: regulator-vcc3v3 {
++		compatible = "regulator-fixed";
 +		regulator-always-on;
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		regulator-name = "vcc-3v3";
++		vin-supply = <&reg_vcc5v>;
++	};
++
++	reg_vcc1v8: regulator-vcc1v8 {
++		compatible = "regulator-fixed";
++		regulator-always-on;
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <1800000>;
++		regulator-name = "vcc-1v8";
++		vin-supply = <&reg_vcc3v3>;
 +	};
 +
 +	wifi_pwrseq: wifi-pwrseq {
@@ -240,38 +248,48 @@ index 000000000000..8a73b9e81fdb
 +
 +&mmc0 {
 +	status = "okay";
-+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;	/* PF6 */
-+	disable-wp;
 +	bus-width = <4>;
 +	max-frequency = <50000000>;
-+	vmmc-supply = <&reg_dldo1>;
++
++	disable-wp;
++
++	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;	/* PF6 */
++	vmmc-supply = <&reg_vcc3v3>;
 +};
 +
 +&mmc1 {
 +	status = "disabled";
 +	bus-width = <4>;
++	max-frequency = <100000000>;
++
 +	non-removable;
++	disable-wp;
++
++	/* WiFi firmware requires power to be kept while in suspend */
++	keep-power-in-suspend;
++
 +	mmc-pwrseq = <&wifi_pwrseq>;
-+	vmmc-supply = <&reg_dldo1>;
-+	vqmmc-supply = <&reg_aldo1>;
 +
-+	sdio_wifi: wifi@1 {
++	cd-gpios = <&pio 6 15 GPIO_ACTIVE_HIGH>; /* PG15 */
++	vmmc-supply = <&reg_vcc3v3>;
++
++	sdio: wifi@1 {
 +		reg = <1>;
 +		compatible = "brcm,bcm4329-fmac";
-+		interrupt-parent = <&pio>;
-+		interrupts = <6 15 IRQ_TYPE_LEVEL_LOW>;  /* PG15 */
-+		interrupt-names = "host-wake";
 +	};
 +};
 +
 +&mmc2 {
 +	status = "okay";
 +	bus-width = <8>;
-+	non-removable;
 +	cap-mmc-hw-reset;
 +	mmc-hs200-1_8v;
-+	vmmc-supply = <&reg_dldo1>;
-+	vqmmc-supply = <&reg_aldo1>;
++
++	non-removable;
++	disable-wp;
++
++	vmmc-supply = <&reg_vcc3v3>;
++	vqmmc-supply = <&reg_vcc1v8>;
 +};
 +
 +&pio {
@@ -353,10 +371,20 @@ index 000000000000..8a73b9e81fdb
 +};
 +
 +&uart1 {
-+	status = "okay";
++	status = "disabled";
 +	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
 +	pinctrl-names = "default";
 +	uart-has-rtscts;
++
++	bluetooth {
++		compatible = "brcm,bcm43540-bt";
++		host-wakeup-gpios = <&pio 6 16 GPIO_ACTIVE_HIGH>;
++		device-wakeup-gpios = <&pio 6 17 GPIO_ACTIVE_HIGH>;
++		shutdown-gpios = <&pio 6 19 GPIO_ACTIVE_HIGH>;
++		max-speed = <1500000>;
++		vbat-supply = <&reg_vcc3v3>;
++		vddio-supply = <&reg_vcc3v3>;
++	};
 +};
 +
 +&uart5 {

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

@@ -1,4 +1,4 @@
-From 329a85b6b0e78cb8acb3404ea0fcf289a42a18da Mon Sep 17 00:00:00 2001
+From 2b58dc044c4d6d66b4bfa970edbbccdd62a9ed45 Mon Sep 17 00:00:00 2001
 From: afaulkner420 <afaulkner420@gmail.com>
 Date: Fri, 25 Mar 2022 19:28:00 +0000
 Subject: Add dump_reg and sunxi-sysinfo drivers
@@ -8,13 +8,13 @@ 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           | 888 +++++++++++++++++++++
+ 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 | 177 ++++
- 10 files changed, 1448 insertions(+)
+ 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
@@ -91,7 +91,7 @@ index 000000000000..e953f413b128
 +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..a839666c50a5
+index 000000000000..f5d64c4af036
 --- /dev/null
 +++ b/drivers/char/dump_reg/dump_reg.c
 @@ -0,0 +1,887 @@
@@ -1364,7 +1364,7 @@ index 000000000000..188696592114
 +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..a5b4e6c0b578
+index 000000000000..21f59363cabf
 --- /dev/null
 +++ b/drivers/char/sunxi-sysinfo/sunxi-sysinfo.c
 @@ -0,0 +1,175 @@

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

@@ -1,4 +1,4 @@
-From 9737d174f06271720d7b595429deb8f7d79038e5 Mon Sep 17 00:00:00 2001
+From 48aed9ce68a4a332928a1722bf36ecd95aa6bda3 Mon Sep 17 00:00:00 2001
 From: afaulkner420 <afaulkner420@gmail.com>
 Date: Fri, 25 Mar 2022 20:18:18 +0000
 Subject: Add sunxi-addr driver - Used to fix uwe5622 bluetooth MAC addresses
@@ -8,9 +8,9 @@ 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 | 357 +++++++++++++++++++++++++++
- 6 files changed, 548 insertions(+)
+ 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
@@ -244,7 +244,7 @@ index 000000000000..78825810c53f
 +}
 diff --git a/drivers/misc/sunxi-addr/sunxi-addr.c b/drivers/misc/sunxi-addr/sunxi-addr.c
 new file mode 100644
-index 000000000000..f4f2dcecbb48
+index 000000000000..c8a50c8dbac6
 --- /dev/null
 +++ b/drivers/misc/sunxi-addr/sunxi-addr.c
 @@ -0,0 +1,356 @@