diff --git a/main/linux-postmarketos-allwinner/0001-dts-add-dontbeevil-pinephone-devkit.patch b/main/linux-postmarketos-allwinner/0001-dts-add-dontbeevil-pinephone-devkit.patch
new file mode 100644
index 000000000..7983bcf24
--- /dev/null
+++ b/main/linux-postmarketos-allwinner/0001-dts-add-dontbeevil-pinephone-devkit.patch
@@ -0,0 +1,536 @@
+From 81945ed0ee2ac05aa130046a809de5c50243216d 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)
+
+* arm64: dts: allwinner: add support for pinephone devkit
+* dontbeevil: add separate dts for longts devkit
+* dontbeevil: add flash
+* dontbeevil: connect the flash to the camera
+* dontbeevil: use new flash dt binding
+---
+ arch/arm64/boot/dts/allwinner/Makefile        |   2 +
+ .../sun50i-a64-dontbeevil-longts.dts          |  14 +
+ .../dts/allwinner/sun50i-a64-dontbeevil.dts   | 476 ++++++++++++++++++
+ 3 files changed, 492 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil-longts.dts
+ 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 916d10d5b87c..a21cfdd8924d 100644
+--- a/arch/arm64/boot/dts/allwinner/Makefile
++++ b/arch/arm64/boot/dts/allwinner/Makefile
+@@ -1,6 +1,8 @@
+ # SPDX-License-Identifier: GPL-2.0
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-amarula-relic.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb
++dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-dontbeevil.dtb
++dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-dontbeevil-longts.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-nanopi-a64.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-oceanic-5205-5inmfd.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-olinuxino.dtb
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil-longts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil-longts.dts
+new file mode 100644
+index 000000000000..49f71536649b
+--- /dev/null
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil-longts.dts
+@@ -0,0 +1,14 @@
++/dts-v1/;
++
++#include "sun50i-a64-dontbeevil.dts"
++
++/ {
++	model = "PinePhone Don't be evil development kit with long touch cable";
++	compatible = "pine64,sopine-baseboard", "pine64,sopine",
++		     "allwinner,sun50i-a64";
++
++};
++
++&touchscreen {
++	touchscreen-inverted-x;
++};
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts
+new file mode 100644
+index 000000000000..15a91f2d6202
+--- /dev/null
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts
+@@ -0,0 +1,476 @@
++/*
++ * Copyright (c) 2017 Icenowy Zheng <icenowy@aosc.xyz>
++ *
++ * Based on sun50i-a64-pine64.dts, which is:
++ *   Copyright (c) 2016 ARM Ltd.
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This library is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This library is distributed in the hope that it will be useful,
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++
++#include "sun50i-a64-sopine.dtsi"
++#include <dt-bindings/pwm/pwm.h>
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/leds/common.h>
++
++/ {
++	model = "PinePhone Don't be evil development kit";
++	compatible = "pine64,sopine-baseboard", "pine64,sopine",
++		     "allwinner,sun50i-a64";
++
++	aliases {
++		ethernet0 = &emac;
++		serial0 = &uart0;
++	};
++
++	chosen {
++		stdout-path = "serial0:115200n8";
++	};
++
++	i2c-csi {
++		compatible = "i2c-gpio";
++		sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* CSI-SDA: PE13 */
++		scl-gpios = <&pio 4 12 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* CSI-SCK: PE12 */
++		i2c-gpio,delay-us = <5>;
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		ov5640: camera@3c {
++			compatible = "ovti,ov5640";
++			reg = <0x3c>;
++			pinctrl-names = "default";
++			pinctrl-0 = <&csi_mclk_pin>;
++			clocks = <&ccu CLK_CSI_MCLK>;
++			clock-names = "xclk";
++
++			AVDD-supply = <&reg_dldo3>;
++			DOVDD-supply = <&reg_aldo1>;
++			DVDD-supply = <&reg_eldo3>;
++			reset-gpios = <&pio 3 3 GPIO_ACTIVE_LOW>; /* CSI-RST-R: PD3 */
++			powerdown-gpios = <&pio 2 0 GPIO_ACTIVE_HIGH>; /* CSI-STBY-R: PC0 */
++
++			flash-leds = <&sgm3140_flash>;
++
++			port {
++				ov5640_ep: endpoint {
++					remote-endpoint = <&csi_ep>;
++					bus-width = <8>;
++					hsync-active = <1>; /* Active high */
++					vsync-active = <0>; /* Active low */
++					data-active = <1>;  /* Active high */
++					pclk-sample = <1>;  /* Rising */
++				};
++			};
++		};
++	};
++
++
++	hdmi-connector {
++		compatible = "hdmi-connector";
++		type = "a";
++
++		port {
++			hdmi_con_in: endpoint {
++				remote-endpoint = <&hdmi_out_con>;
++			};
++		};
++	};
++
++	reg_vcc1v8: vcc1v8 {
++		compatible = "regulator-fixed";
++		regulator-name = "vcc1v8";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <1800000>;
++	};
++
++	backlight: backlight {
++		compatible = "pwm-backlight";
++		pwms = <&r_pwm 0 50000 PWM_POLARITY_INVERTED>;
++		brightness-levels = <0 1 2 4 8 16 32 64 128 512>;
++		default-brightness-level = <2>;
++		enable-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* LCD-BL-EN: PH10 */
++	};
++
++	vibrator {
++		compatible = "gpio-vibrator";
++		enable-gpios = <&pio 3 2 GPIO_ACTIVE_HIGH>; /* PD2 */
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		red {
++			gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 */
++		};
++		green {
++			gpios = <&r_pio 0 9 GPIO_ACTIVE_LOW>; /* PL9 */
++		};
++		blue {
++			gpios = <&r_pio 0 11 GPIO_ACTIVE_LOW>; /* PL11 */
++		};
++	};
++
++	speaker_amp: audio-amplifier {
++		compatible = "simple-audio-amplifier";
++		enable-gpios = <&pio 2 7 GPIO_ACTIVE_HIGH>; /* PA-SHDN: PC7 */
++		sound-name-prefix = "Speaker Amp";
++	};
++
++	sgm3140 {
++		compatible = "sgmicro,sgm3140";
++		flash-gpios = <&pio 3 7 GPIO_ACTIVE_HIGH>; /* FLASH_TRIGOUT: PD7 */
++		enable-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* FLASH_EN: PB3 */
++
++		sgm3140_flash: led {
++			function = LED_FUNCTION_FLASH;
++			color = <LED_COLOR_ID_WHITE>;
++		};
++	};
++};
++
++&ac_power_supply {
++	status = "okay";
++};
++
++&battery_power_supply {
++	status = "okay";
++};
++
++&codec {
++	status = "okay";
++};
++
++&codec_analog {
++	status = "okay";
++};
++
++&csi {
++	status = "okay";
++
++	port {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		csi_ep: endpoint {
++			remote-endpoint = <&ov5640_ep>;
++			bus-width = <8>;
++			hsync-active = <1>; /* Active high */
++			vsync-active = <0>; /* Active low */
++			data-active = <1>;  /* Active high */
++			pclk-sample = <1>;  /* Rising */
++		};
++	};
++};
++
++&dai {
++	status = "okay";
++};
++
++&de {
++	status = "okay";
++};
++
++&dphy {
++	status = "okay";
++};
++
++&reg_ldo_io0 {
++	regulator-min-microvolt = <3300000>;
++	regulator-max-microvolt = <3300000>;
++	regulator-name = "vcc-ctp";
++	status = "okay";
++};
++
++&dsi {
++	vcc-dsi-supply = <&reg_dldo1>;		/* VCC3V3-DSI */
++	#address-cells = <1>;
++	#size-cells = <0>;
++	status = "okay";
++
++	panel@0 {
++		compatible = "pinephone,jd9365da";
++		reg = <0>;
++		avdd-supply = <&reg_dc1sw>;	/* VCC-LCD */
++		dvdd-supply = <&reg_dldo2>;	/* VCC-MIPI */
++		cvdd-supply = <&reg_ldo_io0>;			/* VCC-CTP: GPIO0-LDO */
++		reset-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* LCD-RST: PD24 */
++		backlight = <&backlight>;
++	};
++};
++
++&r_pwm {
++	pinctrl-names = "default";
++	pinctrl-0 = <&r_pwm_pin>;
++	status = "okay";
++};
++
++&ehci0 {
++	status = "okay";
++};
++
++&ehci1 {
++	status = "okay";
++};
++
++&emac {
++	pinctrl-names = "default";
++	pinctrl-0 = <&rgmii_pins>;
++	phy-mode = "rgmii";
++	phy-handle = <&ext_rgmii_phy>;
++	phy-supply = <&reg_dc1sw>;
++	status = "okay";
++};
++
++&hdmi {
++	hvcc-supply = <&reg_dldo1>;
++	status = "disabled";
++};
++
++&hdmi_out {
++	hdmi_out_con: endpoint {
++		remote-endpoint = <&hdmi_con_in>;
++	};
++};
++
++
++
++&i2c0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c0_pins>;
++	status = "okay";
++
++	touchscreen: ft6236@38 {
++		compatible = "focaltech,ft6236", "edt,edt-6236";
++		reg = <0x38>;
++
++		pinctrl-names = "default";
++		pinctrl-0 = <&touch_intr_pin>;
++
++		interrupt-parent = <&pio>;
++		interrupts = <7 4 IRQ_TYPE_EDGE_FALLING>;
++		irq-gpios = <&pio 7 4 GPIO_ACTIVE_LOW>;
++
++		vdd-supply = <&reg_ldo_io0>;
++
++		touchscreen-size-x = <720>;
++		touchscreen-size-y = <1440>;
++	};
++};
++
++&pio {
++	touch_intr_pin: touch_intr_pin {
++		pins = "PH4";
++		// TODO: perhaps remove this bias
++		bias-pull-up;
++		function = "irq";
++	};
++};
++
++
++&i2c1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c1_pins>;
++	status = "okay";
++
++	mpu6050@68 {
++		compatible = "invensense,mpu6050";
++		reg = <0x68>;
++		interrupt-parent = <&pio>;
++		interrupts = <7 5 IRQ_TYPE_EDGE_FALLING>; /* PH5 */
++		mount-matrix = "0", "1", "0",
++			       "1", "0", "0",
++			       "0", "0", "1";
++	};
++
++	lis3mdl@1e {
++		compatible = "st,lis3mdl-magn";
++		reg = <0x1e>;
++		interrupt-parent = <&pio>;
++		interrupts = <1 1 IRQ_TYPE_EDGE_RISING>; /* PB1 */
++	};
++
++	stk3335@47 {
++		compatible = "sensortek,stk3335";
++		reg = <0x47>;
++		interrupt-parent = <&pio>;
++		interrupts = <1 0 IRQ_TYPE_EDGE_FALLING>; /* PB0 */
++	};
++};
++
++&lradc {
++	vref-supply = <&reg_aldo3>;
++	status = "okay";
++
++	button@191 {
++		label = "Volume Up";
++		linux,code = <KEY_VOLUMEUP>;
++		channel = <0>;
++		voltage = <357142>;
++	};
++
++	button@392 {
++		label = "Volume Down";
++		linux,code = <KEY_VOLUMEDOWN>;
++		channel = <0>;
++		voltage = <750000>;
++	};
++};
++
++&mdio {
++	ext_rgmii_phy: ethernet-phy@1 {
++		compatible = "ethernet-phy-ieee802.3-c22";
++		reg = <1>;
++	};
++};
++
++&mmc1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc1_pins>;
++	vmmc-supply = <&reg_dcdc1>;
++	vqmmc-supply = <&reg_dldo4>;
++	bus-width = <4>;
++	non-removable;
++	status = "okay";
++
++	rtl8723bs: wifi@1 {
++		reg = <1>;
++	};
++};
++
++&mmc2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc2_pins>;
++	vmmc-supply = <&reg_dcdc1>;
++	vqmmc-supply = <&reg_vcc1v8>;
++	bus-width = <8>;
++	non-removable;
++	cap-mmc-hw-reset;
++	mmc-hs200-1_8v;
++	status = "okay";
++};
++
++&ohci0 {
++	status = "okay";
++};
++
++&ohci1 {
++	status = "okay";
++};
++
++&reg_dc1sw {
++	regulator-name = "vcc-lcd";
++};
++
++&reg_dldo1 {
++	regulator-min-microvolt = <3300000>;
++	regulator-max-microvolt = <3300000>;
++	regulator-name = "vcc-hdmi";
++};
++
++&reg_dldo2 {
++	regulator-min-microvolt = <3300000>;
++	regulator-max-microvolt = <3300000>;
++	regulator-name = "vcc-mipi";
++};
++
++&reg_dldo4 {
++	regulator-min-microvolt = <3300000>;
++	regulator-max-microvolt = <3300000>;
++	regulator-name = "vcc-wifi";
++};
++
++&simplefb_hdmi {
++	vcc-hdmi-supply = <&reg_dldo1>;
++};
++
++&sound {
++	simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>;
++	simple-audio-card,widgets = "Microphone", "Microphone",
++				    "Headphone", "Headphone Jack",
++				    "Speaker", "Earpiece Speaker";
++	simple-audio-card,routing =
++			"Earpiece Speaker", "EARPIECE",
++			"Headphone Jack", "Speaker Amp OUTL",
++			"Speaker Amp INL", "HP",
++			"Left DAC", "DAC Left",
++			"Right DAC", "DAC Right",
++			"ADC Left", "Left ADC",
++			"ADC Right", "Right ADC",
++			"Microphone", "HBIAS",
++			"MIC2", "Microphone";
++	status = "okay";
++};
++
++&uart0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart0_pb_pins>;
++	status = "okay";
++};
++
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
++	status = "okay";
++
++	bluetooth {
++		compatible = "realtek,rtl8723bs-bt";
++		enable-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
++		device-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
++		host-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
++		firmware-postfix = "pine64";
++	};
++};
++
++&usb_otg {
++	dr_mode = "otg";
++	status = "okay";
++};
++
++&usbphy {
++	status = "okay";
++};
++
++&tcon1 {
++	status = "disabled";
++};
++
++&hdmi_phy {
++	status = "disabled";
++};
+-- 
+2.25.4
+
diff --git 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
new file mode 100644
index 000000000..cc98ebab9
--- /dev/null
+++ b/main/linux-postmarketos-allwinner/0002-dts-add-pinetab-dev-old-display-panel.patch
@@ -0,0 +1,61 @@
+From 898eeec10d6a55629f42e7f72111c5159cef07f3 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)
+
+---
+ arch/arm64/boot/dts/allwinner/Makefile        |  1 +
+ .../dts/allwinner/sun50i-a64-pinetab-dev.dts  | 29 +++++++++++++++++++
+ 2 files changed, 30 insertions(+)
+ 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 a21cfdd8924d..2936092002b5 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
+ 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-dev.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-teres-i.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-bananapi-m2-plus.dtb
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
+new file mode 100644
+index 000000000000..1e287f2fb9f3
+--- /dev/null
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
+@@ -0,0 +1,29 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (C) 2019 Icenowy Zheng <icenowy@aosc.xyz>
++ *
++ */
++
++/dts-v1/;
++
++#include "sun50i-a64-pinetab.dts"
++
++/ {
++	model = "PineTab";
++	compatible = "pine64,pinetab", "allwinner,sun50i-a64";
++};
++
++&dsi {
++	vcc-dsi-supply = <&reg_dldo1>;
++	status = "okay";
++
++	panel@0 {
++		compatible = "feixin,k101-im2ba02";
++		reg = <0>;
++		avdd-supply = <&reg_dc1sw>;
++		dvdd-supply = <&reg_dc1sw>;
++		cvdd-supply = <&reg_ldo_io1>;
++		reset-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
++		backlight = <&backlight>;
++	};
++};
+-- 
+2.25.4
+
diff --git a/main/linux-postmarketos-allwinner/disable-power-save.patch b/main/linux-postmarketos-allwinner/0003-Disable-8723cs-power-saving.patch
similarity index 90%
rename from main/linux-postmarketos-allwinner/disable-power-save.patch
rename to main/linux-postmarketos-allwinner/0003-Disable-8723cs-power-saving.patch
index e58a2afa5..2da46eb51 100644
--- a/main/linux-postmarketos-allwinner/disable-power-save.patch
+++ b/main/linux-postmarketos-allwinner/0003-Disable-8723cs-power-saving.patch
@@ -1,7 +1,7 @@
-From 62b516401f008d166b93ad2ea6f3012989b0cccb Mon Sep 17 00:00:00 2001
+From 1864d7b1990cc68c21bd43b5f96760a9e8f04e2c Mon Sep 17 00:00:00 2001
 From: Dalton <dalton@ubports.com>
 Date: Tue, 23 Jun 2020 20:54:12 -0500
