linux-postmarketos-allwinner: Upgrade to 5.12.6 (MR 2149)

I rebased all of the patches (only 2 needed some changes, the rest I just did for good measure). These two patches were dropped since they are already merged in the new kernel: 0008-leds-gpio-Set-max-brightness-to-1.patch 0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch was dropped The kconfig changes are just after running kconfig edit, and making no changes so that it would generate a config with any new options in 5.12, to make maintenance easier moving forward.
2021-05-02 20:48:05 -07:00 · 2021-05-02 20:48:05 -07:00 · 3ebca14608
commit 3ebca14608
parent 6aa9506169
19 changed files with 191 additions and 231 deletions
--- a/main/linux-postmarketos-allwinner/0001-dts-add-dontbeevil-pinephone-devkit.patch
+++ b/main/linux-postmarketos-allwinner/0001-dts-add-dontbeevil-pinephone-devkit.patch
@ -1,4 +1,4 @@
-From 99cd186fc2084dc91553b72c2560ec57d76ec96d Mon Sep 17 00:00:00 2001
+From faf5874c12ec57232e5389691d12db1a945629bb Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Sat, 20 Apr 2019 01:19:48 +0200
 Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
@ -17,7 +17,7 @@ Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts

 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 211d1e9d4701..9ab527d81dd8 100644
+index 41ce680e5f8d..6740e6a97161 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -1,6 +1,8 @@
@ -532,5 +532,5 @@ index 000000000000..15a91f2d6202
 +	status = "disabled";
 +};
 -- 
-2.30.1
+2.31.1

--- a/main/linux-postmarketos-allwinner/0002-dts-add-pinetab-dev-old-display-panel.patch
+++ b/main/linux-postmarketos-allwinner/0002-dts-add-pinetab-dev-old-display-panel.patch
@ -1,4 +1,4 @@
-From 1df366384bb44a1c4b5bf76cd3b541f81c7fa5aa Mon Sep 17 00:00:00 2001
+From c0e6e18c3d4acc79f34af16d76e8af39c275f5bb Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:42:01 +0200
 Subject: [PATCH] dts: add pinetab-dev (old display panel)
@ -10,13 +10,13 @@ Subject: [PATCH] dts: add pinetab-dev (old display panel)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts

 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 9ab527d81dd8..94c901f1b57a 100644
+index 6740e6a97161..bd9d8fa9738f 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
-@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.0.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.1.dtb
+@@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.1.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinetab.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinetab-early-adopter.dtb
 +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinetab-dev.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-teres-i.dtb
@ -57,5 +57,5 @@ index 000000000000..1e287f2fb9f3
 +	};
 +};
 -- 
-2.30.1
+2.31.1

--- a/main/linux-postmarketos-allwinner/0003-dts-pinetab-add-missing-bma223-ohci1.patch
+++ b/main/linux-postmarketos-allwinner/0003-dts-pinetab-add-missing-bma223-ohci1.patch
@ -1,4 +1,4 @@
-From 2be6bdc7b80171a3b78c6e5d81decba2469e1cd2 Mon Sep 17 00:00:00 2001
+From a76ae09d570406690bde1436aa910e76ae179716 Mon Sep 17 00:00:00 2001
 From: Oliver Smith <ollieparanoid@postmarketos.org>
 Date: Tue, 20 Oct 2020 11:11:48 +0200
 Subject: [PATCH] dts: pinetab: add missing bma223, ohci1
@ -13,7 +13,7 @@ https://gitlab.com/pine64-org/linux/-/commit/69ae7087ec51b09bb6a0afb53dddb5eb030
 1 file changed, 13 insertions(+), 1 deletion(-)

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index 91134608770a..fc7a3b895d5e 100644
+index 91d27bc93a3e..c33c5690a87b 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
@@ -225,7 +225,15 @@ &i2c0_pins {
@ -45,5 +45,5 @@ index 91134608770a..fc7a3b895d5e 100644
 	status = "okay";
 };
 -- 
-2.30.1
+2.31.1

--- a/main/linux-postmarketos-allwinner/0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
+++ b/main/linux-postmarketos-allwinner/0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
@ -1,4 +1,4 @@
-From 56bb010ca6473c16b1b801be0008071223fbb27e Mon Sep 17 00:00:00 2001
+From bf487dec17b09c377e8661c18af8b1b746e02142 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 16:12:08 +0200
 Subject: [PATCH] arm64: dts: allwinner: Add bluetooth node to the PineTab