-Subject: [PATCH] UBPORTS SAUCE: Disable 8723cs power saving
+Subject: [PATCH] Disable 8723cs power saving
 
 The runtime power management features in the 8723cs firmware on the
 PinePhone don't seem to work correctly. While we expect the chipset to
@@ -30,5 +30,5 @@ index 3e6ba0a0fd17..5bb850a4caf0 100644
  		int rtw_ips_mode = IPS_LEVEL_2;
  	#else
 -- 
-GitLab
+2.25.4
 
diff --git a/main/linux-postmarketos-allwinner/camera-added-bggr-bayer-mode.patch b/main/linux-postmarketos-allwinner/0004-media-gc2145-Added-BGGR-bayer-mode.patch
similarity index 92%
rename from main/linux-postmarketos-allwinner/camera-added-bggr-bayer-mode.patch
rename to main/linux-postmarketos-allwinner/0004-media-gc2145-Added-BGGR-bayer-mode.patch
index c7b869ddd..826aee5b0 100644
--- a/main/linux-postmarketos-allwinner/camera-added-bggr-bayer-mode.patch
+++ b/main/linux-postmarketos-allwinner/0004-media-gc2145-Added-BGGR-bayer-mode.patch
@@ -1,4 +1,4 @@
-From 298c18c5bdc5f1ff302e6c83d642a7ce6307c921 Mon Sep 17 00:00:00 2001
+From e2cbeb9a99c159024504f69b764779a61598090e Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Fri, 4 Sep 2020 17:35:39 +0200
 Subject: [PATCH] media: gc2145: Added BGGR bayer mode