@ -8,7 +8,7 @@ Subject: [PATCH] arm64: dts: allwinner: Add bluetooth node to the PineTab
 1 file changed, 13 insertions(+)

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index fc7a3b895d5e..d335b38954c8 100644
+index c33c5690a87b..ac66fd12f59f 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
@@ -487,6 +487,19 @@ &uart0 {
@ -32,5 +32,5 @@ index fc7a3b895d5e..d335b38954c8 100644
 	dr_mode = "otg";
 	status = "okay";
 -- 
-2.30.1
+2.31.1

--- a/main/linux-postmarketos-allwinner/0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+++ b/main/linux-postmarketos-allwinner/0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
@ -1,4 +1,4 @@
-From 9ca231eadf446d91ad09a8fdb6b702f5585d10bb Mon Sep 17 00:00:00 2001
+From 77f6107336aa2171c4b3086f8a98af42b93f65f5 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:44:51 +0200
 Subject: [PATCH] dts: pinetab: make audio routing consistent with pinephone
@ -8,7 +8,7 @@ Subject: [PATCH] dts: pinetab: make audio routing consistent with pinephone
 1 file changed, 6 insertions(+), 5 deletions(-)

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index d335b38954c8..ba62412747f1 100644
+index ac66fd12f59f..1923c6d0debe 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
@@ -460,19 +460,20 @@ &reg_rtc_ldo {
@ -38,5 +38,5 @@ index d335b38954c8..ba62412747f1 100644
 			"ADCR", "Right ADC",
 			"Internal Microphone Left", "MBIAS",
 -- 
-2.30.1
+2.31.1

--- a/main/linux-postmarketos-allwinner/0006-dts-pinephone-remove-bt-firmware-suffix.patch
+++ b/main/linux-postmarketos-allwinner/0006-dts-pinephone-remove-bt-firmware-suffix.patch
@ -1,4 +1,4 @@
-From 4c739a5ecb381c174286ae5b375a14dbf9fdb094 Mon Sep 17 00:00:00 2001
+From eef79bbcc6afc2cb4441be760c8e2c06594589df Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 17:58:00 +0200
 Subject: [PATCH] dts: pinephone: remove bt firmware suffix
@ -8,10 +8,10 @@ Subject: [PATCH] dts: pinephone: remove bt firmware suffix
 1 file changed, 1 deletion(-)

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index 41bc8612756f..98f94c7577ee 100644
+index 346113382e7d..d3d4f1a53c8d 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -866,7 +866,6 @@ bluetooth {
+@@ -876,7 +876,6 @@ bluetooth {
 		device-wake-gpios = <&pio 7 6 GPIO_ACTIVE_LOW>; /* PH6 */
 		enable-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
 		host-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
@ -20,5 +20,5 @@ index 41bc8612756f..98f94c7577ee 100644
 };
 
 -- 
-2.30.1
+2.31.1

--- a/main/linux-postmarketos-allwinner/0007-media-ov5640-Implement-autofocus.patch
+++ b/main/linux-postmarketos-allwinner/0007-media-ov5640-Implement-autofocus.patch
@ -1,4 +1,4 @@
-From 4ff393c2bf25a3be0464c85696f6501a701bbf9c Mon Sep 17 00:00:00 2001
+From 628f3a4895037660bc34c0d818b41b0712548af1 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Mon, 28 Sep 2020 14:26:11 +0200
 Subject: [PATCH] media: ov5640: Implement autofocus
@ -405,5 +405,5 @@ index 7764e755bd05..65ab69f6b71a 100644
 	sensor->sd.ctrl_handler = hdl;
 	return 0;
 -- 
-2.30.1
+2.31.1

--- a/main/linux-postmarketos-allwinner/0008-dts-pinephone-drop-modem-power-node.patch
+++ b/main/linux-postmarketos-allwinner/0008-dts-pinephone-drop-modem-power-node.patch
@ -1,4 +1,4 @@
-From f846c719096012c9af482e8945cc01731ac7f31f Mon Sep 17 00:00:00 2001
+From 1879de83c95ba0e133b2ed8c945fe1be3b46f8f1 Mon Sep 17 00:00:00 2001
 From: Clayton Craft <clayton@craftyguy.net>
 Date: Wed, 16 Dec 2020 20:16:14 -0800
 Subject: [PATCH] dts: pinephone: drop modem-power node
@ -139,10 +139,10 @@ index 9b33186c7e7d..44b3d6555ff7 100644
 +	gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
 +};
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index 98f94c7577ee..67c58907ae1b 100644
+index d3d4f1a53c8d..3cf2f3e6a41a 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -191,6 +191,17 @@ ec25_codec: ec25-codec {
+@@ -192,6 +192,17 @@ ec25_codec: ec25-codec {
 		sound-name-prefix = "Modem";
 	};
 
@ -160,7 +160,7 @@ index 98f94c7577ee..67c58907ae1b 100644
 	i2c_csi: i2c-csi {
 		compatible = "i2c-gpio";
 		sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PE13 */
-@@ -255,6 +266,7 @@ reg_usb_5v: usb-5v {
+@@ -264,6 +275,7 @@ reg_usb_5v: usb-5v {
 	reg_vbat_bb: vbat-bb {
 		compatible = "regulator-fixed";
 		regulator-name = "vbat-bb";
@ -169,5 +169,5 @@ index 98f94c7577ee..67c58907ae1b 100644
 		regulator-max-microvolt = <3500000>;
 		gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
 -- 
-2.30.1
+2.31.1

--- a/main/linux-postmarketos-allwinner/0008-leds-gpio-Set-max-brightness-to-1.patch
+++ b/main/linux-postmarketos-allwinner/0008-leds-gpio-Set-max-brightness-to-1.patch
@ -1,36 +0,0 @@
-From 9a4733f7b64738942086b6ddef7975550460c989 Mon Sep 17 00:00:00 2001
-From: Dylan Van Assche <me@dylanvanassche.be>
-Date: Tue, 29 Dec 2020 14:59:23 +0100
-Subject: [PATCH] leds: gpio: Set max brightness to 1
-
-GPIO LEDs only know 2 states: ON or OFF and do not have PWM capabilities.
-However, the max brightness is reported as 255.
-
-This patch sets the max brightness value of a GPIO controlled LED to 1.
-
-Tested on my PinePhone 1.2.
-
-Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
-Related: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/1832
-Related: https://lkml.org/lkml/2020/12/27/64
---
- drivers/leds/leds-gpio.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
-index 93f5b1b60fde..0d66f19d71ba 100644
--- a/drivers/leds/leds-gpio.c
-+++ b/drivers/leds/leds-gpio.c
-@@ -96,7 +96,8 @@ static int create_gpio_led(const struct gpio_led *template,
- 	} else {
- 		state = (template->default_state == LEDS_GPIO_DEFSTATE_ON);
- 	}
-	led_dat->cdev.brightness = state ? LED_FULL : LED_OFF;
-+	led_dat->cdev.brightness = state ? LED_ON : LED_OFF;
-+	led_dat->cdev.max_brightness = LED_ON;
- 	if (!template->retain_state_suspended)
- 		led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
- 	if (template->panic_indicator)
-- 
-2.30.1
-
--- a/main/linux-postmarketos-allwinner/0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch
+++ b/main/linux-postmarketos-allwinner/0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch
@ -1,56 +0,0 @@
-From e7a18f2a7f00700dd27ccd2254b6c2c5a7a8ae45 Mon Sep 17 00:00:00 2001
-From: Dylan Van Assche <me@dylanvanassche.be>
-Date: Thu, 24 Dec 2020 19:57:12 +0100
-Subject: [PATCH] dts: pinephone: Add 'pine64,pinephone' to compat list
-
-Indicates that all PinePhone models share most of the hardware with each other.
-Used for feedbackd configuration when retrieving a device specific config for
-haptic feedbackd.
---
- arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts | 2 +-
- arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts | 2 +-
- arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
-index c7ff4b7c193b..a21c6d78a0ef 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
-@@ -7,7 +7,7 @@
- 
- / {
- 	model = "Pine64 PinePhone Developer Batch (1.0)";
-	compatible = "pine64,pinephone-1.0", "allwinner,sun50i-a64";
-+	compatible = "pine64,pinephone-1.0", "pine64,pinephone", "allwinner,sun50i-a64";
- 
- 	reg_vbus: usb0-vbus {
- 		compatible = "regulator-fixed";
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-index 85b50a2a4d4f..d67f31ef529e 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-@@ -7,7 +7,7 @@
- 
- / {
- 	model = "Pine64 PinePhone Braveheart (1.1)";
-	compatible = "pine64,pinephone-1.1", "allwinner,sun50i-a64";
-+	compatible = "pine64,pinephone-1.1", "pine64,pinephone", "allwinner,sun50i-a64";
- 
- 	reg_vbus: usb0-vbus {
- 		compatible = "regulator-fixed";
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
-index 05bb42023b30..9b33186c7e7d 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
-@@ -7,7 +7,7 @@
- 
- / {
- 	model = "Pine64 PinePhone (1.2)";
-	compatible = "pine64,pinephone-1.2", "allwinner,sun50i-a64";
-+	compatible = "pine64,pinephone-1.2", "pine64,pinephone", "allwinner,sun50i-a64";
- 
- 	wifi_pwrseq: wifi-pwrseq {
- 		compatible = "mmc-pwrseq-simple";
-- 
-2.30.1
-
--- a/main/linux-postmarketos-allwinner/0009-dts-pinephone-jack-detection.patch
+++ b/main/linux-postmarketos-allwinner/0009-dts-pinephone-jack-detection.patch
@ -1,4 +1,4 @@
-From e2a0d1f3af7b051890cb003c9b0df18651b44f42 Mon Sep 17 00:00:00 2001
+From dd617215e43671c0ba88dbd25c99fa42de9be69c Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Mon, 15 Feb 2021 13:18:02 -0800
 Subject: [PATCH] dts: pinephone: jack detection
@ -8,10 +8,10 @@ Subject: [PATCH] dts: pinephone: jack detection
 1 file changed, 4 insertions(+), 2 deletions(-)

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index 67c58907ae1b..39fdf96fe95d 100644
+index 3cf2f3e6a41a..1a096576d258 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -346,11 +346,13 @@ &codec {
+@@ -355,11 +355,13 @@ &codec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&aif2_pins>, <&aif3_pins>;
 	status = "okay";
@ -25,7 +25,7 @@ index 67c58907ae1b..39fdf96fe95d 100644
 };
 
 &cpu0 {
-@@ -808,11 +810,11 @@ &sound {
+@@ -818,11 +820,11 @@ &sound {
 	simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>;
 	simple-audio-card,widgets = "Microphone", "Headset Microphone",
 				    "Microphone", "Internal Microphone",
@ -40,5 +40,5 @@ index 67c58907ae1b..39fdf96fe95d 100644
 			"Internal Speaker", "Speaker Amp OUTL",
 			"Internal Speaker", "Speaker Amp OUTR",
 -- 
-2.30.1
+2.31.1

--- a/main/linux-postmarketos-allwinner/0010-pinephone-fix-pogopin-i2c.patch
+++ b/main/linux-postmarketos-allwinner/0010-pinephone-fix-pogopin-i2c.patch
@ -1,4 +1,4 @@
-From d753557c64f6e85f63cffab53496d6271d724074 Mon Sep 17 00:00:00 2001
+From 18ffb110c41738fb8661cd0c98749b89c26daa3d Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Mon, 15 Feb 2021 13:10:37 -0800
 Subject: [PATCH] pinephone: fix pogopin i2c
@ -8,10 +8,10 @@ Subject: [PATCH] pinephone: fix pogopin i2c
 1 file changed, 1 insertion(+), 5 deletions(-)

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index 39fdf96fe95d..7d0dd52e2f9d 100644
+index 1a096576d258..4abda4fac41f 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -635,11 +635,7 @@ &pio {
+@@ -645,11 +645,7 @@ &pio {
 	vcc-pb-supply = <&reg_dcdc1>;
 	vcc-pc-supply = <&reg_dcdc1>;
 	vcc-pd-supply = <&reg_dcdc1>;
@ -25,5 +25,5 @@ index 39fdf96fe95d..7d0dd52e2f9d 100644
 	vcc-pg-supply = <&reg_dldo4>;
 	vcc-ph-supply = <&reg_dcdc1>;
 -- 
-2.30.1
+2.31.1

--- a/main/linux-postmarketos-allwinner/0011-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+++ b/main/linux-postmarketos-allwinner/0011-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
@ -1,4 +1,4 @@
-From 2423e7790f9188be019ed8d40511c5a0f9faa36f Mon Sep 17 00:00:00 2001
+From 49edde139be2fee279e4b1f3eeba67912d551601 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:27:30 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
@ -8,10 +8,10 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
 1 file changed, 27 insertions(+)

 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 41bbec72b2da..e1cc84359fff 100644
+index 4e2dad314c79..cd507bf895f5 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2045,6 +2045,30 @@ static const struct panel_desc hannstar_hsd100pxn1 = {
+@@ -2179,6 +2179,30 @@ static const struct panel_desc hannstar_hsd100pxn1 = {
 	.connector_type = DRM_MODE_CONNECTOR_LVDS,
 };
 
@ -42,7 +42,7 @@ index 41bbec72b2da..e1cc84359fff 100644
 static const struct drm_display_mode hitachi_tx23d38vm0caa_mode = {
 	.clock = 33333,
 	.hdisplay = 800,
-@@ -4126,6 +4150,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4265,6 +4289,9 @@ static const struct of_device_id platform_of_match[] = {
 	}, {
 		.compatible = "hit,tx23d38vm0caa",
 		.data = &hitachi_tx23d38vm0caa
@ -53,5 +53,5 @@ index 41bbec72b2da..e1cc84359fff 100644
 		.compatible = "innolux,at043tn24",
 		.data = &innolux_at043tn24,
 -- 
-2.31.0
+2.31.1

--- a/main/linux-postmarketos-allwinner/0012-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+++ b/main/linux-postmarketos-allwinner/0012-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
@ -1,4 +1,4 @@
-From cbc71a472a6131530bdedda06efadb660c80dc24 Mon Sep 17 00:00:00 2001
+From cd06dec28f2c6a61cb3c2ef00c2a68efe4c26db6 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:29:37 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
@ -10,10 +10,10 @@ Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
 create mode 100644 arch/arm/boot/dts/sun6i-a31s-goclever-gcta741l.dts

 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index eb25d2dbbfa7..c402f2f7e2a1 100644
+index 127a10cb590d..ba31b42f1e18 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1134,6 +1134,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
+@@ -1136,6 +1136,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
 	sun6i-a31-mele-a1000g-quad.dtb \
 	sun6i-a31s-colorfly-e708-q1.dtb \
 	sun6i-a31s-cs908.dtb \
@ -131,5 +131,5 @@ index 000000000000..7fb95aef4c74
 +	status = "okay";
 +};
 -- 
-2.31.0
+2.31.1

--- a/main/linux-postmarketos-allwinner/0013-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+++ b/main/linux-postmarketos-allwinner/0013-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
@ -1,4 +1,4 @@
-From 0ed69e3cc6d9757a69f1afba385ea2c563849448 Mon Sep 17 00:00:00 2001
+From 8e2f5f4d514b94cfac85f3dce3d39e042b3ade69 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:11:22 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
@ -8,10 +8,10 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
 1 file changed, 27 insertions(+)

 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index e1cc84359fff..453d9f7f8d6f 100644
+index cd507bf895f5..ac8cfb3ce163 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -1990,6 +1990,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
+@@ -2124,6 +2124,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
 	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
 };
 
@ -42,7 +42,7 @@ index e1cc84359fff..453d9f7f8d6f 100644
 static const struct display_timing hannstar_hsd070pww1_timing = {
 	.pixelclock = { 64300000, 71100000, 82000000 },
 	.hactive = { 1280, 1280, 1280 },
-@@ -4141,6 +4165,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4280,6 +4304,9 @@ static const struct of_device_id platform_of_match[] = {
 	}, {
 		.compatible = "giantplus,gpm940b0",
 		.data = &giantplus_gpm940b0,
@ -53,5 +53,5 @@ index e1cc84359fff..453d9f7f8d6f 100644
 		.compatible = "hannstar,hsd070pww1",
 		.data = &hannstar_hsd070pww1,
 -- 
-2.31.0
+2.31.1

--- a/main/linux-postmarketos-allwinner/0014-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+++ b/main/linux-postmarketos-allwinner/0014-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
@ -1,4 +1,4 @@
-From e17eb4a726941f30565f245b2c22da4a3c542556 Mon Sep 17 00:00:00 2001
+From e9ac5ae02481dfe87335d9f2033785f0263c820d Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:18:58 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
@ -10,10 +10,10 @@ Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
 create mode 100644 arch/arm/boot/dts/sun4i-a10-lark-freeme-70-2s.dts

 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index c402f2f7e2a1..f9beb8fde5bb 100644
+index ba31b42f1e18..f5df06c4d564 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1096,6 +1096,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
+@@ -1098,6 +1098,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
 	sun4i-a10-inet9f-rev03.dtb \
 	sun4i-a10-itead-iteaduino-plus.dtb \
 	sun4i-a10-jesurun-q5.dtb \
@ -274,5 +274,5 @@ index 000000000000..fcba874976fa
 +	status = "okay";
 +};
 -- 
-2.31.0
+2.31.1

--- a/main/linux-postmarketos-allwinner/APKBUILD
+++ b/main/linux-postmarketos-allwinner/APKBUILD
@ -6,9 +6,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=5.11.10_git20210325
+pkgver=5.12.6_git20210523
 pkgrel=0
-_tag="orange-pi-5.11-20210325-1125"
+_tag="orange-pi-5.12-20210523-1501"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@ -38,15 +38,13 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
 	0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
 	0006-dts-pinephone-remove-bt-firmware-suffix.patch
 	0007-media-ov5640-Implement-autofocus.patch
-	0008-leds-gpio-Set-max-brightness-to-1.patch
-	0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch
-	0010-dts-pinephone-drop-modem-power-node.patch
-	0011-dts-pinephone-jack-detection.patch
-	0012-pinephone-fix-pogopin-i2c.patch
-	0013-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
-	0014-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
-	0015-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
-	0016-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+	0008-dts-pinephone-drop-modem-power-node.patch
+	0009-dts-pinephone-jack-detection.patch
+	0010-pinephone-fix-pogopin-i2c.patch
+	0011-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+	0012-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+	0013-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+	0014-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
 	"
 subpackages="$pkgname-dev"
 builddir="$srcdir/linux-$_tag"
@ -93,22 +91,22 @@ dev() {
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }

-sha512sums="a57b8c168403c33ead5a1c963f60dc56add6233fa79496d8b97459c3003396708477b2f7888c9845e7a140d79397c7fc1ac726da2ca2104ca717207e387a28da  linux-postmarketos-allwinner-orange-pi-5.11-20210325-1125.tar.gz
-2b632c867004f4f6bfa93cf7e2f0b04f63c8aabec2e6d1893e50f975f5c64d8301479080d950ada6e5e3f83ab08dfae644bdb98a20038ec672af92777d6ded96  config-postmarketos-allwinner.aarch64
-3c222d5dd76f408e8a8122b5028a7e07431c9c2f02afc7ba76272b2d33f5b3be1df08ff80256b717d9c249abb52f237e086e250da215a5b0c854ddd45172ed03  config-postmarketos-allwinner.armv7
-b174532e356dcb2144c2629c1747dcb0026a40aa8e4deca5bde67344d271e519ff90f6fa287633b1dec857855331e4aa1d1bd5fd0d73044309f98e8d829e2be0  0001-dts-add-dontbeevil-pinephone-devkit.patch
-898e5e6dbdfa5b2f2154818bf006f2ae4d162a246c58dab5c43534e7630a35faf48ba74f6d2493d7500ad956a0e71c0b85ca9d7a51044c21d7d87b6f27b055f5  0002-dts-add-pinetab-dev-old-display-panel.patch
-55f8bc826d7958d8fd16c59663746529be80daacdca9425e5678ee175bf0b93e4c1e0d2b5878ee58b488dde7eb7a05e438ec16c97c4298d3f272957a5caf183d  0003-dts-pinetab-add-missing-bma223-ohci1.patch
-6135bffc2ab948169f6fb27b925ca64a4f2ad8cb58d66123f2bcb1c6e64ac68a92ab419bc1b19eaac64d508de46e4a2de639251f92f78596dece5941ded39e5d  0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
-f63ce49ef59fe2650d52e73e5ecbee3c2b2a3b4cb5c95703d19960a1775f7bf25e3f0ffee55201418019b911aa114277c0b04a8b19b8786ae4af4a734ea3d11a  0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
-e8eca7814daf76ebe658bdf988a062c4ed433cee5fde522b8d64492267716a5e7ae91b55877253ccedb44f5365b8a085989410a64371728189e444aee4f54655  0006-dts-pinephone-remove-bt-firmware-suffix.patch
-22058627fd8e8d591d14d22e3ff5a19b8118e78f6bc620044ed68413fdac6cf1adeb77c75f4a2bae509b2294fe62b9c3fd18fb096e758dcd1bef47b515258ab5  0007-media-ov5640-Implement-autofocus.patch
-662641bcb112d0568de3436269969d12a607820ea422554d8b7dfd3c5dbcef7e5ac60d47218a0d8a3c05044792b20ca22240a1007282472eade443670780b99a  0008-leds-gpio-Set-max-brightness-to-1.patch
-95335f5755f8385c824cc8fb55af8b11ab02196ea6f49a80fe1ed964c0287fd6e41b597d50de615308e2cd53e0b0a471d452ea3ff8503caccfc17561c393c7f2  0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch
-e9cfb545c216c061da243b0eeb2169ff11e80898270a87f432cec937057d585313109d4ae9487a6641eeb5de1b0be69b7615bfca99fb64ab7227d941e6f129c1  0010-dts-pinephone-drop-modem-power-node.patch
-789ae2e405f00e897c357427c587cb7a4a3d3a68b77b9700fb6f6a67d92314fcf75f2ad8b65c0d046215bb7bd5fcf65e4e8e31748170ed595bef1ba3010dd0bf  0011-dts-pinephone-jack-detection.patch
-611bab79b36ee3a9ff8504fa5c56964a0ff1bcd65eacc692d8d991a9bc300e2b16c6d69f4bcad3a35315e848653c2969a985446c385081f019d3e4e74521f42c  0012-pinephone-fix-pogopin-i2c.patch
-59f3da8cf071b2a26121dc4d84c3500e75a2d811067f514e7766fcacbef4ad469f7b89fe181098ae4f23eb39e0b60e1a071db58628c6b64b3e5e475504b2fd81  0013-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
-cccc8e833cd2cd94a6dd79a287c81e4f5d8ad41876bc695afb44f241cdb609696466381adc135535e4db78a742c05181f2e29b6e750850f02241cac442dcdcd6  0014-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
-59a508c9d4f3cfc68a7c2d9ce0fffcf5b4d213631f5909384719d2a1a5be7774c7aa971de404d8f4dafe4f0aa09f22a82688ca446226342a942715d511e14008  0015-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
-9159c63ce65d2c7d9741ca65bd3e67ceaf95d4836d380660e4283fc8c0423e6e754e1d4d5c0b07ba9517e4072bc07ea39a6b4198ecfa00efb656617bcae68c9c  0016-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch"
+sha512sums="
+1340be62c1a7b805e20d54383b98ef3bc1cfe2a8ed790f8368c75d195f00fe9d80a0ad32357452793296c9d817794febc6c4d704cfd22a20bc586689f39e8ebc  linux-postmarketos-allwinner-orange-pi-5.12-20210523-1501.tar.gz
+07a0333d90b18df640f15a3c6cf36680bcfcc6827d28f827c1350adfdf1cc41e9d2de59364d3774c949b8878c7fef8fd0304cde4c2f6b43c43593aa851028fed  config-postmarketos-allwinner.aarch64
+bd0bf2ab037e70a826f26a0ef1c441f0d5bada458128b676b2de0102d05c72961f0be9f00974c7dfab291d95f8612cde88011124497852c53dff30426096114b  config-postmarketos-allwinner.armv7
+126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367  0001-dts-add-dontbeevil-pinephone-devkit.patch
+1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04  0002-dts-add-pinetab-dev-old-display-panel.patch
+96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa  0003-dts-pinetab-add-missing-bma223-ohci1.patch
+925bd630f3694d118b24f2f5a838ba105e4ca9ed8dd4294b6632310d8d6b1f421cdd673e2013758f9de7159050aa54e0f76e04edcff65f755842b1c95b6637e7  0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
+9bc6c2afadae8d367471f901b86a94be7fa70daf7a4bdde5bc6d4b1458b5ddd0e063a7765d962c68231c8f022d1c660d422124c31a2c899de768985d91d377ea  0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+f6b35e61e88d933b612ee3212d71bb3e1aba8590c4985d9c17817426283df578476c00f3297683e43b570599384e78bb1fe76c506b3df93428e2101c4ccb1f3d  0006-dts-pinephone-remove-bt-firmware-suffix.patch
+5e0566074fcb18b95c8ea079178f5d6716eb1ea325a25176e67f80eff1e5b10f90e282c8059a0a3315606546c61f05bd9ebad06adb67086cd123f0276cccbdc8  0007-media-ov5640-Implement-autofocus.patch
+62809ac84db9d684b02d56dfc543451a1a13f319287466cfe913a847b945584ec60f7f556b1259ad3e26a44259a3fe587eeabeef6333f73a77204c3d3573f2ab  0008-dts-pinephone-drop-modem-power-node.patch
+55d9bcd712c7b5402ec470e8c37d724348896b3b47136490a134e6ed305a2ec7734d977426952486537071098c8b64ebbe2f16b2f9e4b3f5796072734d7d4b89  0009-dts-pinephone-jack-detection.patch
+0a9a97ae044c6aecdd1e28fa41065df4017f9925ff2e3448b5afc4f54739c57350a28cf5eb2e1eaa9fb0535a7e144c4d566a0516f37dc70d4e1d6a1d764e6c31  0010-pinephone-fix-pogopin-i2c.patch
+c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e9b07db67019104d98933e31457891a5ce1e6010e06232875  0011-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+7f57e4ebc0b0cebb624f340c568f22e93116f2753b634d9bc75eea1a1bc013b8f9375e1efd24a20bff79c3725166df210a3a30bb7643a4525e3d40b63b91c536  0012-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+71fad7ecff66a2cb692f3dd3d02301c4b419873f27693de81f50226b8ab93c229299e7dc663fdd07a7e8f03a6541527f3bb449626f865fcfde6a780ef1b91976  0013-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+902708a5a8dd8a815d3d1793933d307c551e3c10368d1805431b70691ee5d4438b7146c466549f457468e365f94073a35ae3304928af7581e5dc91ba5c8fa682  0014-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+"
--- a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
+++ b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
@ -1,12 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.11.10 Kernel Configuration
+# Linux/arm64 5.12.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.2.1_git20210318) 10.2.1 20210318"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=235020000
+CONFIG_GCC_VERSION=100301
 CONFIG_CLANG_VERSION=0
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23502
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
@ -271,6 +272,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 #
 # CONFIG_ARCH_ACTIONS is not set
 # CONFIG_ARCH_AGILEX is not set
+# CONFIG_ARCH_N5X is not set
 CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_BCM2835 is not set
@ -306,7 +308,6 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_VISCONTI is not set
 # CONFIG_ARCH_XGENE is not set
-# CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set
 # end of Platform selection

@ -348,6 +349,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 # end of ARM errata workarounds via the alternatives framework

@ -382,7 +384,6 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_PARAVIRT=y
@ -390,6 +391,7 @@ CONFIG_PARAVIRT=y
 CONFIG_KEXEC=y
 # CONFIG_KEXEC_FILE is not set
 CONFIG_CRASH_DUMP=y
+CONFIG_TRANS_TABLE=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN=y
 CONFIG_FORCE_MAX_ZONEORDER=11
@ -407,6 +409,7 @@ CONFIG_KUSER_HELPERS=y
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
 CONFIG_AS_HAS_LDAPR=y
+CONFIG_AS_HAS_LSE_ATOMICS=y
 CONFIG_ARM64_LSE_ATOMICS=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM64_VHE=y
@ -465,7 +468,6 @@ CONFIG_STACKPROTECTOR_PER_TASK=y
 #
 CONFIG_CMDLINE="console=ttyAMA0"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_EFI is not set
 # end of Boot options
@ -644,6 +646,9 @@ CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
+CONFIG_LTO_NONE=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@ -651,6 +656,7 @@ CONFIG_HAVE_MOVE_PUD=y
 CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@ -703,8 +709,6 @@ CONFIG_MODULE_COMPRESS=y
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 CONFIG_MODULE_COMPRESS_XZ=y
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLK_SCSI_REQUEST=y
@ -863,7 +867,6 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
-CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
@ -1324,6 +1327,7 @@ CONFIG_DNS_RESOLVER=y
 # CONFIG_NET_NCSI is not set
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_XPS=y
 # CONFIG_CGROUP_NET_PRIO is not set
 # CONFIG_CGROUP_NET_CLASSID is not set
@ -1483,6 +1487,7 @@ CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
+CONFIG_GENERIC_ARCH_NUMA=y
 # end of Generic Driver Options

 #
@ -1705,7 +1710,6 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 # CONFIG_NET_VENDOR_AMD is not set
 # CONFIG_NET_VENDOR_AQUANTIA is not set
 # CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_AURORA is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_CADENCE is not set
 # CONFIG_NET_VENDOR_CAVIUM is not set
@ -2205,6 +2209,7 @@ CONFIG_DEVMEM=y
 # CONFIG_RAW_DRIVER is not set
 CONFIG_TCG_TPM=y
 # CONFIG_TCG_TIS is not set
+# CONFIG_TCG_TIS_I2C_CR50 is not set
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_INFINEON=y
 # CONFIG_TCG_TIS_I2C_NUVOTON is not set
@ -2348,6 +2353,8 @@ CONFIG_PINCTRL_SUN50I_A100_R=y
 CONFIG_PINCTRL_SUN50I_H5=y
 CONFIG_PINCTRL_SUN50I_H6=y
 CONFIG_PINCTRL_SUN50I_H6_R=y
+CONFIG_PINCTRL_SUN50I_H616=y
+CONFIG_PINCTRL_SUN50I_H616_R=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
@ -2454,6 +2461,7 @@ CONFIG_AXP288_FUEL_GAUGE=y
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_CHARGER_LT3651 is not set
+# CONFIG_CHARGER_LTC4162L is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
@ -2462,6 +2470,7 @@ CONFIG_AXP288_FUEL_GAUGE=y
 # CONFIG_CHARGER_BQ2515X is not set
 # CONFIG_CHARGER_BQ25890 is not set
 # CONFIG_CHARGER_BQ25980 is not set
+# CONFIG_CHARGER_BQ256XX is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_CHARGER_RT9455 is not set
@ -2487,6 +2496,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_ADT7462 is not set
 # CONFIG_SENSORS_ADT7470 is not set
 # CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_AHT10 is not set
 # CONFIG_SENSORS_AS370 is not set
 # CONFIG_SENSORS_ASC7621 is not set
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
@ -2536,6 +2546,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_MAX31790 is not set
 # CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_TC654 is not set
+# CONFIG_SENSORS_TPS23861 is not set
 # CONFIG_SENSORS_MR75203 is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM73 is not set
@ -2805,6 +2816,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MP886X is not set
 # CONFIG_REGULATOR_MPQ7920 is not set
 # CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_MT6315 is not set
 # CONFIG_REGULATOR_PCA9450 is not set
 # CONFIG_REGULATOR_PF8X00 is not set
 # CONFIG_REGULATOR_PFUZE100 is not set
@ -3082,6 +3094,7 @@ CONFIG_VIDEO_SUN8I_ROTATE=y
 # CONFIG_VIDEO_IMX274 is not set
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX334 is not set
 # CONFIG_VIDEO_IMX355 is not set
 # CONFIG_VIDEO_OV02A10 is not set
 # CONFIG_VIDEO_OV2640 is not set
@ -3091,6 +3104,7 @@ CONFIG_VIDEO_SUN8I_ROTATE=y
 CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV5648 is not set
 # CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV5670 is not set
 # CONFIG_VIDEO_OV5675 is not set
@ -3101,6 +3115,7 @@ CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_OV7670 is not set
 # CONFIG_VIDEO_OV7740 is not set
 # CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV8865 is not set
 # CONFIG_VIDEO_OV9640 is not set
 # CONFIG_VIDEO_OV9650 is not set
 # CONFIG_VIDEO_OV13858 is not set
@ -3118,6 +3133,7 @@ CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_NOON010PC30 is not set
 # CONFIG_VIDEO_M5MOLS is not set
 # CONFIG_VIDEO_RDACM20 is not set
+# CONFIG_VIDEO_RDACM21 is not set
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_S5K6AA is not set
 # CONFIG_VIDEO_S5K6A3 is not set
@ -3211,6 +3227,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
+# CONFIG_DRM_PANEL_DSI_CM is not set
 # CONFIG_DRM_PANEL_LVDS is not set
 CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
@ -3219,6 +3236,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=y
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
@ -3481,7 +3499,6 @@ CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
 # CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
 # CONFIG_SND_SOC_XILINX_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
-# CONFIG_ZX_TDM is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m

 #
@ -3554,10 +3571,10 @@ CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
+# CONFIG_SND_SOC_RT5659 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 # CONFIG_SND_SOC_SPDIF is not set
 # CONFIG_SND_SOC_SSM2305 is not set
 # CONFIG_SND_SOC_SSM2602_I2C is not set
@ -3618,6 +3635,8 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
 # CONFIG_SND_SOC_LPASS_VA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
+# CONFIG_SND_SOC_LPASS_TX_MACRO is not set
 # end of CODEC drivers

 CONFIG_SND_SIMPLE_CARD_UTILS=m
@ -3705,6 +3724,7 @@ CONFIG_HID_MULTITOUCH=y
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PLANTRONICS is not set
+# CONFIG_HID_PLAYSTATION is not set
 # CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_RETRODE is not set
 # CONFIG_HID_ROCCAT is not set
@ -3745,8 +3765,11 @@ CONFIG_USB_HID=y
 #
 # I2C HID support
 #
-CONFIG_I2C_HID=m
+CONFIG_I2C_HID_OF=m
+CONFIG_I2C_HID_OF_GOODIX=m
 # end of I2C HID support
+
+CONFIG_I2C_HID_CORE=m
 # end of HID support

 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@ -3833,7 +3856,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS3 is not set
+# CONFIG_USB_CDNS_SUPPORT is not set
 CONFIG_USB_MUSB_HDRC=y
 # CONFIG_USB_MUSB_HOST is not set
 # CONFIG_USB_MUSB_GADGET is not set
@ -3937,6 +3960,7 @@ CONFIG_USB_SERIAL_OPTION=m
 # CONFIG_USB_SERIAL_SSU100 is not set
 # CONFIG_USB_SERIAL_QT2 is not set
 # CONFIG_USB_SERIAL_UPD78F0730 is not set
+# CONFIG_USB_SERIAL_XR is not set
 # CONFIG_USB_SERIAL_DEBUG is not set

 #
@ -4000,10 +4024,6 @@ CONFIG_USB_SNP_CORE=y
 CONFIG_USB_SNP_UDC_PLAT=y
 # CONFIG_USB_M66592 is not set
 CONFIG_USB_BDC_UDC=y
-
-#
-# Platform Support
-#
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
@ -4206,6 +4226,12 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_AUDIO is not set
+# CONFIG_LEDS_TRIGGER_TTY is not set
+
+#
+# LED Blink
+#
+# CONFIG_LEDS_BLINK is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
@ -4354,6 +4380,7 @@ CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
 # CONFIG_DMABUF_HEAPS is not set
 # end of DMABUF options
@ -4500,6 +4527,7 @@ CONFIG_COMMON_CLK_SCPI=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 CONFIG_COMMON_CLK_CS2000_CP=y
+# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=y
 # CONFIG_COMMON_CLK_VC5 is not set
@ -4514,11 +4542,13 @@ CONFIG_SUN50I_A64_CCU=y
 CONFIG_SUN50I_A100_CCU=y
 CONFIG_SUN50I_A100_R_CCU=y
 CONFIG_SUN50I_H6_CCU=y
+CONFIG_SUN50I_H616_CCU=y
 CONFIG_SUN50I_H6_R_CCU=y
 # CONFIG_SUN8I_A83T_CCU is not set
 CONFIG_SUN8I_H3_CCU=y
 CONFIG_SUN8I_DE2_CCU=y
 CONFIG_SUN8I_R_CCU=y
+# CONFIG_XILINX_VCU is not set
 CONFIG_HWSPINLOCK=y

 #
@ -4526,6 +4556,8 @@ CONFIG_HWSPINLOCK=y
 #
 CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_SUN4I_TIMER=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
@ -4628,7 +4660,6 @@ CONFIG_SUNXI_SRAM=y
 #
 # Xilinx SoC drivers
 #
-# CONFIG_XILINX_VCU is not set
 # end of Xilinx SoC drivers
 # end of SOC (System On Chip) specific Drivers

@ -4646,6 +4677,7 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 #
 # DEVFREQ Drivers
 #
+# CONFIG_ARM_SUN8I_MBUS_DEVFREQ is not set
 # CONFIG_PM_DEVFREQ_EVENT is not set
 CONFIG_EXTCON=y

@ -4927,6 +4959,7 @@ CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_RM3100_I2C is not set
+# CONFIG_YAMAHA_YAS530 is not set
 # end of Magnetometer sensors

 #
@ -5114,6 +5147,7 @@ CONFIG_NVMEM=y
 # CONFIG_NVMEM_SYSFS is not set
 # CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SUNXI_SID=y
+# CONFIG_NVMEM_RMEM is not set

 #
 # HW tracing support
@ -5182,6 +5216,7 @@ CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_COMPRESSION=y
 CONFIG_F2FS_FS_LZO=y
 CONFIG_F2FS_FS_LZ4=y
+CONFIG_F2FS_FS_LZ4HC=y
 CONFIG_F2FS_FS_ZSTD=y
 CONFIG_F2FS_FS_LZORLE=y
 # CONFIG_FS_DAX is not set
@ -5309,7 +5344,7 @@ CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=y
 CONFIG_PNFS_BLOCK=y
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=y
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
 CONFIG_NFS_V4_SECURITY_LABEL=y
@ -5323,6 +5358,7 @@ CONFIG_GRACE_PERIOD=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_SUNRPC_BACKCHANNEL=y
@ -5542,17 +5578,13 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
 # CONFIG_CRYPTO_STREEBOG is not set
-# CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_WP512 is not set

 #
@ -5566,7 +5598,6 @@ CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_CAST6 is not set
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_SALSA20 is not set
 CONFIG_CRYPTO_CHACHA20=m
 # CONFIG_CRYPTO_SERPENT is not set
 # CONFIG_CRYPTO_SM4 is not set
@ -5689,6 +5720,7 @@ CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=y
+CONFIG_LZ4HC_COMPRESS=y
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
@ -5798,7 +5830,9 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=2048
@ -5861,6 +5895,8 @@ CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # CONFIG_KASAN is not set
+CONFIG_HAVE_ARCH_KFENCE=y
+# CONFIG_KFENCE is not set
 # end of Memory Debugging

 # CONFIG_DEBUG_SHIRQ is not set
@ -5907,6 +5943,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_CSD_LOCK_WAIT_DEBUG is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)

+# CONFIG_DEBUG_IRQFLAGS is not set
 # CONFIG_STACKTRACE is not set
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
--- a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7
+++ b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7
@ -1,12 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.11.10 Kernel Configuration
+# Linux/arm 5.12.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 10.2.1_git20210318) 10.2.1 20210318"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=235020000
+CONFIG_GCC_VERSION=100301
 CONFIG_CLANG_VERSION=0
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23502
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
@ -292,7 +293,6 @@ CONFIG_ARCH_MULTI_V6_V7=y
 # CONFIG_SOC_DRA7XX is not set
 # end of TI OMAP/AM/DM/DRA Family

-# CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_RDA is not set
 # CONFIG_ARCH_REALTEK is not set
@ -312,13 +312,11 @@ CONFIG_MACH_SUN7I=y
 CONFIG_MACH_SUN8I=y
 CONFIG_MACH_SUN9I=y
 CONFIG_ARCH_SUNXI_MC_SMP=y
-# CONFIG_ARCH_TANGO is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_U8500 is not set
 # CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_WM8850 is not set
-# CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQ is not set

 #
@ -563,6 +561,8 @@ CONFIG_CRYPTO_SHA1_ARM=m
 # CONFIG_CRYPTO_SHA2_ARM_CE is not set
 CONFIG_CRYPTO_SHA256_ARM=m
 CONFIG_CRYPTO_SHA512_ARM=m
+# CONFIG_CRYPTO_BLAKE2S_ARM is not set
+# CONFIG_CRYPTO_BLAKE2B_NEON is not set
 CONFIG_CRYPTO_AES_ARM=m
 # CONFIG_CRYPTO_AES_ARM_BS is not set
 # CONFIG_CRYPTO_AES_ARM_CE is not set
@ -579,7 +579,6 @@ CONFIG_AS_VFP_VMRS_FPINST=y
 # General architecture-dependent options
 #
 CONFIG_SET_FS=y
-CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 # CONFIG_JUMP_LABEL is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@ -603,6 +602,7 @@ CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
@ -612,6 +612,7 @@ CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_LTO_NONE=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@ -662,8 +663,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLK_SCSI_REQUEST=y
@ -752,7 +751,6 @@ CONFIG_CMA_AREAS=7
 # CONFIG_ZSMALLOC is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_KMAP_LOCAL=y
@ -993,6 +991,7 @@ CONFIG_DNS_RESOLVER=y
 # CONFIG_NET_NCSI is not set
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_XPS=y
 # CONFIG_CGROUP_NET_PRIO is not set
 # CONFIG_CGROUP_NET_CLASSID is not set
@ -1386,6 +1385,7 @@ CONFIG_VETH=y
 #
 # Distributed Switch Architecture drivers
 #
+# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
 # end of Distributed Switch Architecture drivers

 CONFIG_ETHERNET=y
@ -1396,8 +1396,6 @@ CONFIG_SUN4I_EMAC=y
 CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AQUANTIA=y
 # CONFIG_NET_VENDOR_ARC is not set
-CONFIG_NET_VENDOR_AURORA=y
-# CONFIG_AURORA_NB8800 is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
 CONFIG_NET_VENDOR_CADENCE=y
 # CONFIG_MACB is not set
@ -1457,6 +1455,7 @@ CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_EMACLITE is not set
 # CONFIG_XILINX_AXI_EMAC is not set
 # CONFIG_XILINX_LL_TEMAC is not set
 CONFIG_PHYLINK=y
@ -1673,6 +1672,7 @@ CONFIG_MT76_USB=m
 CONFIG_MT76_SDIO=m
 CONFIG_MT76x02_LIB=m
 CONFIG_MT76x02_USB=m
+CONFIG_MT76_CONNAC_LIB=m
 CONFIG_MT76x0_COMMON=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2_COMMON=m
@ -1967,7 +1967,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_FSL_LPUART is not set
@ -2171,6 +2170,8 @@ CONFIG_PINCTRL_SUN9I_A80_R=y
 # CONFIG_PINCTRL_SUN50I_H5 is not set
 # CONFIG_PINCTRL_SUN50I_H6 is not set
 # CONFIG_PINCTRL_SUN50I_H6_R is not set
+# CONFIG_PINCTRL_SUN50I_H616 is not set
+# CONFIG_PINCTRL_SUN50I_H616_R is not set
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
@ -2272,6 +2273,7 @@ CONFIG_AXP20X_POWER=y
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_CHARGER_LT3651 is not set
+# CONFIG_CHARGER_LTC4162L is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
@ -2280,6 +2282,7 @@ CONFIG_AXP20X_POWER=y
 # CONFIG_CHARGER_BQ2515X is not set
 # CONFIG_CHARGER_BQ25890 is not set
 # CONFIG_CHARGER_BQ25980 is not set
+# CONFIG_CHARGER_BQ256XX is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_CHARGER_RT9455 is not set
@ -2307,6 +2310,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_ADT7462 is not set
 # CONFIG_SENSORS_ADT7470 is not set
 # CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_AHT10 is not set
 # CONFIG_SENSORS_AS370 is not set
 # CONFIG_SENSORS_ASC7621 is not set
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
@ -2359,6 +2363,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MAX31790 is not set
 # CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_TC654 is not set
+# CONFIG_SENSORS_TPS23861 is not set
 # CONFIG_SENSORS_MR75203 is not set
 # CONFIG_SENSORS_ADCXX is not set
 # CONFIG_SENSORS_LM63 is not set
@ -2845,6 +2850,7 @@ CONFIG_DRM_SUN8I_MIXER=y
 CONFIG_DRM_SUN8I_TCON_TOP=y
 # CONFIG_DRM_OMAP is not set
 # CONFIG_DRM_TILCDC is not set
+# CONFIG_DRM_VIRTIO_GPU is not set
 # CONFIG_DRM_FSL_DCU is not set
 # CONFIG_DRM_STM is not set
 CONFIG_DRM_PANEL=y
@ -2857,6 +2863,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
+# CONFIG_DRM_PANEL_DSI_CM is not set
 CONFIG_DRM_PANEL_LVDS=y
 CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
@ -2866,6 +2873,7 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
@ -3139,7 +3147,6 @@ CONFIG_SND_SUN8I_ADDA_PR_REGMAP=y
 # CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
 # CONFIG_SND_SOC_XILINX_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
-# CONFIG_ZX_TDM is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y

 #
@ -3221,10 +3228,10 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
+# CONFIG_SND_SOC_RT5659 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 # CONFIG_SND_SOC_SPDIF is not set
 # CONFIG_SND_SOC_SSM2305 is not set
 # CONFIG_SND_SOC_SSM2602_SPI is not set
@ -3291,6 +3298,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
 # CONFIG_SND_SOC_LPASS_VA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
+# CONFIG_SND_SOC_LPASS_TX_MACRO is not set
 # end of CODEC drivers

 # CONFIG_SND_SIMPLE_CARD is not set
@ -3374,6 +3383,7 @@ CONFIG_HID_MONTEREY=y
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PLANTRONICS is not set
+# CONFIG_HID_PLAYSTATION is not set
 # CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_RETRODE is not set
 # CONFIG_HID_ROCCAT is not set
@ -3413,7 +3423,8 @@ CONFIG_USB_HID=y
 #
 # I2C HID support
 #
-# CONFIG_I2C_HID is not set
+# CONFIG_I2C_HID_OF is not set
+# CONFIG_I2C_HID_OF_GOODIX is not set
 # end of I2C HID support
 # end of HID support

@ -3511,7 +3522,7 @@ CONFIG_USBIP_VHCI_NR_HCS=1
 CONFIG_USBIP_HOST=m
 CONFIG_USBIP_VUDC=m
 # CONFIG_USBIP_DEBUG is not set
-# CONFIG_USB_CDNS3 is not set
+# CONFIG_USB_CDNS_SUPPORT is not set
 CONFIG_USB_MUSB_HDRC=y
 # CONFIG_USB_MUSB_HOST is not set
 # CONFIG_USB_MUSB_GADGET is not set
@ -3599,10 +3610,6 @@ CONFIG_USB_SNP_CORE=m
 CONFIG_USB_SNP_UDC_PLAT=m
 CONFIG_USB_M66592=m
 CONFIG_USB_BDC_UDC=m
-
-#
-# Platform Support
-#
 CONFIG_USB_NET2272=m
 CONFIG_USB_NET2272_DMA=y
 CONFIG_USB_GADGET_XILINX=m
@ -3811,6 +3818,12 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 # CONFIG_LEDS_TRIGGER_PATTERN is not set
 # CONFIG_LEDS_TRIGGER_AUDIO is not set
+# CONFIG_LEDS_TRIGGER_TTY is not set
+
+#
+# LED Blink
+#
+# CONFIG_LEDS_BLINK is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_ATOMIC_SCRUB=y
@ -3964,6 +3977,7 @@ CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
 # CONFIG_DMABUF_HEAPS is not set
 # end of DMABUF options
@ -4103,6 +4117,7 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
@ -4124,6 +4139,7 @@ CONFIG_SUN8I_DE2_CCU=y
 CONFIG_SUN8I_R40_CCU=y
 CONFIG_SUN9I_A80_CCU=y
 CONFIG_SUN8I_R_CCU=y
+# CONFIG_XILINX_VCU is not set
 # CONFIG_HWSPINLOCK is not set

 #
@ -4206,7 +4222,6 @@ CONFIG_SUNXI_SRAM=y
 #
 # Xilinx SoC drivers
 #
-# CONFIG_XILINX_VCU is not set
 # end of Xilinx SoC drivers
 # end of SOC (System On Chip) specific Drivers

@ -4224,6 +4239,7 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 #
 # DEVFREQ Drivers
 #
+# CONFIG_ARM_SUN8I_MBUS_DEVFREQ is not set
 # CONFIG_PM_DEVFREQ_EVENT is not set
 CONFIG_EXTCON=y

@ -4404,6 +4420,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_AD5758 is not set
 # CONFIG_AD5761 is not set
 # CONFIG_AD5764 is not set
+# CONFIG_AD5766 is not set
 # CONFIG_AD5770R is not set
 # CONFIG_AD5791 is not set
 # CONFIG_AD7303 is not set
@ -4574,6 +4591,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_SENSORS_HMC5843_SPI is not set
 # CONFIG_SENSORS_RM3100_I2C is not set
 # CONFIG_SENSORS_RM3100_SPI is not set
+# CONFIG_YAMAHA_YAS530 is not set
 # end of Magnetometer sensors

 #
@ -4754,6 +4772,7 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_SUNXI_SID=y
+# CONFIG_NVMEM_RMEM is not set

 #
 # HW tracing support
@ -4913,6 +4932,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
 # CONFIG_SUNRPC_DEBUG is not set
@ -5101,17 +5121,13 @@ CONFIG_CRYPTO_GHASH=m
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-# CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_SHA3 is not set
 # CONFIG_CRYPTO_SM3 is not set
 # CONFIG_CRYPTO_STREEBOG is not set
-# CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_WP512 is not set

 #
@ -5125,7 +5141,6 @@ CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_CAST6 is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
 # CONFIG_CRYPTO_SERPENT is not set
 # CONFIG_CRYPTO_SM4 is not set
@ -5174,6 +5189,7 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=y
 CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
+# CONFIG_CRYPTO_DEV_SUN4I_SS_DEBUG is not set
 CONFIG_CRYPTO_DEV_SUN8I_CE=y
 # CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG is not set
 # CONFIG_CRYPTO_DEV_SUN8I_CE_HASH is not set
@ -5392,6 +5408,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)

+# CONFIG_DEBUG_IRQFLAGS is not set
 # CONFIG_STACKTRACE is not set
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set