@@ -26,5 +26,5 @@ index 40a50ee17fd3..bed611045de9 100644
  
  static const struct gc2145_pixfmt *gc2145_find_format(u32 code)
 -- 
-GitLab
+2.25.4
 
diff --git a/main/linux-postmarketos-allwinner/0005-dts-pinephone-Disable-flash-led-in-OV5640-node.patch b/main/linux-postmarketos-allwinner/0005-dts-pinephone-Disable-flash-led-in-OV5640-node.patch
new file mode 100644
index 000000000..85fa977f6
--- /dev/null
+++ b/main/linux-postmarketos-allwinner/0005-dts-pinephone-Disable-flash-led-in-OV5640-node.patch
@@ -0,0 +1,27 @@
+From 06812a9cf09e1990ed94f7bbe944cfb1978384da Mon Sep 17 00:00:00 2001
+From: Martijn Braam <martijn@brixit.nl>
+Date: Mon, 19 Oct 2020 09:17:07 +0200
+Subject: [PATCH] dts: pinephone: Disable flash-led in OV5640 node
+
+v4l2 can't deal with it yet, so having it enabled results in broken
+camera.
+---
+ arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 2 --
+ 1 file changed, 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 3781eb8ead66..6bc0e9d6d847 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+@@ -439,8 +439,6 @@ ov5640: rear-camera@4c {
+ 		reset-gpios = <&pio 3 3 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; /* PD3 */
+ 		powerdown-gpios = <&pio 2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PC0 */
+ 
+-		flash-leds = <&sgm3140_flash>;
+-
+ 		port {
+ 			ov5640_ep: endpoint {
+ 				remote-endpoint = <&csi_ov5640_ep>;
+-- 
+2.25.4
+
diff --git a/main/linux-postmarketos-allwinner/0006-dts-pinetab-add-missing-bma223-ohci1.patch b/main/linux-postmarketos-allwinner/0006-dts-pinetab-add-missing-bma223-ohci1.patch
new file mode 100644
index 000000000..46da9b486
--- /dev/null
+++ b/main/linux-postmarketos-allwinner/0006-dts-pinetab-add-missing-bma223-ohci1.patch
@@ -0,0 +1,49 @@
+From ed7bbaf72095ba2e464585690032bb67d02343ce 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
+
+Fix the accelerometer (BMA223). ohci1 is the low-speed variant of the usb
+port. Original patch by Icenowy Zheng.
+
+Cherry picked from here, but this isn't the original patch either:
+https://gitlab.com/pine64-org/linux/-/commit/69ae7087ec51b09bb6a0afb53dddb5eb030b3236
+---
+ .../boot/dts/allwinner/sun50i-a64-pinetab.dts      | 14 +++++++++++++-
+ 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 a87790df94b3..20c368f00939 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 {
+ &i2c1 {
+ 	status = "okay";
+ 
+-	/* TODO: add Bochs BMA223 accelerometer here */
++	bma223@18 {
++		compatible = "bosch,bma223", "bosch,bma222e";
++		reg = <0x18>;
++		interrupt-parent = <&pio>;
++		interrupts = <7 5 IRQ_TYPE_LEVEL_HIGH>; /* PH5 */
++		mount-matrix = "0", "-1", "0",
++			       "-1", "0", "0",
++			       "0", "0", "-1";
++	};
+ };
+ 
+ &lradc {
+@@ -291,6 +299,10 @@ &ohci0 {
+ 	status = "okay";
+ };
+ 
++&ohci1 {
++	status = "okay";
++};
++
+ &pwm {
+ 	status = "okay";
+ };
+-- 
+2.25.4
+
diff --git a/main/linux-postmarketos-allwinner/0007-dts-pinetab-make-audio-routing-consistent-with-pinep.patch b/main/linux-postmarketos-allwinner/0007-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
new file mode 100644
index 000000000..383604930
--- /dev/null
+++ b/main/linux-postmarketos-allwinner/0007-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
@@ -0,0 +1,42 @@
+From f73f996638d5f9575d92b6c9383b2475d5f58a32 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
+
+---
+ arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 11 ++++++-----
+ 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 20c368f00939..cc4fe685b922 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 {
+ 
+ &sound {
+ 	status = "okay";
++	simple-audio-card,name = "PineTab";
+ 	simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>;
+ 	simple-audio-card,widgets = "Microphone", "Internal Microphone Left",
+ 				    "Microphone", "Internal Microphone Right",
+ 				    "Headphone", "Headphone Jack",
+ 				    "Speaker", "Internal Speaker";
+ 	simple-audio-card,routing =
+-			"Left DAC", "DACL",
+-			"Right DAC", "DACR",
+-			"Speaker Amp INL", "LINEOUT",
+-			"Speaker Amp INR", "LINEOUT",
++			"Headphone Jack", "HP",
+ 			"Internal Speaker", "Speaker Amp OUTL",
+ 			"Internal Speaker", "Speaker Amp OUTR",
+-			"Headphone Jack", "HP",
++			"Speaker Amp INL", "LINEOUT",
++			"Speaker Amp INR", "LINEOUT",
++			"Left DAC", "DACL",
++			"Right DAC", "DACR",
+ 			"ADCL", "Left ADC",
+ 			"ADCR", "Right ADC",
+ 			"Internal Microphone Left", "MBIAS",
+-- 
+2.25.4
+
diff --git a/main/linux-postmarketos-allwinner/0008-pinetab-bluetooth.patch b/main/linux-postmarketos-allwinner/0008-pinetab-bluetooth.patch
new file mode 100644
index 000000000..ba6429045
--- /dev/null
+++ b/main/linux-postmarketos-allwinner/0008-pinetab-bluetooth.patch
@@ -0,0 +1,36 @@
+From 139018f0c47ab5edbb827ce8a594af3a1dbb33d7 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
+
+---
+ .../boot/dts/allwinner/sun50i-a64-pinetab.dts      | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
+index 87daa4778c63..f0c19916a406 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
+@@ -476,6 +476,19 @@ &uart0 {
+ 	status = "okay";
+ };
+ 
++&uart1 {
++        pinctrl-names = "default";
++        pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
++        status = "okay";
++
++        bluetooth {
++                compatible = "realtek,rtl8723cs-bt";
++                reset-gpios = <&r_pio 0 4 GPIO_ACTIVE_LOW>; /* PL4 */
++                device-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
++                host-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
++        };
++};
++
+ &usb_otg {
+ 	dr_mode = "otg";
+ 	status = "okay";
+-- 
+2.28.0
+
diff --git a/main/linux-postmarketos-allwinner/0009-dts-pinephone-remove-bt-firmware-suffix.patch b/main/linux-postmarketos-allwinner/0009-dts-pinephone-remove-bt-firmware-suffix.patch
new file mode 100644
index 000000000..1e3c15b60
--- /dev/null
+++ b/main/linux-postmarketos-allwinner/0009-dts-pinephone-remove-bt-firmware-suffix.patch
@@ -0,0 +1,24 @@
+From 07895c25e70dc04e7db4c11febc0402b3b54fbb8 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
+
+---
+ arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 1 -
+ 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 3781eb8ead66..1f9a56e142da 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+@@ -824,7 +824,6 @@ bluetooth {
+ 		reset-gpios = <&r_pio 0 4 GPIO_ACTIVE_LOW>; /* PL4 */
+ 		device-wake-gpios = <&pio 7 6 GPIO_ACTIVE_LOW>; /* PH6 */
+ 		host-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
+-		firmware-postfix = "pinephone";
+ 	};
+ };
+ 
+-- 
+2.28.0
+
diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD
index 92688c22f..946687e58 100644
--- a/main/linux-postmarketos-allwinner/APKBUILD
+++ b/main/linux-postmarketos-allwinner/APKBUILD
@@ -1,16 +1,17 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 # Co-Maintainer: Luca Weiss <luca@z3ntu.xyz>
 # Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
+# Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=5.8.0_git20200911
-pkgrel=3
-_commit="e1c26b7bd643515d3be20268cd2385df2388f8b9"
-pkgdesc="Kernel fork with Pine64 patches"
+pkgver=5.9.1_git20201019
+pkgrel=0
+_tag="orange-pi-5.9-20201019-1553"
+pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64"
 _carch="arm64"
-url="https://gitlab.com/pine64-org/linux/"
+url="https://megous.com/git/linux/"
 license="GPL-2.0-only"
 makedepends="
 	bison
@@ -23,15 +24,20 @@ makedepends="
 	xz
 	"
 options="!strip !check !tracedeps pmb:cross-native pmb:kconfigcheck-anbox"
-source="$pkgname-$_commit.tar.gz::https://gitlab.com/pine64-org/linux/-/archive/$_commit/linux-$_commit.tar.gz
+source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar.gz
 	config-$_flavor.aarch64
-	disable-power-save.patch
-	touch-dts.patch
-	convergence.patch
-	camera-added-bggr-bayer-mode.patch
+	0001-dts-add-dontbeevil-pinephone-devkit.patch
+	0002-dts-add-pinetab-dev-old-display-panel.patch
+	0003-Disable-8723cs-power-saving.patch
+	0004-media-gc2145-Added-BGGR-bayer-mode.patch
+	0005-dts-pinephone-Disable-flash-led-in-OV5640-node.patch
+	0006-dts-pinetab-add-missing-bma223-ohci1.patch
+	0007-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+	0008-pinetab-bluetooth.patch
+	0009-dts-pinephone-remove-bt-firmware-suffix.patch
 	"
 subpackages="$pkgname-dev"
-builddir="$srcdir/linux-$_commit"
+builddir="$srcdir/linux-$_tag"
 
 prepare() {
 	default_prepare
@@ -69,9 +75,14 @@ dev() {
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }
 
-sha512sums="a976daf8ffeeff1d650edc48a3268e84e7ac7a1b1151311376590d2972826e24f5b4c9c2880a1f1bcb1324d5162e06be96ef74e46fd96f081193ba376957a921  linux-postmarketos-allwinner-e1c26b7bd643515d3be20268cd2385df2388f8b9.tar.gz
-61e9afb2dae5edb09e4660bea66655acd0fdb283396961ef8148af8fc35e4e8e7a8fd8b8b08ec0aafc93701cf9f9b2c763551288522221d3c9af0a95c8a4c853  config-postmarketos-allwinner.aarch64
-3c0d9d282a36a5f6a442b434839d77851f9b20185725cb73aee88e6e209c68fd3d71df8e2a36ffcdb605c47f86df5dbcda5d00353c75c23303861936196924e0  disable-power-save.patch
-c6e1ff1c060f68a59fa57a7cfc573a500fc8d200f56193530f7c1967e4f70f17cb2c930496f6a6489a6a10de130a2e66f5cd328eb6c4ae936f4af348a7413c3b  touch-dts.patch
-3e38a3d25c5981d0bb2e40cedb1ff473477be48b1ed3919e77aea23a108f12e8a3794aced53d8e96ce03f03a81dbcad59d61cff023f8714971e01e714f74b368  convergence.patch
-fc708cbb12b6419858f4d4efd885bdd34eee72be78601bc9542cbd69e6ba576ac15426a75ccbc7ca57b01db735f0d097e4410afdbb9fd35a20806cdb170e4115  camera-added-bggr-bayer-mode.patch"
+sha512sums="fd08e2c580ca2e89513d5d78e09af2c782dc8b06165fa5125ee0ebdafc002f0748c631aaba54415d0dbc520b8b7388f39076de4ce0c6510878089877478dacf0  linux-postmarketos-allwinner-orange-pi-5.9-20201019-1553.tar.gz
+87158c006c26bdb05e2e071d465035bfa065c2d7203d2b2e75ce751af2080a13218ded455d899acb8b8ec470591f2c6a986f15e14787e6f78c9c5f08c656e1fa  config-postmarketos-allwinner.aarch64
+bfeb383784e495a5d7c58fdd7abf44fa0d3460b48ddae09d69997791bb58beb55da8d04f05f30d12f4bdadbe81d0d5f8781c37a4904c1d7a283da3f7ecbadeda  0001-dts-add-dontbeevil-pinephone-devkit.patch
+c157e2495a02417c2ef54c9e1788db7b32a111dd412146c4c925f2f489d0b5a94be4b484d71285abe83c4523f1ae1d4ec6f4af0acad922cb676e8a8f07611698  0002-dts-add-pinetab-dev-old-display-panel.patch
+ab72dffc08e56c7ee96f87b30454f38eed6c4deb041f4cc562bdbf358a66821a698517ba9b095e327a0648cfc10e3b014187d428926ab87cb1c2441171ce2040  0003-Disable-8723cs-power-saving.patch
+38d024a472dfc070b09c922548ba4eb952fde16bedbf265667c7609056f06d6d637a6236227a511198e488120bd0a2dcec5ccfc4708dc3efd800402c1904384c  0004-media-gc2145-Added-BGGR-bayer-mode.patch
+796d59dc83b331e72be5943cdf899244e47f6ef14cace26950b1bb6b3f0fe5a942adf6da126a27ee0421c9a2cf862a9a18be4f1832e0ea15e4afe8a10151643a  0005-dts-pinephone-Disable-flash-led-in-OV5640-node.patch
+60322820a6048c95f7a62180f3aa872f929c8c0aa6bc5cecff882cf671c132666ef803c6754e6d6f4b3d4342362ba9901c21cb23e5186601327ea17ac3d97573  0006-dts-pinetab-add-missing-bma223-ohci1.patch
+36c310b00520650aec1e4ece3e995ab649d79315e5057f85587f3a6b1b5546549599c7db14bbf9b6cba76d87512116e132d0064f14aed0a6b7bbe66856e322d9  0007-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+5bb1352b0bf35ff72eb9729248162faa37b0f1fe28c5cf9bd39b54148ff7750ca53d5934d6a128002a7a190180ef8e626733f260db722831ac35e3a5c1b25661  0008-pinetab-bluetooth.patch
+a392e7b04dc411986b90adf8774ce8f4b77617993e7ca068ea202aa3c925d0ec3bdbd4c395505696816dce6284955bf96901d75833a9b6ca9df544386b07ff65  0009-dts-pinephone-remove-bt-firmware-suffix.patch"
diff --git a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
index 7c3332020..7c9012ece 100644
--- a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
+++ b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.8.0 Kernel Configuration
+# Linux/arm64 5.9.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.0) 10.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
-CONFIG_LD_VERSION=234000000
+CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -87,7 +87,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_SCHED_AVG_IRQ=y
-# CONFIG_SCHED_THERMAL_PRESSURE is not set
+CONFIG_SCHED_THERMAL_PRESSURE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
@@ -152,6 +152,7 @@ CONFIG_CGROUP_PERF=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
 CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
@@ -168,6 +169,7 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
 # CONFIG_BOOT_CONFIG is not set
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -275,10 +277,12 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_BITMAIN is not set
 # CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_EXYNOS is not set
+# CONFIG_ARCH_SPARX5 is not set
 # CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_LAYERSCAPE is not set
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_HISI is not set
+# CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_MESON is not set
 # CONFIG_ARCH_MVEBU is not set
@@ -389,7 +393,6 @@ CONFIG_XEN=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
-CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
@@ -548,6 +551,7 @@ CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 
 #
 # Tegra firmware driver
@@ -619,7 +623,6 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
@@ -635,7 +638,6 @@ CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
@@ -799,7 +801,6 @@ CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
@@ -830,7 +831,9 @@ CONFIG_CMA=y
 CONFIG_CMA_AREAS=7
 # CONFIG_ZPOOL is not set
 # CONFIG_ZBUD is not set
-# CONFIG_ZSMALLOC is not set
+CONFIG_ZSMALLOC=y
+CONFIG_ZSMALLOC_PGTABLE_MAPPING=y
+# CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
@@ -1311,6 +1314,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
@@ -1348,11 +1352,13 @@ CONFIG_OF_MDIO=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
-CONFIG_OF_CONFIGFS=y
 CONFIG_OF_NUMA=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
+CONFIG_ZRAM=y
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -1389,6 +1395,7 @@ CONFIG_BLK_DEV_NBD=m
 CONFIG_SRAM=y
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_PVPANIC is not set
+CONFIG_MODEM_POWER=y
 # CONFIG_C2PORT is not set
 
 #
@@ -1576,6 +1583,7 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 # CONFIG_NET_VENDOR_XILINX is not set
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_BUS=y
+CONFIG_MDIO_DEVRES=y
 # CONFIG_MDIO_BCM_UNIMAC is not set
 CONFIG_MDIO_BITBANG=y
 CONFIG_MDIO_BUS_MUX=y
@@ -1719,6 +1727,8 @@ CONFIG_BRCMFMAC_SDIO=y
 # CONFIG_WLAN_VENDOR_INTERSIL is not set
 # CONFIG_WLAN_VENDOR_MARVELL is not set
 # CONFIG_WLAN_VENDOR_MEDIATEK is not set
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+# CONFIG_WILC1000_SDIO is not set
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 # CONFIG_RT2500USB is not set
@@ -2018,6 +2028,7 @@ CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_BA431 is not set
 CONFIG_HW_RANDOM_OPTEE=m
 # CONFIG_HW_RANDOM_CCTRNG is not set
 CONFIG_DEVMEM=y
@@ -2197,6 +2208,7 @@ CONFIG_GPIO_XGENE=y
 # CONFIG_GPIO_MAX732X is not set
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
+# CONFIG_GPIO_PCA9570 is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_TPIC2810 is not set
 # end of I2C GPIO expanders
@@ -2263,6 +2275,7 @@ CONFIG_AXP288_FUEL_GAUGE=y
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
 # CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ2515X is not set
 # CONFIG_CHARGER_BQ25890 is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
@@ -2295,6 +2308,7 @@ CONFIG_HWMON=y
 CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_ASPEED is not set
 # CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_CORSAIR_CPRO is not set
 # CONFIG_SENSORS_DS620 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
@@ -2402,6 +2416,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
 CONFIG_THERMAL=y
+# CONFIG_THERMAL_NETLINK is not set
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
@@ -2418,7 +2433,6 @@ CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CPU_FREQ_THERMAL=y
-CONFIG_CLOCK_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 # CONFIG_THERMAL_MMIO is not set
@@ -2476,7 +2490,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_ATMEL_HLCDC is not set
 # CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AC100=m
 CONFIG_MFD_AXP20X=y
 # CONFIG_MFD_AXP20X_I2C is not set
 CONFIG_MFD_AXP20X_RSB=y
@@ -2523,7 +2537,6 @@ CONFIG_MFD_AXP20X_RSB=y
 # CONFIG_MFD_SI476X_CORE is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SUN6I_PRCM=y
@@ -2571,6 +2584,7 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER_OF is not set
 # CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
@@ -2578,6 +2592,7 @@ CONFIG_REGULATOR_AXP20X=y
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
 CONFIG_REGULATOR_FAN53555=y
+# CONFIG_REGULATOR_FAN53880 is not set
 CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_ISL9305 is not set
 # CONFIG_REGULATOR_ISL6271A is not set
@@ -2599,21 +2614,26 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MP886X is not set
 # CONFIG_REGULATOR_MPQ7920 is not set
 # CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_PCA9450 is not set
 # CONFIG_REGULATOR_PFUZE100 is not set
 # CONFIG_REGULATOR_PV88060 is not set
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 CONFIG_REGULATOR_PWM=y
 # CONFIG_REGULATOR_QCOM_SPMI is not set
+# CONFIG_REGULATOR_QCOM_USB_VBUS is not set
 # CONFIG_REGULATOR_SLG51000 is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
+# CONFIG_REGULATOR_SY8827N is not set
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 # CONFIG_REGULATOR_TPS65132 is not set
 CONFIG_REGULATOR_VCTRL=y
+# CONFIG_REGULATOR_QCOM_LABIBB is not set
+# CONFIG_REGULATOR_TP65185X is not set
 # CONFIG_RC_CORE is not set
 # CONFIG_MEDIA_CEC_SUPPORT is not set
 CONFIG_MEDIA_SUPPORT=y
@@ -2806,6 +2826,7 @@ CONFIG_VIDEO_SUN8I_ROTATE=y
 # CONFIG_VIDEO_TW9906 is not set
 # CONFIG_VIDEO_TW9910 is not set
 # CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_MAX9286 is not set
 
 #
 # Video and audio decoders
@@ -2871,7 +2892,6 @@ CONFIG_VIDEO_SUN8I_ROTATE=y
 # CONFIG_VIDEO_OV2659 is not set
 # CONFIG_VIDEO_OV2680 is not set
 # CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV2740 is not set
 CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_OV5647 is not set
@@ -2901,6 +2921,7 @@ CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_SR030PC30 is not set
 # CONFIG_VIDEO_NOON010PC30 is not set
 # CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RDACM20 is not set
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_S5K6AA is not set
 # CONFIG_VIDEO_S5K6A3 is not set
@@ -2918,6 +2939,7 @@ CONFIG_VIDEO_GC2145=m
 # CONFIG_VIDEO_AD5820 is not set
 # CONFIG_VIDEO_AK7375 is not set
 # CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9768 is not set
 # CONFIG_VIDEO_DW9807_VCM is not set
 # end of Lens drivers
 
@@ -2999,7 +3021,7 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=y
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=y
-# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+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_KINGDISPLAY_KD097D04 is not set
@@ -3010,7 +3032,6 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=y
 # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
 # CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
-CONFIG_DRM_PANEL_PINEPHONE_JD9365DA=y
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
@@ -3105,6 +3126,7 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_SUN5I_EINK is not set
 # CONFIG_FB_SMSCUFX is not set
 CONFIG_FB_UDL=m
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -3121,7 +3143,6 @@ CONFIG_FB_SIMPLE=y
 CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_LCD_PLATFORM is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -3227,6 +3248,7 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
+# CONFIG_SND_SOC_INTEL_KEEMBAY is not set
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set
 
@@ -3294,19 +3316,19 @@ CONFIG_SND_SOC_BT_SCO=m
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_GTM601 is not set
-CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 # CONFIG_SND_SOC_MAX98357A is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9867 is not set
 # CONFIG_SND_SOC_MAX98927 is not set
-# CONFIG_SND_SOC_MAX98373 is not set
+# CONFIG_SND_SOC_MAX98373_I2C is not set
 # CONFIG_SND_SOC_MAX98390 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
@@ -3457,7 +3479,7 @@ CONFIG_HID_LOGITECH_HIDPP=y
 CONFIG_HID_REDRAGON=y
 CONFIG_HID_MICROSOFT=y
 CONFIG_HID_MONTEREY=y
-# CONFIG_HID_MULTITOUCH is not set
+CONFIG_HID_MULTITOUCH=y
 # CONFIG_HID_NTI is not set
 # CONFIG_HID_NTRIG is not set
 # CONFIG_HID_ORTEK is not set
@@ -3526,8 +3548,8 @@ CONFIG_USB=y
 CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
 CONFIG_USB_AUTOSUSPEND_DELAY=2
@@ -3890,6 +3912,7 @@ CONFIG_MMC_SDHCI_XENON=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=y
+# CONFIG_LEDS_CLASS_MULTICOLOR is not set
 CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 
 #
@@ -3910,10 +3933,7 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP3952 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LP55XX_COMMON is not set
 # CONFIG_LEDS_LP8860 is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
@@ -3937,6 +3957,7 @@ CONFIG_LEDS_SYSCON=y
 # CONFIG_LEDS_USER is not set
 # CONFIG_LEDS_TI_LMU_COMMON is not set
 CONFIG_LEDS_SGM3140=y
+# CONFIG_LEDS_AXP20X is not set
 
 #
 # LED Triggers
@@ -3992,6 +4013,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
 # CONFIG_RTC_DRV_ABEOZ9 is not set
 # CONFIG_RTC_DRV_ABX80X is not set
+# CONFIG_RTC_DRV_AC100 is not set
 # CONFIG_RTC_DRV_DS1307 is not set
 # CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
@@ -4085,6 +4107,7 @@ CONFIG_DMA_SUN6I=y
 CONFIG_PL330_DMA=y
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_ZYNQMP_DMA is not set
+# CONFIG_XILINX_ZYNQMP_DPDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_DW_DMAC is not set
@@ -4204,20 +4227,10 @@ CONFIG_RTL8723BS=m
 # end of Resolver to digital converters
 # end of IIO staging drivers
 
-#
-# Speakup console speech
-#
-# CONFIG_SPEAKUP is not set
-# end of Speakup console speech
-
 CONFIG_STAGING_MEDIA=y
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=y
 
-#
-# soc_camera sensor drivers
-#
-
 #
 # Android
 #
@@ -4229,8 +4242,6 @@ CONFIG_ASHMEM=y
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_WILC1000_SDIO is not set
 # CONFIG_KS7010 is not set
 
 #
@@ -4250,6 +4261,7 @@ CONFIG_HAVE_CLK=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
+# CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_SCPI=y
 # CONFIG_COMMON_CLK_SI5341 is not set
@@ -4510,6 +4522,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_CCS811 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
+# CONFIG_SCD30_CORE is not set
 # CONFIG_SENSIRION_SGP30 is not set
 # CONFIG_SPS30 is not set
 # CONFIG_VZ89X is not set
@@ -4607,6 +4620,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_BMI160_I2C is not set
 # CONFIG_FXOS8700_I2C is not set
 # CONFIG_KMX61 is not set
+# CONFIG_INV_ICM42600_I2C is not set
 CONFIG_INV_MPU6050_IIO=m
 CONFIG_INV_MPU6050_I2C=m
 # CONFIG_IIO_ST_LSM6DSX is not set
@@ -4997,6 +5011,7 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
+# CONFIG_TMPFS_INODE64 is not set
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_MEMFD_CREATE=y
@@ -5307,7 +5322,7 @@ CONFIG_CRYPTO_CHACHA20=m
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
-# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 # CONFIG_CRYPTO_LZ4 is not set
 # CONFIG_CRYPTO_LZ4HC is not set
@@ -5438,11 +5453,13 @@ CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_XARRAY_MULTI=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
@@ -5472,6 +5489,8 @@ CONFIG_CMA_ALIGNMENT=8
 CONFIG_SGL_ALLOC=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 # CONFIG_IRQ_POLL is not set
@@ -5480,6 +5499,7 @@ CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
 CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -5535,6 +5555,9 @@ CONFIG_FRAME_POINTER=y
 #
 # CONFIG_MAGIC_SYSRQ is not set
 CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
@@ -5575,7 +5598,6 @@ CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # CONFIG_KASAN is not set
-CONFIG_KASAN_STACK=1
 # end of Memory Debugging
 
 # CONFIG_DEBUG_SHIRQ is not set
@@ -5642,6 +5664,7 @@ CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 #
 # CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_REF_SCALE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
diff --git a/main/linux-postmarketos-allwinner/convergence.patch b/main/linux-postmarketos-allwinner/convergence.patch
deleted file mode 100644
index 8242c69e7..000000000
--- a/main/linux-postmarketos-allwinner/convergence.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Sloppy patch that makes the displayport alt-mode output signal work on
-the PinePhone convergence edition.
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index 1c555456be1e..2cd3b7bd4175 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -712,3 +712,27 @@ usb0_drd_sw: endpoint {
- 		};
- 	};
- };
-+
-+&hdmi {
-+	hvcc-supply = <&reg_dldo1>;
-+	status = "okay";
-+};
-+
-+&hdmi_out {
-+	hdmi_out_con: endpoint {
-+		remote-endpoint = <&hdmi_con_in>;
-+	};
-+};
-+
-+/ {
-+	hdmi-connector {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+
-+		port {
-+			hdmi_con_in: endpoint {
-+				remote-endpoint = <&hdmi_out_con>;
-+			};
-+		};
-+	};
-+};
diff --git a/main/linux-postmarketos-allwinner/touch-dts.patch b/main/linux-postmarketos-allwinner/touch-dts.patch
deleted file mode 100644
index dc74a08a6..000000000
--- a/main/linux-postmarketos-allwinner/touch-dts.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Some devkits have inverted touchscreen X axis. Support them
-diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 7806eee28..cb2bc2450 100644
---- a/arch/arm64/boot/dts/allwinner/Makefile
-+++ b/arch/arm64/boot/dts/allwinner/Makefile
-@@ -2,6 +2,7 @@
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-amarula-relic.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-dontbeevil.dtb
-+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-dontbeevil-longts.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-nanopi-a64.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-oceanic-5205-5inmfd.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-olinuxino.dtb
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil-longts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil-longts.dts
-new file mode 100644
-index 000000000..49f715366
---- /dev/null
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil-longts.dts
-@@ -0,0 +1,14 @@
-+/dts-v1/;
-+
-+#include "sun50i-a64-dontbeevil.dts"
-+
-+/ {
-+	model = "PinePhone Don't be evil development kit with long touch cable";
-+	compatible = "pine64,sopine-baseboard", "pine64,sopine",
-+		     "allwinner,sun50i-a64";
-+
-+};
-+
-+&touchscreen {
-+	touchscreen-inverted-x;
-+};
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts
-index 8e9121a26..15bd36528 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts
-@@ -262,7 +262,7 @@ &i2c0 {
- 	pinctrl-0 = <&i2c0_pins>;
- 	status = "okay";
- 
--	ft6236@38 {
-+	touchscreen: ft6236@38 {
- 		compatible = "focaltech,ft6236", "edt,edt-6236";
- 		reg = <0x38>;