linux-postmarketos-allwinner: enable /sys/class/gpio

This enables CONFIG_GPIO_SYSFS, but also CONFIG_EXPERT to see the option creating a large config diff
chuwi-hi10plus: drop (MR 2989)
2022-04-05 14:33:14 +02:00 · 2022-04-05 09:53:45 +02:00 · 2022-04-04 13:20:35 +02:00 · 2022-04-03 20:50:31 +02:00 · 2022-04-03 20:50:31 +02:00 · 2022-04-03 19:06:42 +02:00
291 changed files with 14169 additions and 17197 deletions
@@ -26,7 +26,6 @@ sh_files="
 	./main/postmarketos-update-kernel/update-kernel.sh
 	./main/swclock-offset/swclock-offset-boot.sh
 	./main/swclock-offset/swclock-offset-shutdown.sh
-	./main/ttyescape/*.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./main/msm-firmware-loader/*.sh
@@ -17,12 +17,9 @@ def test_aports_firmware(args):
    excluded = [
        "firmware-motorola-potter",  # Depends on soc-qcom-msm8916-ucm
        "firmware-oneplus-msm8998",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-oneplus-sdm845",  # Depends on soc-qcom-sdm845-nonfree-firmware
        "firmware-samsung-baffinlite",  # Depends on firmware-aosp-broadcom-wlan
        "firmware-samsung-crespo",  # Depends on firmware-aosp-broadcom-wlan
        "firmware-samsung-maguro",  # Depends on firmware-aosp-broadcom-wlan
-        "firmware-shift-sdm845",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-xiaomi-beryllium",  # Depends on soc-qcom-sdm845-nonfree-firmware
        "firmware-xiaomi-ferrari",  # Depends on soc-qcom-msm8916
        "firmware-xiaomi-willow",  # Doesn't build, source link is dead (pma#1212)
    ]
@@ -153,16 +153,10 @@ build-x86:
  extends: .build

 build-aarch64:
-  tags:
-    - aarch64
  extends: .build

 build-armv7:
-  tags:
-    - aarch64
  extends: .build

 build-armhf:
-  tags:
-    - aarch64
  extends: .build
@@ -6,5 +6,10 @@ main/osk-sdl/                       @craftyguy
 main/mesa-pvr-dri-classic/          @xc-racer99
 main/postmarketos-ui-plasma-mobile/ @bshah
 temp/u-boot-librem5/                @craftyguy @bshah
+device/community/*-qcom-sdm845      @calebccff @joelselvaraj
+device/community/device-oneplus-enchilada   @calebccff
+device/community/device-oneplus-fajita      @calebccff
+main/ttyescape                      @calebccff
+device/community/*-xiaomi-berrylium @joelselvaraj

 # vim: ts=4 sw=4 et
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.35.0
-pkgrel=5
+pkgrel=7

 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-5be7db2e4793b74ffa487153b1ca52027b6d1a4ca316c152163d1b3030ba3270e645d02522f9c8187b14fc193b5471ccedc7439b38463fabeac08b404f1b6fbb  busybox-static-1.35.0-r5-aarch64-edge.apk
+fd545528f1fb4135f64c13b5eacabe73ad3e92c56ff77523c60d7e4359ad9c4de492bab9148610ef2aaf0188f77a335989d7d5ea4d8825b8eb78ef8cbab4a100  busybox-static-1.35.0-r7-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.35.0
-pkgrel=5
+pkgrel=7

 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-dcfd4a8af7c0f2ae33cacdc933f38906c9173b9a6476b04624d0dce7bf03277328bc3422182cbf0cf784495ff663326779a39d4a259064d5a740f8bea4f5a3be  busybox-static-1.35.0-r5-armhf-edge.apk
+60862d34fcb50b4713a93a15a942165fe7476d257f6d030ec9b0a5ec7111d5b8cd1494f902a9f9ee065b83e7d058b7f03859ab7dd06dacef8d56715cfc678ad3  busybox-static-1.35.0-r7-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.35.0
-pkgrel=5
+pkgrel=7

 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-2b2ff67a0cf0ab1b1fc67458f328c7b2e91a24a6c57d4d7707c5c88a68b715af11b2ee29381aaa15946d6bccaf3d6f899f8a760ff87df2156a59bd12e67af71d  busybox-static-1.35.0-r5-armv7-edge.apk
+0b8982f832780a5b701232dd627be954d35f416ccecd14ed27488eb2f35619ba03bbf59cd53fbf1e03eb6efde83973901e59d97fbc9730492a4c3abc7d08b281  busybox-static-1.35.0-r7-armv7-edge.apk
 "
@@ -3,7 +3,7 @@
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
 pkgver=3
-pkgrel=3
+pkgrel=4
 _commit=3155254999ac36c3051a2118c415de25a072c0f6
 url="https://postmarketos.org"
 license="MIT"
@@ -22,7 +22,7 @@ depends="
 makedepends="devicepkg-dev meson eudev-dev"
 source="https://github.com/me176c-dev/linux-me176c/archive/$_commit.tar.gz
 	deviceinfo
-	rootston.ini
+	phoc.ini
 	"
 subpackages="$pkgname-factory $pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
 builddir="$srcdir/linux-me176c-$_commit"
@@ -56,12 +56,12 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 sha512sums="
 75243e3d0bc9a352465683ec8cf8b83566e4131bb7fae0f388267a62bdbf4691c955ed034b30df550f921b771080688123ae8db144b72f786bf1677ef1d83f57  3155254999ac36c3051a2118c415de25a072c0f6.tar.gz
 8dfeb1d928aa3ac94e9015d4b98713ec4d56eab68a7aee8cb7ce6a877b3d015670800bae456190ae57bcb35047738de5559460f2f7b785987f1394b605119ae5  deviceinfo
-a60d1785f0163d4a4eb63ea5e3017631aab7dd6683baad6a74b09809d33888d581ca8b14526c19d18234dcf727d1fdb4ff0489ed4bd5523905d0e4da7d93bc56  rootston.ini
+a60d1785f0163d4a4eb63ea5e3017631aab7dd6683baad6a74b09809d33888d581ca8b14526c19d18234dcf727d1fdb4ff0489ed4bd5523905d0e4da7d93bc56  phoc.ini
 "
@@ -4,7 +4,7 @@
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
 pkgver=6
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -39,5 +39,5 @@ nonfree_firmware() {
 }

 sha512sums="
-9b52a7db71484e614b3f8efc5b4450dcbe93165f8372b22006f4c84f62cd243785f262f29d892feeb6bd59c92df6a649511eb1f58be56a0f6f1384e8a7320392  deviceinfo
+285087d1309c7bc6d4c11aaf4c89f754e5386cb53e1ab5ee6cfabe8fefa5ad95042d0b55fa12d2615df0bd82b668c6131435d8b770fa751ca5f6bd464e3bdecb  deviceinfo
 "
@@ -8,7 +8,7 @@ deviceinfo_codename="bq-paella"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-longcheer-l8910"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="smb1360 panel-longcheer-yushun-nt35520 panel-longcheer-truly-otm1288a msm himax_852xES"
+deviceinfo_modules_initfs="smb1360 panel-longcheer-yushun-nt35520 panel-longcheer-truly-otm1288a msm himax-hx852x"
 deviceinfo_arch="aarch64"

 # Device related
@@ -4,7 +4,7 @@
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
 pkgver=5
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo rootston.ini"
+source="deviceinfo phoc.ini"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
@@ -41,11 +41,11 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 sha512sums="
 c860b43edd7dcc2b10a7ee1dc8b2b7e225c469db6f7d45231b78e4e8a76bbe242b65e40488dcae2503ecdc407844eee50964db7b8d3a392a8f3f064afe690b99  deviceinfo
-cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951  rootston.ini
+cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951  phoc.ini
 "
@@ -4,7 +4,7 @@
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
 pkgver=5
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo rootston.ini"
+source="deviceinfo phoc.ini"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
@@ -41,11 +41,11 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 sha512sums="
 f5971257def301439b3786dada60333ad34b15b2221a296698cff7a0a8f7c5c6a54547c91bb024a883fe8f4f5f0b2926c044acc24e240ce1caeaf77697caad75  deviceinfo
-cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951  rootston.ini
+cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951  phoc.ini
 "
@@ -3,8 +3,8 @@

 pkgname=device-odroid-hc2
 pkgdesc="ODROID HC2"
-pkgver=0.4
-pkgrel=1
+pkgver=0.5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -56,5 +56,5 @@ tools() {
 sha512sums="
 d02702884d47c2c6b98f1ec194fc3a11b2c6559d416c112d41ddecfbbd84f0706adfc72e13e9943f130e548d987aa7d151f4f416443d15b7dff2375d4d067144  deviceinfo
 06239b979ad78cadc1bc764b8c6a2ce57c7f2a44456ba918e83ea7ae2846c983ec6cb8eea708540e7c4f3abe2a1ff942b8c8ae5e6d68dbc65a8f5c34942af49e  uboot-script.cmd
-8273be5a8c5a7b9a27ae91a1581ca2d247d0fb45e24e25e46ba8272955d7fce31c62562c3fae402f6a66918c9c61d838de692cca11eea3cdfde6a91f478f2955  install-rootfs-hdd.sh
+669a0561251f287f072c9c1fc37d89b49a47fc4a4e5134c9e6681750ae960e5827043166136b7d5b9ad52c931b060bdcb6d0b5335c2e9fdb4eefd82f131ded93  install-rootfs-hdd.sh
 "
@@ -48,7 +48,7 @@ echo "Rootfs successfully copied!"

 # pmOS initfs looks for rootfs by label, rename partitions
 echo "Renaming partitions"
-e2label $MMC_ROOT_PARTITION pmOS_root_old
+e2label $MMC_ROOT_PARTITION old_rootfs
 e2label $HDD_ROOT_PARTITION pmOS_root

 echo "Rootfs moved to external HDD, you must reboot NOW!"
@@ -3,7 +3,7 @@

 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=4
+pkgver=5
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -18,7 +18,11 @@ depends="
 	soc-qcom-sdm845-ucm
 "
 makedepends="devicepkg-dev"
-source="deviceinfo rootston.ini"
+source="
+	deviceinfo
+	phoc.ini
+	q6voiced.conf
+"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"

 build() {
@@ -31,17 +35,20 @@ package() {

 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
-	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs"
+	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware"
 	mkdir "$subpkgdir"
+
+	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 sha512sums="
 009e1cfc0ae2823bb82dbc39a1b9c1199e0e7691f0e95a6423bbfe941e07486297e0aad295f2ea44d43ed51b1440bf8e6a67867d0c1a6aad653399afbd006c1d  deviceinfo
-9fef488a655fcbad4fb28c11d7d6cbe385096e766cd99ca59802f1dbc4e3c99dac0ff682549e02fac0b73f7e95db953f3a87c453d1b19b229785e4ffeec515ed  rootston.ini
+65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
+7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
 "
@@ -1,4 +1,4 @@
-# /etc/phosh/rootston.ini
+# /etc/phosh/phoc.ini
 # Overwrites values set in /usr/share/phosh/phoc.ini

 [output:DSI-1]
@@ -0,0 +1,2 @@
+q6voice_card=0
+q6voice_device=3
@@ -3,7 +3,7 @@

 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=4
+pkgver=5
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -18,7 +18,7 @@ depends="
 	soc-qcom-sdm845-ucm
 "
 makedepends="devicepkg-dev"
-source="deviceinfo rootston.ini"
+source="deviceinfo phoc.ini"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"

 build() {
@@ -31,17 +31,17 @@ package() {

 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
-	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs"
+	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware"
 	mkdir "$subpkgdir"
 }

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 sha512sums="
 cd8b94751890fd8891e5eafbc4f668a068885d184ad9b93366c882cfafa798e4bc77fa548532796a278b5acdf15dbf1110a1a581823567deaa00b90a72796959  deviceinfo
-9fef488a655fcbad4fb28c11d7d6cbe385096e766cd99ca59802f1dbc4e3c99dac0ff682549e02fac0b73f7e95db953f3a87c453d1b19b229785e4ffeec515ed  rootston.ini
+65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "
@@ -1,4 +1,4 @@
-# /etc/phosh/rootston.ini
+# /etc/phosh/phoc.ini
 # Overwrites values set in /usr/share/phosh/phoc.ini

 [output:DSI-1]
@@ -4,7 +4,7 @@
 pkgname=device-pine64-pinetab
 pkgdesc="PINE64 PineTab"
 pkgver=0.12
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -34,7 +34,7 @@ source="
 	deviceinfo
 	gsk-renderer-gl.sh
 	kirigami-lowpower.sh
-	rootston.ini
+	phoc.ini
 	sway.conf
 	uboot-script.cmd
 	ucm/HiFi.conf
@@ -112,8 +112,8 @@ weston() {

 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 package() {
@@ -162,7 +162,7 @@ sha512sums="
 6274b664ad42456ff51ec4ec2dea9749bff59e0eee0c2d1f7e8950934ee92e410e554df246f81bd01813ddfae5e6a9001a8fcad05815beab536d1547251d5aeb  deviceinfo
 9244687bfea20c78120f7c48388d141eff3e23a421e48504eac1479ec7f51197d9ca72468c9cc33c6e3d3fa32ee3514711545816e607d49870226e4a41a60a85  gsk-renderer-gl.sh
 6bc22b369b2d9058b702ac7a7862abaefaf8179b43491868bdb008d181b59104f1ded89db1da51a810e1ccdc803a579b924a438674283a65afc3a9c4d2894caf  kirigami-lowpower.sh
-38827d9636c48b133eb333764a6799a6e93454e01ecb0cfde1ecad3ee149606ba59eb1a5e6c8366e3b3891e54bd664a0a5acdd89d38ac3a3551260e9b9a6d3fc  rootston.ini
+38827d9636c48b133eb333764a6799a6e93454e01ecb0cfde1ecad3ee149606ba59eb1a5e6c8366e3b3891e54bd664a0a5acdd89d38ac3a3551260e9b9a6d3fc  phoc.ini
 9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2  sway.conf
 181438ed8723c29bf201a5d4ad1ae588afcd03763deadb267b23d96ad40c8956e08b2e3b800f4ee5d77774625d0b0e6a70c4068f98fbfad50d31e71b30a24164  uboot-script.cmd
 a2fd8037c9a1af000f31c7005436d791525317f818c553d1e2f472b4df76c71d769ecbf67b369a478bea720a6215eaa9fb6a26ba218ac9410513e2345ebe7b4c  HiFi.conf
@@ -4,18 +4,18 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-a3
 pkgdesc="Samsung Galaxy A3 (2015)"
-pkgver=9
-pkgrel=0
+pkgver=10
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
-	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
+	 soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround"
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	rootston.ini
+	phoc.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -51,11 +51,11 @@ phosh() {
 	for pkg in $_substitutes; do replaces="$replaces $pkg-phosh"; done
 	for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 sha512sums="
 dac014f2ebc1c461e43917fcfc020675c10ac39e17b83b0e0e2246b159db1f61ce024df21624f2635729f29521b30b4cce29b4451931cb27cf4d0f34b19ec509  deviceinfo
-f3667b914bb955be9e97db31dc7ed4a7c5d0c369be9549d587bb7208e270590c0c3fa36a0dd997d6f8305c5c9afb3b906423af6ca8724e806f995e61226cfc83  rootston.ini
+f3667b914bb955be9e97db31dc7ed4a7c5d0c369be9549d587bb7208e270590c0c3fa36a0dd997d6f8305c5c9afb3b906423af6ca8724e806f995e61226cfc83  phoc.ini
 "
@@ -3,14 +3,14 @@
 # Co-Maintainer: Alexey Min <alexey.min@gmail.com>
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
-pkgver=9
+pkgver=10
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
-	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
+	 soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="
@@ -4,15 +4,15 @@
 pkgname=device-samsung-espresso3g
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
 pkgver=3
-pkgrel=1
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base postmarketos-update-kernel linux-samsung-espresso3g mkbootimg"
+depends="postmarketos-base postmarketos-update-kernel linux-samsung-espresso3g mesa-dri-gallium mkbootimg"
 makedepends="devicepkg-dev"
-source="deviceinfo xorg.conf"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-nonfree-userland:nonfree_userland"
+source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -28,28 +28,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

-nonfree_userland() {
-	# Patched wlroots is also necessary for accelerated phosh and sway.
-	# See https://gitlab.com/antoni.aloytorrens/p-wlroots and https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2573.
-	# Unfortunately, such workarounds are not accepted in pmOS.
-	pkgdesc="$pkgdesc (GPU userspace libraries)"
-	depends="mesa-pvr-dri-classic sgx-ddk-um sgx-ddk-um-openrc sgx-ddk-um-ti443x"
-	mkdir "$subpkgdir"
-}
-
-phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-			"$subpkgdir"/usr/share/phosh/phoc.ini
-}
-
-x11() {
-	install_if="$pkgname xorg-server"
-	install -Dm644 "$srcdir"/xorg.conf \
-		"$subpkgdir"/etc/X11/xorg.conf.d/99-modesetting.conf
-}
-
 sha512sums="
-41897ea67a1773023269a37aab57dc6a60e6804319ae329ce355cac464809c16699262dca1f4b1895b01e9e20bfc640ce3577ac0703a33ba2201555e4d0f28f9  deviceinfo
-41f0d61da6f5029be51396fdcdc91aa241c47825adc32cc03f81d1c2ada633f1e293a03dd3ed75a7e8c3e2d960aec889ecdb3af7db5f106444c06f4f6c45debd  xorg.conf
+dbf180ad55042899074ea71d2c50754f2b8c9a12becdffc8fd52794b36c5c5ee2038e5074be66cbc53068d2ac7abae5b22ae3585b17caf9e179101c9101f6d57  deviceinfo
 "
@@ -17,7 +17,7 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1024"
 deviceinfo_screen_height="600"
-deviceinfo_gpu_accelerated="true"
+deviceinfo_gpu_accelerated="false"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -1,12 +0,0 @@
-Section "Device"
-  Identifier "DSI-1"
-  Driver "modesetting"
-  Option "kmsdev" "/dev/dri/by-path/platform-omapdrm.0-card"
-  Option "AccelMethod" "none"
-  Option "Atomic" "on"
-  Option "VariableRefresh" "on"
-EndSection
-
-Section "ServerFlags"
-  Option "AutoAddGPU" "false"
-EndSection
@@ -3,7 +3,7 @@
 pkgname=device-samsung-gt510
 pkgdesc="Samsung Galaxy Tab A 9.7 (2015)"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,7 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	pointercal
-	rootston.ini
+	phoc.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -45,12 +45,12 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 sha512sums="
 5acddf5145a0ec2cbe056bd120b1413fd6efee441f15127ce6f132ab470f326ba729f71afc70ba4d8dc9dab62e49fa20217632f08f9ed6d5b2ddda033ed32009  deviceinfo
 6aedd5eeac4d21356678f5399f3f0946392c9a7477ac21d39b8e761133dc8ed67adb4966647314f71d5263483ab68cad92847dacff95ffa45eabfc33c9f405b5  pointercal
-bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180  rootston.ini
+bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180  phoc.ini
 "
@@ -3,7 +3,7 @@
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,7 @@ depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 makedepends="devicepkg-dev dtbtool"
 source="
 	deviceinfo
-	rootston.ini
+	phoc.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -41,11 +41,11 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 sha512sums="
 b374fc9b75b0693a27c94116f652410a0b026077beba91527104fd0e3e720ddec0c1e48b54714af810b514571d5f2021f8facf34a9ea8de35b92aa060af64d19  deviceinfo
-bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180  rootston.ini
+bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180  phoc.ini
 "
@@ -2,19 +2,18 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
-pkgver=10
-pkgrel=0
+pkgver=11
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
-	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
+	 soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround"
 makedepends="devicepkg-dev"
 source="
-	77-modem-samsung-serranove.rules
 	deviceinfo
-	rootston.ini
+	phoc.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -34,8 +33,6 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/77-modem-samsung-serranove.rules \
-		"$pkgdir"/lib/udev/rules.d/77-modem-samsung-serranove.rules
 }

 nonfree_firmware() {
@@ -50,12 +47,11 @@ phosh() {
 	replaces="$_substitutes-phosh"
 	provides="$replaces=$pkgver-r$pkgrel"
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 sha512sums="
-4b747284acf73a401255093dfd7b6406fa8e3428307f031d39b1631d1a3ae6404789fc2dfff0cf2da6b2f0757071363cc70b4ef7d445c7b3c047b6feb88b9125  77-modem-samsung-serranove.rules
 d666cf805d292d13d9e15a350b203580f016f455dad16cbc4a94471edb145fd464c5ad92a50077995234a9db1322e605e0294a6c5d7342fa6675b1bfec4eb69e  deviceinfo
-94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea  rootston.ini
+94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea  phoc.ini
 "
@@ -4,8 +4,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
-pkgver=4
-pkgrel=3
+pkgver=5
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -27,7 +27,8 @@ subpackages="

 source="
 	deviceinfo
-	rootston.ini
+	phoc.ini
+	q6voiced.conf
 "

 build() {
@@ -40,8 +41,10 @@ package() {

 nonfree_firmware() {
 	pkgdesc="GPU, venus, modem firmware"
-	depends="firmware-xiaomi-beryllium"
+	depends="firmware-xiaomi-beryllium soc-qcom-sdm845-nonfree-firmware"
 	mkdir "$subpkgdir"
+
+	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

 kernel_tianma() {
@@ -58,11 +61,12 @@ kernel_ebbg() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 sha512sums="
 29090e3d3fc16a752b33910abcfd8719af34bd257a7ca3cf25e9f1afc49e20582a7505bd7cd2ea2eb274c834eead277f31e5fb9384de8b444500518275e5a711  deviceinfo
-eb0cc845431cabdc81c518ac51af761864ed4d51b52842361850bb795582c3be48ecd041f543b08158a36fea12800b263b87cbe6393663c1b315f496504e6a5b  rootston.ini
+e2e417169345c86a5dd34ac0afac4b2b983a755f4c7ba5698c385a01f96b9bd2c3ace1ce5a0569c121675e8b87e88e1cf5c648e995d9c50cba66e52bbc83753c  phoc.ini
+7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
 "
@@ -1,4 +1,4 @@
-# /etc/phosh/rootston.ini
+# /etc/phosh/phoc.ini
 # Overwrites values set in /usr/share/phosh/phoc.ini

 [output:DSI-1]
@@ -0,0 +1,2 @@
+q6voice_card=0
+q6voice_device=3
@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -24,7 +24,7 @@ subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
 source="
 	deviceinfo
 	pointercal
-	rootston.ini
+	phoc.ini
 	30-gpu-firmware.files
 	"

@@ -56,14 +56,14 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }


 sha512sums="
 f0f2f6598947e8261607f259bb869e2845b08a5c1df28126bc705f8e7a11547e5702395741da5a7f50a41e17e6840b9ef01a4e3248b387b4d00510aef54118ee  deviceinfo
 e9ee9c1404b41ba15eafff3f728ff6e0e78dc17e9a88483fca92db1aa3efe0e4d5bf26142e533c4ff12b1bf8ce04ccabb7ca0f93aaea586d5b30910282aad237  pointercal
-035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini
+38409d4ce48db4624539dbfd695d3c6e1596a29fd7c3004a41368b28cba646495d05360420ad728f82c63d6ddeeca71d09944df06ebaca120aedd9cc2b436eb3  phoc.ini
 a1ca623314e80045ea8d64be06d12ffc091a5585ca40f9713039883e20889ba47f4a3f9c3bd92bd3b616bb6bb621e87409b6b6fa43bfe566a2a46468609c16f4  30-gpu-firmware.files
 "
@@ -1,4 +1,4 @@
-# /etc/phosh/rootston.ini
+# /etc/phosh/phoc.ini
 # Overwrites values set in /usr/share/phosh/phoc.ini

 [output:DSI-1]
@@ -1,14 +1,14 @@
 # Maintainer: Caleb Connolly <caleb@connolly.tech>

 pkgname=firmware-oneplus-sdm845
-pkgver=5
+pkgver=6
 pkgrel=0
 pkgdesc="Firmware for OnePlus 6 / 6T"
 url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845"
 arch="aarch64"
-depends="soc-qcom-sdm845-nonfree-firmware linux-firmware-qcom linux-firmware-ath10k"
+depends="linux-firmware-qcom linux-firmware-ath10k"
 license="proprietary"
-options="!check !strip !archcheck !tracedeps"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"

 _version="3ec855b2247291c79652b319dfe93f7747363c86"

@@ -2,14 +2,14 @@
 # Co-Maintainer: Joel Selvaraj <jo@jsfamily.in>

 pkgname=firmware-xiaomi-beryllium
-pkgver=4
+pkgver=5
 pkgrel=0
 pkgdesc="Firmware for Xiaomi Poco F1"
 url="https://gitlab.com/sdm845-mainline/firmware-xiaomi-beryllium"
 arch="aarch64"
-depends="soc-qcom-sdm845-nonfree-firmware linux-firmware-qcom linux-firmware-qca linux-firmware-ath10k"
+depends="linux-firmware-qcom linux-firmware-qca linux-firmware-ath10k"
 license="proprietary"
-options="!strip !check !archcheck !tracedeps"
+options="!strip !check !archcheck !tracedeps pmb:cross-native"

 _commit="b4937f06a796cd30b8ddecd6cf7ed416eecc06a0"

@@ -2,7 +2,7 @@
 # Co-Maintainer: Danct12 <danct12@disroot.org>

 pkgname=linux-nokia-n900
-pkgver=5.15.25
+pkgver=5.15.31
 pkgrel=0
 pkgdesc="Mainline kernel fork for Nokia N900"
 arch="armv7"
@@ -15,11 +15,15 @@ _carch="arm"
 _flavor=nokia-n900
 _config="config-$_flavor.armv7"
 case $pkgver in
-	*.*.*)	_kernver=${pkgver%.*};;
-	*.*) _kernver=$pkgver;;
+	*.*.0)	_kernver=${pkgver%.0};;
+	*.*.*)	_kernver=${pkgver%.*}
+		_patch="
+		linux-$pkgver.patch.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz";;
+	*.*)	_kernver=$pkgver;;
 esac
 source="
 	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
+	$_patch
 	$_config
 	0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
 	0002-ARM-dts-n900-remove-rx51-battery.patch
@@ -31,11 +35,6 @@ source="
 	0008-wl1251-specify-max.-IE-length.patch
 	0009-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch
 "
-if [ "${pkgver%.0}" = "$pkgver" ]; then
-	source="
-	linux-$pkgver.patch.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz
-	$source"
-fi
 builddir="$srcdir/linux-$_kernver"

 prepare() {
@@ -63,9 +62,9 @@ package() {
 }

 sha512sums="
-6fb9c2744ec9c0fee7ac6e3e83714c95f4d31ee8e31929f3f816e88dea784ba6496d0c5df069fad92ecd4222667acad361966214697a859cff469e9f86b84f0a  linux-5.15.25.patch.xz
 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a  linux-5.15.tar.xz
-082de68f15bdbc4f2e0897c3885b0dcb68ee2b9e1afab9567f355630cf7a62fbcc2ff806e4a7c5abfa43c1f0837e77cb59126fc137f32e8b07408d441df0de13  config-nokia-n900.armv7
+1dc78db565dda619aa9f1d59bb78cf7ee43e8922f6e055bdd6f8b419556be8838235aa26e29fd1bd38cf12d8fb81e267714bb647921dee2c2aeab9319fbe294d  linux-5.15.31.patch.xz
+465cb8fcc3a5dc043323c0767e4918b68556c1f1b693e0959b486c0e3a72264704d1889137e640e6262b4fd22feeedcfc454b6515876168ff5f0f6ccc30c4a1e  config-nokia-n900.armv7
 04a39253afd25a7de03dc45ff322161672005406543c44b97d2dc293f202de7de446aee9707a690a290641c55c7bed6e78bbe096ca323dd7d88d3207427c8d31  0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
 c1055c7a4d2e39ce13db3871d948022b62eb7ebeb898777d197169b3e7c04d705ce7f52f28214754e3cefe99d1dd66f339a1a5770bae1ee970d5926067032061  0002-ARM-dts-n900-remove-rx51-battery.patch
 93e82f7041e347b63fc32ce54176ee3fe7e8260cc793810bcf0146a3699567b63a0cb7ce8c531b0484390907a25c51bfbeb15b32dddb2220c2481ec1f86e5eb5  0003-power-supply-bq27xxx_battery-ignore-inaccurate-flag.patch
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.15.25 Kernel Configuration
+# Linux/arm 5.15.31 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219"
 CONFIG_CC_IS_GCC=y
@@ -407,6 +407,7 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_CPU_SPECTRE=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_HARDEN_BRANCH_HISTORY=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_VDSO=y
 CONFIG_OUTER_CACHE=y
@@ -1443,6 +1444,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # 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
@@ -1630,7 +1632,6 @@ CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 # CONFIG_OF_OVERLAY is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
@@ -3,8 +3,8 @@
 # Maintainer: Dylan Van Assche <me@dylanvanassche.be>

 pkgname=linux-odroid-hc2
-pkgver=5.15.7
-pkgrel=1
+pkgver=5.16.14
+pkgrel=0
 pkgdesc="ODROID XU3/XU4/HC1/HC2/MC1 kernel fork"
 arch="armv7"
 _carch="arm"
@@ -30,15 +30,12 @@ makedepends="
 # Source
 _config="config-$_flavor.$arch"
 _pkgname="linux"
-_commit="77ebfca65d59167038ef5fcc62d2e8d49f47fa49"
 source="
-	$_pkgname-$pkgver.tar.gz::https://github.com/tobetter/linux/archive/$_commit.tar.gz
+	$_pkgname-$pkgver.tar.xz::https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-$pkgver.tar.xz
 	$_config
-	36dfdf11af49d3c009c711fb16f5c6e7a274505d.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=36dfdf11af49d3c009c711fb16f5c6e7a274505d
-	6eea4ace62fa6414432692ee44f0c0a3d541d97a.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=6eea4ace62fa6414432692ee44f0c0a3d541d97a
 "
 subpackages="$pkgname-dev"
-builddir="$srcdir/$_pkgname-$_commit"
+builddir="$srcdir/$_pkgname-$pkgver"

 prepare() {
 	default_prepare
@@ -75,8 +72,6 @@ dev() {
 }

 sha512sums="
-7a377c6afcb5d62f223c909709ab22644ee4345dafa348cc9293d58bd9251b5c77e4be894a2b6238c2cb3478d6430d0e45dd1de918468a9f038514e47f234197  linux-5.15.7.tar.gz
-bf3e599de30d88ab9c0df3e7a9487bf9aa0b511615208c82a1c7f2fc254839a896637effa3bb49a7081eded25168aa3aa5855feb516b935d33f106995cffbfba  config-odroid-hc2.armv7
-59d480b6379dcfff94d05b08e28c005d507f640dc0147841e7df4827fce8db01dab1d4d50fb45b2b3fff72cdeb219a8cd87a889078a6372aea4469c861c378b1  36dfdf11af49d3c009c711fb16f5c6e7a274505d.patch
-61f862cda24e7b14e55e9a9ce3a537adfc7a1c77e0670255dc485886e2c19156ddaf49fdd88b629ddde3cf25a83fd603678caebb96e18f59245917d3a2e51bb0  6eea4ace62fa6414432692ee44f0c0a3d541d97a.patch
+3daf1b5a01cbab632492e18a8e71aaf2085545f4944ce587bc7c27e86a0a739d0cbffe7890ce9c5bc863b3c5083281bca6ed4df8d3c69d60c6dcc210cd86993e  linux-5.16.14.tar.xz
+22d641b681dffd5348076e8dc095d3a1b402bc496e05156356d0be7a77b8e7a270a66dedc1d6197320806740508589d359ea7335859972f4cadd9ebf1d81212d  config-odroid-hc2.armv7
 "
@@ -4,8 +4,8 @@

 _flavor="postmarketos-qcom-msm8916"
 pkgname=linux-$_flavor
-pkgver=5.15
-pkgrel=1
+pkgver=5.17
+pkgrel=0
 pkgdesc="Mainline kernel fork for Qualcomm MSM8916 devices"
 arch="aarch64 armv7"
 url="https://github.com/msm8916-mainline/linux"
@@ -41,8 +41,6 @@ esac
 _tag=v${pkgver//_/-}-msm8916
 source="
 	$pkgname-$_tag.tar.gz::$url/archive/$_tag.tar.gz
-	36dfdf11af49d3c009c711fb16f5c6e7a274505d.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=36dfdf11af49d3c009c711fb16f5c6e7a274505d
-	6eea4ace62fa6414432692ee44f0c0a3d541d97a.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=6eea4ace62fa6414432692ee44f0c0a3d541d97a
 	config-$_flavor.aarch64
 	config-$_flavor.armv7
 "
@@ -74,9 +72,7 @@ package() {
 }

 sha512sums="
-734d958bb9fa64e667e089aec0066a58526ae38fbf6fbd223a7bce746fe3ce7443ffe087f365a44f6892479186f2c0eb33abacd38eb7b0b8d40949602812e441  linux-postmarketos-qcom-msm8916-v5.15-msm8916.tar.gz
-59d480b6379dcfff94d05b08e28c005d507f640dc0147841e7df4827fce8db01dab1d4d50fb45b2b3fff72cdeb219a8cd87a889078a6372aea4469c861c378b1  36dfdf11af49d3c009c711fb16f5c6e7a274505d.patch
-61f862cda24e7b14e55e9a9ce3a537adfc7a1c77e0670255dc485886e2c19156ddaf49fdd88b629ddde3cf25a83fd603678caebb96e18f59245917d3a2e51bb0  6eea4ace62fa6414432692ee44f0c0a3d541d97a.patch
-8468e559679019d7a74483beb5f94f9ac75e43aea24aa39303e513258e30c02dead1681472f60ff6ae812b70c24ebe95e597ba75a85d78595b6bb144cbdfd441  config-postmarketos-qcom-msm8916.aarch64
-712efefdddfeda5d6e1f200a6973fe5c5a13c70db3d6c3070a856de2682dc3c15b23c199b2232dafd70b25eb1429ce86cb021f47a0390b2c295dd4e135c2aa50  config-postmarketos-qcom-msm8916.armv7
+b702f5fe31e017c73e1841b18b36cf56a9dde92c71cee921f37a84024ef290199aba1b02db497b3a4b54f01b6a1636ad27de649454abca7fa1c63ff2f86b0919  linux-postmarketos-qcom-msm8916-v5.17-msm8916.tar.gz
+7d2dfefd615eee49bf83065d5c8ac0e260fd1ee30fcb264a8cf794490444a894005e9517a9674df7635ba65b182b1b8eab1c61a639ef3dbbb9e853a1b9437512  config-postmarketos-qcom-msm8916.aarch64
+384b41020f93fde33fb46251491282147bcde51c14e953653f6fd058131dc5f95c3c2246511941e49aae05ef241b5fffac4dbb455bf534af1caed5d31710108b  config-postmarketos-qcom-msm8916.armv7
 "
@@ -5,8 +5,8 @@

 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
-pkgver=5.16.12
-pkgrel=0
+pkgver=5.17.0
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -23,7 +23,7 @@ makedepends="bison findutils flex installkernel openssl-dev perl"

 _repo="linux"
 _config="config-$_flavor.$arch"
-_tag="sdm845-5.16.12"
+_tag="sdm845-5.17.0-r1"

 # Source
 source="
@@ -62,6 +62,6 @@ package() {
 }

 sha512sums="
-f30d0992c5b3cb3198841f71a94a2306425211601e3fa347b3e39780fd1be0b3becc2c5eee870744a2d7a5821c66937d594f3ccfe59f38ceb6acb2e21c205504  linux-sdm845-5.16.12.tar.gz
-5fe621ec5413cc7a4408ca58e7599435fee0063582f7f50e4b8378bddb574b7ed63644d31778bc6660ff221331c0574fa14c02fd496ae15b7b6cb4a318f4ebfb  config-postmarketos-qcom-sdm845.aarch64
+3c2ac7f9e89375ab06bfd5977359ba09d33bb6dc3258442ef84edeef368c303367b1049541c16e93ca20be09238906eed1bb8167cac0b77b3e71cbf2fb0b36d1  linux-sdm845-5.17.0-r1.tar.gz
+adff5d8d37984322a26bc6d87ca8b26ba1a70537597c382d2b8fc829bee0004c568dbcf38ad4f510b83b42db9c325d91e1d3a134531766bebc40ce5a00f77a69  config-postmarketos-qcom-sdm845.aarch64
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.16.12 Kernel Configuration
+# Linux/arm64 5.17.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219"
 CONFIG_CC_IS_GCC=y
@@ -216,7 +216,6 @@ CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
-CONFIG_HAVE_FUTEX_CMPXCHG=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -235,6 +234,7 @@ CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_GUEST_PERF_EVENTS=y

 #
 # Kernel Performance Events And Counters
@@ -355,6 +355,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_1508412=y
 CONFIG_ARM64_ERRATUM_2051678=y
+# CONFIG_ARM64_ERRATUM_2077057 is not set
 CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
 CONFIG_ARM64_ERRATUM_2054223=y
 CONFIG_ARM64_ERRATUM_2067961=y
@@ -391,10 +392,6 @@ CONFIG_NR_CPUS=8
 CONFIG_HOTPLUG_CPU=y
 CONFIG_NUMA=y
 CONFIG_NODES_SHIFT=4
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
@@ -403,7 +400,6 @@ CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -415,6 +411,7 @@ CONFIG_XEN_DOM0=y
 CONFIG_XEN=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -436,6 +433,8 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y
 #
 # ARMv8.2 architectural features
 #
+CONFIG_AS_HAS_ARMV8_2=y
+CONFIG_AS_HAS_SHA3=y
 # CONFIG_ARM64_PMEM is not set
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_CNP=y
@@ -622,9 +621,11 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=y
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 # CONFIG_ACPI_CONFIGFS is not set
+# CONFIG_ACPI_PFRUT is not set
 CONFIG_ACPI_IORT=y
 CONFIG_ACPI_GTDT=y
 CONFIG_ACPI_PPTT=y
+CONFIG_ACPI_PCC=y
 # CONFIG_PMIC_OPREGION is not set
 CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_HAVE_KVM=y
@@ -735,6 +736,7 @@ CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -888,13 +890,16 @@ CONFIG_MEMORY_FAILURE=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_SYSFS is not set
 CONFIG_CMA_AREAS=19
+# CONFIG_ZSWAP is not set
 # CONFIG_ZPOOL is not set
 CONFIG_ZSMALLOC=m
 CONFIG_ZSMALLOC_STAT=y
@@ -911,6 +916,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_SECRETMEM=y
+# CONFIG_ANON_VMA_NAME is not set

 #
 # Data Access Monitoring
@@ -1054,7 +1060,6 @@ CONFIG_NF_TABLES_INET=y
 # CONFIG_NF_TABLES_NETDEV is not set
 # CONFIG_NFT_NUMGEN is not set
 CONFIG_NFT_CT=m
-CONFIG_NFT_COUNTER=m
 # CONFIG_NFT_CONNLIMIT is not set
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -1628,6 +1633,7 @@ CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_DEVTMPFS_SAFE is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y

@@ -1746,6 +1752,7 @@ CONFIG_GNSS=m
 # CONFIG_GNSS_MTK_SERIAL is not set
 # CONFIG_GNSS_SIRF_SERIAL is not set
 # CONFIG_GNSS_UBX_SERIAL is not set
+# CONFIG_GNSS_USB is not set
 # CONFIG_MTD is not set
 CONFIG_DTC=y
 CONFIG_OF=y
@@ -1790,7 +1797,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 # CONFIG_XEN_BLKDEV_BACKEND is not set
 CONFIG_VIRTIO_BLK=y
 # CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_RSXX is not set

 #
 # NVME Support
@@ -2101,6 +2107,8 @@ CONFIG_NET_VENDOR_DLINK=y
 # CONFIG_SUNDANCE is not set
 CONFIG_NET_VENDOR_EMULEX=y
 # CONFIG_BE2NET is not set
+CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_TSNEP is not set
 CONFIG_NET_VENDOR_EZCHIP=y
 # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_GOOGLE=y
@@ -2156,6 +2164,7 @@ CONFIG_NET_VENDOR_MICROCHIP=y
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCX24J600 is not set
 # CONFIG_LAN743X is not set
+# CONFIG_LAN966X_SWITCH is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
 # CONFIG_MSCC_OCELOT_SWITCH is not set
 CONFIG_NET_VENDOR_MYRI=y
@@ -2231,6 +2240,8 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TLAN is not set
+CONFIG_NET_VENDOR_VERTEXCOM=y
+# CONFIG_MSE102X is not set
 CONFIG_NET_VENDOR_VIA=y
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_VELOCITY is not set
@@ -2294,7 +2305,7 @@ CONFIG_SMSC_PHY=m
 # CONFIG_DP83822_PHY is not set
 # CONFIG_DP83TC811_PHY is not set
 # CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
+CONFIG_DP83867_PHY=y
 # CONFIG_DP83869_PHY is not set
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_XILINX_GMII2RGMII is not set
@@ -2595,7 +2606,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_EGALAX is not set
 # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
 # CONFIG_TOUCHSCREEN_EXC3000 is not set
-CONFIG_TOUCHSCREEN_FTS=m
+CONFIG_TOUCHSCREEN_FOCALTECH_FTS=m
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 CONFIG_TOUCHSCREEN_GOODIX=m
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
@@ -2666,7 +2677,7 @@ CONFIG_INPUT_QCOM_SPMI_HAPTICS=m
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
 CONFIG_INPUT_UINPUT=m
 # CONFIG_INPUT_PCF8574 is not set
-# CONFIG_INPUT_PWM_BEEPER is not set
+CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_PWM_VIBRA=m
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_DA7280_HAPTICS is not set
@@ -2754,6 +2765,7 @@ CONFIG_SERIAL_8250_DWLIB=y
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_RT288X is not set
+CONFIG_SERIAL_8250_PERICOM=y
 CONFIG_SERIAL_OF_PLATFORM=y

 #
@@ -2822,6 +2834,7 @@ CONFIG_HW_RANDOM_OPTEE=m
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
+CONFIG_HW_RANDOM_CN10K=m
 # CONFIG_APPLICOM is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
@@ -3027,11 +3040,11 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_AMD is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
-CONFIG_PINCTRL_SINGLE=y
-# CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_STMFX is not set
-# CONFIG_PINCTRL_OCELOT is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
+# CONFIG_PINCTRL_OCELOT is not set
+CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_STMFX is not set
+# CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_APQ8084 is not set
@@ -3065,9 +3078,11 @@ CONFIG_PINCTRL_SDM845=y
 # CONFIG_PINCTRL_SM6115 is not set
 # CONFIG_PINCTRL_SM6125 is not set
 # CONFIG_PINCTRL_SM6350 is not set
+# CONFIG_PINCTRL_SDX65 is not set
 CONFIG_PINCTRL_SM8150=y
 CONFIG_PINCTRL_SM8250=y
 CONFIG_PINCTRL_SM8350=y
+# CONFIG_PINCTRL_SM8450 is not set
 CONFIG_PINCTRL_LPASS_LPI=m

 #
@@ -3162,6 +3177,7 @@ CONFIG_GPIO_WCD934X=m
 # CONFIG_GPIO_AGGREGATOR is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_VIRTIO is not set
+# CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers

 # CONFIG_W1 is not set
@@ -3207,6 +3223,7 @@ CONFIG_BATTERY_MAX17042=m
 # CONFIG_CHARGER_LT3651 is not set
 # CONFIG_CHARGER_LTC4162L is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+# CONFIG_CHARGER_MAX77976 is not set
 # CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
@@ -3277,7 +3294,7 @@ CONFIG_SENSORS_ARM_SCMI=y
 # CONFIG_SENSORS_IBMPEX is not set
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_JC42 is not set
+CONFIG_SENSORS_JC42=m
 # CONFIG_SENSORS_POWR1220 is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LTC2945 is not set
@@ -3336,6 +3353,7 @@ CONFIG_SENSORS_ARM_SCMI=y
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
 # CONFIG_SENSORS_NZXT_KRAKEN2 is not set
+# CONFIG_SENSORS_NZXT_SMART2 is not set
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
@@ -3365,6 +3383,7 @@ CONFIG_SENSORS_ARM_SCMI=y
 # CONFIG_SENSORS_AMC6821 is not set
 # CONFIG_SENSORS_INA209 is not set
 # CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
@@ -3582,7 +3601,6 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_WM8350_I2C is not set
 CONFIG_MFD_WM8994=m
 # CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
 # CONFIG_MFD_STPMIC1 is not set
@@ -3627,6 +3645,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MAX8893 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_MAX20086 is not set
 # CONFIG_REGULATOR_MAX77826 is not set
 # CONFIG_REGULATOR_MCP16502 is not set
 # CONFIG_REGULATOR_MP5416 is not set
@@ -3836,13 +3855,14 @@ CONFIG_VIDEO_IR_I2C=m
 # CONFIG_VIDEO_OV2680 is not set
 # CONFIG_VIDEO_OV2685 is not set
 # CONFIG_VIDEO_OV2740 is not set
-# CONFIG_VIDEO_OV5640 is not set
+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
+# CONFIG_VIDEO_OV5693 is not set
 # CONFIG_VIDEO_OV5695 is not set
 # CONFIG_VIDEO_OV7251 is not set
 # CONFIG_VIDEO_OV772X is not set
@@ -3926,7 +3946,7 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 # CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=m
 CONFIG_DRM_SCHED=y

 #
@@ -3956,7 +3976,8 @@ CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
+CONFIG_DRM_RCAR_USE_LVDS=y
+# CONFIG_DRM_RCAR_MIPI_DSI is not set
 # CONFIG_DRM_QXL is not set
 # CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_MSM=y
@@ -3979,6 +4000,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
+# CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 # CONFIG_DRM_PANEL_DSI_CM is not set
@@ -3994,6 +4016,7 @@ CONFIG_DRM_PANEL_EBBG_FHD_FT8719=y
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_JDI_R63452 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
@@ -4003,6 +4026,7 @@ CONFIG_DRM_PANEL_EBBG_FHD_FT8719=y
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 CONFIG_DRM_PANEL_NOVATEK_NT36672A=y
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
@@ -4034,6 +4058,7 @@ CONFIG_DRM_PANEL_SAMSUNG_SOFEF00=y
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
+# CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
@@ -4098,6 +4123,7 @@ CONFIG_DRM_I2C_ADV7511_CEC=y
 # CONFIG_DRM_GM12U320 is not set
 # CONFIG_DRM_SIMPLEDRM is not set
 # CONFIG_TINYDRM_HX8357D is not set
+# CONFIG_TINYDRM_ILI9163 is not set
 # CONFIG_TINYDRM_ILI9225 is not set
 # CONFIG_TINYDRM_ILI9341 is not set
 # CONFIG_TINYDRM_ILI9486 is not set
@@ -4118,6 +4144,7 @@ CONFIG_DRM_LEGACY=y
 # CONFIG_DRM_VIA is not set
 # CONFIG_DRM_SAVAGE is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+CONFIG_DRM_NOMODESET=y

 #
 # Frame buffer Devices
@@ -4338,6 +4365,7 @@ CONFIG_SND_SOC_COMPRESS=y
 CONFIG_SND_SOC_TOPOLOGY=y
 # CONFIG_SND_SOC_ADI is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
+# CONFIG_SND_AMD_ACP_CONFIG is not set
 # CONFIG_SND_ATMEL_SOC is not set
 # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
 # CONFIG_SND_DESIGNWARE_I2S is not set
@@ -4386,6 +4414,8 @@ CONFIG_SND_SOC_QDSP6_APM=m
 CONFIG_SND_SOC_QDSP6_PRM_LPASS_CLOCKS=m
 CONFIG_SND_SOC_QDSP6_PRM=m
 CONFIG_SND_SOC_QDSP6=m
+CONFIG_SND_SOC_QDSP6_Q6VOICE_DAI=m
+CONFIG_SND_SOC_QDSP6_Q6VOICE=m
 CONFIG_SND_SOC_MSM8996=m
 CONFIG_SND_SOC_SDM845=m
 CONFIG_SND_SOC_SM8250=m
@@ -4417,6 +4447,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ADAU7118_I2C is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4118 is not set
+# CONFIG_SND_SOC_AK4375 is not set
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4613 is not set
@@ -4525,10 +4556,12 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
 # CONFIG_SND_SOC_TFA989X is not set
+# CONFIG_SND_SOC_TLV320ADC3XXX is not set
 # CONFIG_SND_SOC_TLV320AIC23_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC23_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC31XX is not set
-# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
 # CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
@@ -4652,6 +4685,7 @@ CONFIG_HID_KENSINGTON=y
 # CONFIG_HID_LCPOWER is not set
 # CONFIG_HID_LED is not set
 # CONFIG_HID_LENOVO is not set
+# CONFIG_HID_LETSKETCH is not set
 CONFIG_HID_LOGITECH=y
 # CONFIG_HID_LOGITECH_DJ is not set
 # CONFIG_HID_LOGITECH_HIDPP is not set
@@ -4775,6 +4809,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_HCD_TEST_MODE is not set
+# CONFIG_USB_XEN_HCD is not set

 #
 # USB Device Class drivers
@@ -5178,6 +5213,10 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_PATTERN is not set
 # CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set
+
+#
+# Simple LED drivers
+#
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
@@ -5224,7 +5263,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_ISL12026 is not set
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
+CONFIG_RTC_DRV_PCF85063=m
 # CONFIG_RTC_DRV_PCF85363 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
@@ -5484,6 +5523,7 @@ CONFIG_STAGING=y

 # CONFIG_FB_SM750 is not set
 CONFIG_STAGING_MEDIA=y
+# CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_ZORAN is not set

 #
@@ -5547,6 +5587,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 is not set
+# CONFIG_COMMON_CLK_LAN966X is not set
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 # CONFIG_COMMON_CLK_XGENE is not set
 CONFIG_COMMON_CLK_PWM=y
@@ -5583,6 +5624,7 @@ CONFIG_MSM_GCC_8916=y
 # CONFIG_MSM_GCC_8953 is not set
 # CONFIG_MSM_GCC_8974 is not set
 # CONFIG_MSM_MMCC_8974 is not set
+# CONFIG_MSM_GCC_8976 is not set
 # CONFIG_MSM_MMCC_8994 is not set
 CONFIG_MSM_GCC_8994=y
 CONFIG_MSM_GCC_8996=y
@@ -5619,6 +5661,7 @@ CONFIG_SDM_DISPCC_845=y
 # CONFIG_SDM_LPASSCC_845 is not set
 # CONFIG_SDX_GCC_55 is not set
 # CONFIG_SM_CAMCC_8250 is not set
+# CONFIG_SDX_GCC_65 is not set
 CONFIG_SM_DISPCC_8250=y
 # CONFIG_SM_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
@@ -5626,6 +5669,7 @@ CONFIG_SM_DISPCC_8250=y
 CONFIG_SM_GCC_8150=y
 CONFIG_SM_GCC_8250=y
 CONFIG_SM_GCC_8350=y
+# CONFIG_SM_GCC_8450 is not set
 CONFIG_SM_GPUCC_8150=y
 CONFIG_SM_GPUCC_8250=y
 # CONFIG_SM_VIDEOCC_8150 is not set
@@ -5959,6 +6003,12 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_XILINX_XADC is not set
 # end of Analog to digital converters

+#
+# Analog to digital and digital to analog converters
+#
+# CONFIG_AD74413R is not set
+# end of Analog to digital and digital to analog converters
+
 #
 # Analog Front Ends
 #
@@ -6025,6 +6075,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # Digital to analog converters
 #
+# CONFIG_AD3552R is not set
 # CONFIG_AD5064 is not set
 # CONFIG_AD5360 is not set
 # CONFIG_AD5380 is not set
@@ -6044,6 +6095,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5766 is not set
 # CONFIG_AD5770R is not set
 # CONFIG_AD5791 is not set
+# CONFIG_AD7293 is not set
 # CONFIG_AD7303 is not set
 # CONFIG_AD8801 is not set
 # CONFIG_DPOT_DAC is not set
@@ -6067,6 +6119,12 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # end of IIO dummy driver

+#
+# Filters
+#
+# CONFIG_ADMV8818 is not set
+# end of Filters
+
 #
 # Frequency Synthesizers DDS/PLL
 #
@@ -6082,6 +6140,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
+# CONFIG_ADMV1013 is not set
 # CONFIG_ADRF6780 is not set
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
@@ -6389,12 +6448,15 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_PHY_CADENCE_SALVO is not set
 # CONFIG_PHY_FSL_IMX8MQ_USB is not set
 # CONFIG_PHY_MIXEL_MIPI_DPHY is not set
+# CONFIG_PHY_FSL_IMX8M_PCIE is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_LAN966X_SERDES is not set
 # CONFIG_PHY_CPCAP_USB is not set
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_QCOM_APQ8064_SATA is not set
+# CONFIG_PHY_QCOM_EDP is not set
 # CONFIG_PHY_QCOM_IPQ4019_USB is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
 # CONFIG_PHY_QCOM_PCIE2 is not set
@@ -6426,7 +6488,9 @@ CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_L3_PMU=y
 # CONFIG_ARM_SPE_PMU is not set
 # CONFIG_ARM_DMC620_PMU is not set
+# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 # CONFIG_HISI_PMU is not set
+# CONFIG_HISI_PCIE_PMU is not set
 # end of Performance monitor support

 CONFIG_RAS=y
@@ -6479,7 +6543,9 @@ CONFIG_INTERCONNECT_QCOM_BCM_VOTER=y
 CONFIG_INTERCONNECT_QCOM_MSM8916=m
 # CONFIG_INTERCONNECT_QCOM_MSM8939 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
+# CONFIG_INTERCONNECT_QCOM_MSM8996 is not set
 CONFIG_INTERCONNECT_QCOM_OSM_L3=m
+# CONFIG_INTERCONNECT_QCOM_QCM2290 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 CONFIG_INTERCONNECT_QCOM_RPMH_POSSIBLE=y
 CONFIG_INTERCONNECT_QCOM_RPMH=y
@@ -6492,6 +6558,7 @@ CONFIG_INTERCONNECT_QCOM_SDM845=y
 CONFIG_INTERCONNECT_QCOM_SM8150=m
 CONFIG_INTERCONNECT_QCOM_SM8250=m
 CONFIG_INTERCONNECT_QCOM_SM8350=m
+# CONFIG_INTERCONNECT_QCOM_SM8450 is not set
 CONFIG_INTERCONNECT_QCOM_SMD_RPM=m
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
@@ -6806,6 +6873,7 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 # end of Kernel hardening options
 # end of Security options

+CONFIG_XOR_BLOCKS=m
 CONFIG_CRYPTO=y

 #
@@ -6902,7 +6970,7 @@ CONFIG_CRYPTO_MD5=m
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_RMD160 is not set
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
@@ -6950,6 +7018,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_KDF800108_CTR=y
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -6958,26 +7027,6 @@ CONFIG_CRYPTO_USER_API_RNG=m
 # CONFIG_CRYPTO_USER_API_AEAD is not set
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=m
-CONFIG_CRYPTO_LIB_SM4=m
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
@@ -7025,7 +7074,6 @@ CONFIG_HAVE_ARCH_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
 # CONFIG_CORDIC is not set
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_RATIONAL=y
@@ -7034,6 +7082,27 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
@@ -7207,6 +7276,13 @@ CONFIG_HAVE_KCSAN_COMPILER=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_MISC=y

+#
+# Networking Debugging
+#
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
+# end of Networking Debugging
+
 #
 # Memory Debugging
 #
@@ -7352,12 +7428,12 @@ CONFIG_STRICT_DEVMEM=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_MIN_HEAP is not set
 # CONFIG_TEST_DIV64 is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_TEST_REF_TRACKER is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
@@ -7375,7 +7451,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_XARRAY is not set
 # CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
+# CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
@@ -103,5 +103,5 @@ b7291eecfddc7ebe9393eea864e0ee28960e8cc2f87dfc42d09426b5619f46ded97c38fb8bf26f4e
 e5cc0852506ea1e73213672f0c3f9144c08156f6d5e8af841bf3f7bffc0e89028507aac4718353eee20edd9069e3f81665caa5ca25e416f25e7e0da10451b67e  0010-usb-typec-add-extcon-to-tcpm.patch
 265b05bc542edb290ec15cd5f50132698a32e80d30ce28ce3ad7e990b7c07df92c4556122505b07a6aa582a919459872d1d874f4ed422d2aff2cdfb51889e720  0007-block-partitions-efi-Add-support-for-IGNOREME-GPT-si.patch
 5dc0ed5b947ca8153e3b3874cf380208b0736a0e5db25fbeddf4c9cbb8d121d20de130462c99f9f398f4d28a229eac8cf384d9170fff5d56a48e5aec1c1eea9e  config-postmarketos-rockchip.aarch64
-62a05ed0d8f040981454216939b044cc48deb4aa566e952b6bca2881b21e28f7f68e9a5d399ec5a5ec545ac3898757cdf139b1f1554841d73bf8a841ae407e6f  config-postmarketos-rockchip.armv7
+381064728710b2e74fbf623e7ce2ab84251ec656030e8c96c5f7630afd9e6786f725791ef5b4493eb6c821a0b87126e391a94b0ffc6999c4580f870b9cdfa1c8  config-postmarketos-rockchip.armv7
 "
@@ -1,47 +0,0 @@
-From 6eea4ace62fa6414432692ee44f0c0a3d541d97a Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Thu, 9 Dec 2021 19:02:15 +0100
-Subject: USB: gadget: zero allocate endpoint 0 buffers
-
-commit 86ebbc11bb3f60908a51f3e41a17e3f477c2eaa3 upstream.
-
-Under some conditions, USB gadget devices can show allocated buffer
-contents to a host.  Fix this up by zero-allocating them so that any
-extra data will all just be zeros.
-
-Reported-by: Szymon Heidrich <szymon.heidrich@gmail.com>
-Tested-by: Szymon Heidrich <szymon.heidrich@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
- drivers/usb/gadget/composite.c   | 2 +-
- drivers/usb/gadget/legacy/dbgp.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
-index 1ef7922b57b62..284eea9f6e4d8 100644
--- a/drivers/usb/gadget/composite.c
-+++ b/drivers/usb/gadget/composite.c
-@@ -2221,7 +2221,7 @@ int composite_dev_prepare(struct usb_composite_driver *composite,
- 	if (!cdev->req)
- 		return -ENOMEM;
-
-	cdev->req->buf = kmalloc(USB_COMP_EP0_BUFSIZ, GFP_KERNEL);
-+	cdev->req->buf = kzalloc(USB_COMP_EP0_BUFSIZ, GFP_KERNEL);
- 	if (!cdev->req->buf)
- 		goto fail;
-
-diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c
-index e567afcb2794c..355bc7dab9d5f 100644
--- a/drivers/usb/gadget/legacy/dbgp.c
-+++ b/drivers/usb/gadget/legacy/dbgp.c
-@@ -137,7 +137,7 @@ static int dbgp_enable_ep_req(struct usb_ep *ep)
- 		goto fail_1;
- 	}
-
-	req->buf = kmalloc(DBGP_REQ_LEN, GFP_KERNEL);
-+	req->buf = kzalloc(DBGP_REQ_LEN, GFP_KERNEL);
- 	if (!req->buf) {
- 		err = -ENOMEM;
- 		stp = 2;
--
-cgit 1.2.3-1.el7
@@ -1,110 +0,0 @@
-From 36dfdf11af49d3c009c711fb16f5c6e7a274505d Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Thu, 9 Dec 2021 18:59:27 +0100
-Subject: USB: gadget: detect too-big endpoint 0 requests
-
-commit 153a2d7e3350cc89d406ba2d35be8793a64c2038 upstream.
-
-Sometimes USB hosts can ask for buffers that are too large from endpoint
-0, which should not be allowed.  If this happens for OUT requests, stall
-the endpoint, but for IN requests, trim the request size to the endpoint
-buffer size.
-
-Co-developed-by: Szymon Heidrich <szymon.heidrich@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
- drivers/usb/gadget/composite.c    | 12 ++++++++++++
- drivers/usb/gadget/legacy/dbgp.c  | 13 +++++++++++++
- drivers/usb/gadget/legacy/inode.c | 16 +++++++++++++++-
- 3 files changed, 40 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
-index 504c1cbc255d1..1ef7922b57b62 100644
--- a/drivers/usb/gadget/composite.c
-+++ b/drivers/usb/gadget/composite.c
-@@ -1679,6 +1679,18 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
- 	struct usb_function		*f = NULL;
- 	u8				endp;
-
-+	if (w_length > USB_COMP_EP0_BUFSIZ) {
-+		if (ctrl->bRequestType == USB_DIR_OUT) {
-+			goto done;
-+		} else {
-+			/* Cast away the const, we are going to overwrite on purpose. */
-+			__le16 *temp = (__le16 *)&ctrl->wLength;
-+
-+			*temp = cpu_to_le16(USB_COMP_EP0_BUFSIZ);
-+			w_length = USB_COMP_EP0_BUFSIZ;
-+		}
-+	}
-+
- 	/* partial re-init of the response message; the function or the
- 	 * gadget might need to intercept e.g. a control-OUT completion
- 	 * when we delegate to it.
-diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c
-index e1d566c9918ae..e567afcb2794c 100644
--- a/drivers/usb/gadget/legacy/dbgp.c
-+++ b/drivers/usb/gadget/legacy/dbgp.c
-@@ -345,6 +345,19 @@ static int dbgp_setup(struct usb_gadget *gadget,
- 	void *data = NULL;
- 	u16 len = 0;
-
-+	if (length > DBGP_REQ_LEN) {
-+		if (ctrl->bRequestType == USB_DIR_OUT) {
-+			return err;
-+		} else {
-+			/* Cast away the const, we are going to overwrite on purpose. */
-+			__le16 *temp = (__le16 *)&ctrl->wLength;
-+
-+			*temp = cpu_to_le16(DBGP_REQ_LEN);
-+			length = DBGP_REQ_LEN;
-+		}
-+	}
-+
-+
- 	if (request == USB_REQ_GET_DESCRIPTOR) {
- 		switch (value>>8) {
- 		case USB_DT_DEVICE:
-diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
-index 539220d7f5b62..0a4041552ed19 100644
--- a/drivers/usb/gadget/legacy/inode.c
-+++ b/drivers/usb/gadget/legacy/inode.c
-@@ -110,6 +110,8 @@ enum ep0_state {
- /* enough for the whole queue: most events invalidate others */
- #define	N_EVENT			5
-
-+#define RBUF_SIZE		256
-+
- struct dev_data {
- 	spinlock_t			lock;
- 	refcount_t			count;
-@@ -144,7 +146,7 @@ struct dev_data {
- 	struct dentry			*dentry;
-
- 	/* except this scratch i/o buffer for ep0 */
-	u8				rbuf [256];
-+	u8				rbuf[RBUF_SIZE];
- };
-
- static inline void get_dev (struct dev_data *data)
-@@ -1334,6 +1336,18 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
- 	u16				w_value = le16_to_cpu(ctrl->wValue);
- 	u16				w_length = le16_to_cpu(ctrl->wLength);
-
-+	if (w_length > RBUF_SIZE) {
-+		if (ctrl->bRequestType == USB_DIR_OUT) {
-+			return value;
-+		} else {
-+			/* Cast away the const, we are going to overwrite on purpose. */
-+			__le16 *temp = (__le16 *)&ctrl->wLength;
-+
-+			*temp = cpu_to_le16(RBUF_SIZE);
-+			w_length = RBUF_SIZE;
-+		}
-+	}
-+
- 	spin_lock (&dev->lock);
- 	dev->setup_abort = 0;
- 	if (dev->state == STATE_DEV_UNCONNECTED) {
--
-cgit 1.2.3-1.el7
@@ -1,8 +1,8 @@
 # Maintainer: Mighty <mightymb17@gmail.com>
 # Co-Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=linux-samsung-espresso3g
-pkgver=5.15.2
-pkgrel=4
+pkgver=5.17.0
+pkgrel=0
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch) mainline kernel"
 arch="armv7"
 _carch="arm"
@@ -16,18 +16,20 @@ options="!strip !check !tracedeps
 	pmb:kconfigcheck-nftables
 	pmb:kconfigcheck-zram"
 makedepends="openssl-dev yaml-dev mpc1-dev mpfr-dev xz findutils bison flex perl sed bash gmp-dev bc linux-headers elfutils-dev"
-_commit="6ba3430a6fad45bf35f2634809e4f3a12f85cb89"
 _config="config-$_flavor.$arch"
+case $pkgver in
+	*.*.0)	_kernver=${pkgver%.0};;
+	*.*.*)	_kernver=$pkgver;;
+	*.*)	_kernver=$pkgver;;
+esac
 source="
-	$pkgname-$_commit.tar.gz::https://github.com/tmlind/linux_openpvrsgx/archive/$_commit.tar.gz
-	00-add-espresso-dts.patch
-	02-CVE-2021-39685-USB-gadget-detect-too-big-endpoint-0-requests.patch
-	03-CVE-2021-39685-USB-gadget-zero-allocate-endpoint-0-buffers.patch
-	04-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
-	05-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
+	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
+	00-Add-espresso-dts.patch
+	01-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
+	02-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
 	$_config
 "
-builddir="$srcdir/linux_openpvrsgx-$_commit"
+builddir="$srcdir/linux-$_kernver"

 prepare() {
 	default_prepare
@@ -54,11 +56,9 @@ package() {
 }

 sha512sums="
-c1f1372afc303cabb55210c7c46a694eff3bc0d7871efee7a690488b782b0c2cb48dbccc43b454a7cf96cfea796397f621d338e791172a8d1f62b26b2e1d54cb  linux-samsung-espresso3g-6ba3430a6fad45bf35f2634809e4f3a12f85cb89.tar.gz
-01d2e04afba261c42ba3c9e9aea4f8f023d86e58f17e2e17dec2f46347665843678dd56ad8875ab00b69074c3389dd471a47a9f252e2c8002c89dc730691cfd8  00-add-espresso-dts.patch
-c83480686caa35c51bce654104082e51d2569850bbbdcdb8479fb756ffb7907aefce685b2cfa748bbed0da7b585be83a08d194d0ff315a070a5b5a07c8dbc1d2  02-CVE-2021-39685-USB-gadget-detect-too-big-endpoint-0-requests.patch
-7b76e82bca21c9746bb37df2e840b43a0628a8a00b45ee43dd38ce742d7b99e30faf4bd11c99f1a20299b486885cbb9f62502400544a6a7e319292b97331581d  03-CVE-2021-39685-USB-gadget-zero-allocate-endpoint-0-buffers.patch
-a483b1a322f3fe47c7bb6514f34cca69ad1b806487596ffab69078acb6e83e99ed39ffb4d5b4ecd17035d118a75ce5bac6761b9e42d01608f1e6a53d59b27806  04-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
-b3d6114c5c60fc2820856c89ea6f09c369d857ae79a79f0eeb0f83f5401dc2253e11f7dac6869eb1095d3e0b3a68126246762e2f406ffae5b5ef0a60d5563bac  05-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
-7757f169073701eb1f2c7a27401d169bfaf0d133b62823bbc1e5f6cb7fe33a1ebe3901383f6e6e34c140f501f3ed5d77608386c1fc9e908cdc7cbd69d9c339f2  config-samsung-espresso3g.armv7
+89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b  linux-5.17.tar.xz
+01d2e04afba261c42ba3c9e9aea4f8f023d86e58f17e2e17dec2f46347665843678dd56ad8875ab00b69074c3389dd471a47a9f252e2c8002c89dc730691cfd8  00-Add-espresso-dts.patch
+a483b1a322f3fe47c7bb6514f34cca69ad1b806487596ffab69078acb6e83e99ed39ffb4d5b4ecd17035d118a75ce5bac6761b9e42d01608f1e6a53d59b27806  01-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
+b3d6114c5c60fc2820856c89ea6f09c369d857ae79a79f0eeb0f83f5401dc2253e11f7dac6869eb1095d3e0b3a68126246762e2f406ffae5b5ef0a60d5563bac  02-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
+3bf676ddaf2201088c223b5f67933041d47b0cb20aefb678af271887107658f334fb6f3a778470a824b1c1a1a256ac68e17bded27c6d661f7b0a92eb15326fa3  config-samsung-espresso3g.armv7
 "
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.15.2 Kernel Configuration
+# Linux/arm 5.17.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 11.2.1_git20211128) 11.2.1 20211128"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=110201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23700
+CONFIG_AS_VERSION=23800
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23700
+CONFIG_LD_VERSION=23800
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -17,6 +17,7 @@ CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y

 #
 # General setup
@@ -66,7 +67,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_GENERIC_IRQ_IPI=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -100,6 +100,7 @@ CONFIG_HAVE_EBPF_JIT=y
 # CONFIG_BPF_JIT is not set
 # end of BPF subsystem

+CONFIG_PREEMPT_BUILD=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -150,6 +151,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 #
 # end of Scheduler features

+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
@@ -209,7 +211,6 @@ CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
-CONFIG_HAVE_FUTEX_CMPXCHG=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -276,7 +277,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_DOVE is not set
 # CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_OMAP1 is not set
@@ -415,6 +415,7 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_CPU_SPECTRE=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_HARDEN_BRANCH_HISTORY=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_VDSO=y
 CONFIG_DMA_CACHE_RWFO=y
@@ -463,6 +464,7 @@ CONFIG_ARM_ERRATA_798181=y
 CONFIG_HAVE_SMP=y
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
+CONFIG_CURRENT_POINTER_IN_TPIDRURO=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 # CONFIG_SCHED_MC is not set
 # CONFIG_SCHED_SMT is not set
@@ -700,6 +702,8 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
 CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -841,12 +845,11 @@ CONFIG_CONTIG_ALLOC=y
 CONFIG_BOUNCE=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_SYSFS is not set
 CONFIG_CMA_AREAS=7
+# CONFIG_ZSWAP is not set
 # CONFIG_ZPOOL is not set
 CONFIG_ZSMALLOC=m
 CONFIG_ZSMALLOC_STAT=y
@@ -855,6 +858,8 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_KMAP_LOCAL=y
+CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
+# CONFIG_ANON_VMA_NAME is not set

 #
 # Data Access Monitoring
@@ -948,6 +953,8 @@ CONFIG_BRIDGE_NETFILTER=m
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_EGRESS=y
+CONFIG_NETFILTER_SKIP_EGRESS=y
 CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_FAMILY_BRIDGE=y
 # CONFIG_NETFILTER_NETLINK_HOOK is not set
@@ -986,7 +993,6 @@ CONFIG_NF_TABLES_INET=y
 # CONFIG_NF_TABLES_NETDEV is not set
 # CONFIG_NFT_NUMGEN is not set
 CONFIG_NFT_CT=y
-CONFIG_NFT_COUNTER=y
 # CONFIG_NFT_CONNLIMIT is not set
 CONFIG_NFT_LOG=y
 CONFIG_NFT_LIMIT=y
@@ -1374,8 +1380,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_CAN_IFI_CANFD is not set
 # CONFIG_CAN_M_CAN is not set
 # CONFIG_CAN_PEAK_PCIEFD is not set
-# CONFIG_CAN_RCAR is not set
-# CONFIG_CAN_RCAR_CANFD is not set
 # CONFIG_CAN_SJA1000 is not set
 # CONFIG_CAN_SOFTING is not set

@@ -1595,6 +1599,7 @@ CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_DEVTMPFS_SAFE is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y

@@ -1613,6 +1618,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 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
@@ -1821,7 +1827,6 @@ CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 # CONFIG_OF_OVERLAY is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
@@ -1839,7 +1844,6 @@ CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
@@ -1850,7 +1854,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_VIRTIO_BLK is not set
 # CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_RSXX is not set

 #
 # NVME Support
@@ -2135,6 +2138,7 @@ CONFIG_DM_THIN_PROVISIONING=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
 CONFIG_DM_INTEGRITY=m
+CONFIG_DM_AUDIT=y
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set

@@ -2153,7 +2157,6 @@ CONFIG_DUMMY=y
 # CONFIG_WIREGUARD is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_FC is not set
-# CONFIG_IFB is not set
 # CONFIG_NET_TEAM is not set
 CONFIG_MACVLAN=y
 # CONFIG_MACVTAP is not set
@@ -2164,6 +2167,7 @@ CONFIG_VXLAN=y
 # CONFIG_GENEVE is not set
 # CONFIG_BAREUDP is not set
 # CONFIG_GTP is not set
+# CONFIG_AMT is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
 CONFIG_TUN=y
@@ -2193,6 +2197,8 @@ CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_AQUANTIA=y
 # CONFIG_AQTION is not set
 # CONFIG_NET_VENDOR_ARC is not set
+CONFIG_NET_VENDOR_ASIX=y
+# CONFIG_SPI_AX88796C is not set
 CONFIG_NET_VENDOR_ATHEROS=y
 # CONFIG_ATL2 is not set
 # CONFIG_ATL1 is not set
@@ -2225,6 +2231,8 @@ CONFIG_NET_VENDOR_DLINK=y
 # CONFIG_SUNDANCE is not set
 CONFIG_NET_VENDOR_EMULEX=y
 # CONFIG_BE2NET is not set
+CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_TSNEP is not set
 CONFIG_NET_VENDOR_EZCHIP=y
 # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
 # CONFIG_NET_VENDOR_FARADAY is not set
@@ -2318,6 +2326,8 @@ CONFIG_TI_CPSW=y
 CONFIG_TI_CPSW_SWITCHDEV=y
 CONFIG_TI_CPTS=y
 # CONFIG_TLAN is not set
+CONFIG_NET_VENDOR_VERTEXCOM=y
+# CONFIG_MSE102X is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_NET_VENDOR_XILINX=y
@@ -2497,8 +2507,6 @@ CONFIG_WLAN_VENDOR_CISCO=y
 CONFIG_WLAN_VENDOR_INTEL=y
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
-# CONFIG_IWL4965 is not set
-# CONFIG_IWL3945 is not set
 # CONFIG_IWLWIFI is not set
 CONFIG_WLAN_VENDOR_INTERSIL=y
 # CONFIG_HOSTAP is not set
@@ -2529,6 +2537,7 @@ CONFIG_WLAN_VENDOR_MEDIATEK=y
 # CONFIG_MT7663S is not set
 # CONFIG_MT7915E is not set
 # CONFIG_MT7921E is not set
+# CONFIG_MT7921S is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
@@ -2540,6 +2549,7 @@ CONFIG_WLAN_VENDOR_REALTEK=y
 # CONFIG_RTL_CARDS is not set
 # CONFIG_RTL8XXXU is not set
 # CONFIG_RTW88 is not set
+# CONFIG_RTW89 is not set
 CONFIG_WLAN_VENDOR_RSI=y
 # CONFIG_RSI_91X is not set
 CONFIG_WLAN_VENDOR_ST=y
@@ -2627,6 +2637,7 @@ CONFIG_KEYBOARD_TWL4030=m
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_CAP11XX is not set
 # CONFIG_KEYBOARD_BCM is not set
+# CONFIG_KEYBOARD_CYPRESS_SF is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
@@ -2794,10 +2805,10 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_FSL=y
 # CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_EM is not set
 # CONFIG_SERIAL_8250_RT288X is not set
 CONFIG_SERIAL_8250_OMAP=y
 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
+CONFIG_SERIAL_8250_PERICOM=y
 CONFIG_SERIAL_OF_PLATFORM=y

 #
@@ -2953,6 +2964,7 @@ CONFIG_SPI_MEM=y
 CONFIG_SPI_BITBANG=m
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
+# CONFIG_SPI_CADENCE_XSPI is not set
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_NXP_FLEXSPI is not set
 CONFIG_SPI_GPIO=m
@@ -3029,12 +3041,12 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_MCP23S08 is not set
-CONFIG_PINCTRL_SINGLE=y
-# CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_STMFX is not set
-# CONFIG_PINCTRL_PALMAS is not set
-# CONFIG_PINCTRL_OCELOT is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
+# CONFIG_PINCTRL_OCELOT is not set
+# CONFIG_PINCTRL_PALMAS is not set
+CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_STMFX is not set
+# CONFIG_PINCTRL_SX150X is not set

 #
 # Renesas pinctrl drivers
@@ -3132,6 +3144,7 @@ CONFIG_GPIO_TWL4030=y
 # CONFIG_GPIO_AGGREGATOR is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_VIRTIO is not set
+# CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers

 CONFIG_W1=m
@@ -3213,6 +3226,7 @@ CONFIG_CHARGER_TWL4030=m
 # CONFIG_CHARGER_LT3651 is not set
 # CONFIG_CHARGER_LTC4162L is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+# CONFIG_CHARGER_MAX77976 is not set
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_BQ24190=m
 # CONFIG_CHARGER_BQ24257 is not set
@@ -3298,6 +3312,7 @@ CONFIG_SENSORS_GPIO_FAN=m
 # CONFIG_SENSORS_MAX197 is not set
 # CONFIG_SENSORS_MAX31722 is not set
 # CONFIG_SENSORS_MAX31730 is not set
+# CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
 # CONFIG_SENSORS_MAX6642 is not set
@@ -3334,6 +3349,7 @@ CONFIG_SENSORS_LM75=m
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
 # CONFIG_SENSORS_NZXT_KRAKEN2 is not set
+# CONFIG_SENSORS_NZXT_SMART2 is not set
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
@@ -3363,6 +3379,7 @@ CONFIG_SENSORS_LM75=m
 # CONFIG_SENSORS_AMC6821 is not set
 # CONFIG_SENSORS_INA209 is not set
 # CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
@@ -3506,7 +3523,6 @@ CONFIG_MFD_CORE=y
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
-# CONFIG_MFD_INTEL_PMT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3564,7 +3580,6 @@ CONFIG_MFD_TPS65218=y
 CONFIG_MFD_TPS65910=y
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS80031 is not set
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_POWER=y
 # CONFIG_MFD_TWL4030_AUDIO is not set
@@ -3587,7 +3602,6 @@ CONFIG_TWL6040_CORE=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
 # CONFIG_MFD_STPMIC1 is not set
@@ -3632,6 +3646,7 @@ CONFIG_REGULATOR_LP87565=y
 # CONFIG_REGULATOR_MAX8893 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_MAX20086 is not set
 # CONFIG_REGULATOR_MAX77826 is not set
 # CONFIG_REGULATOR_MCP16502 is not set
 # CONFIG_REGULATOR_MP5416 is not set
@@ -3693,15 +3708,20 @@ CONFIG_IR_RX51=m
 CONFIG_IR_GPIO_TX=m
 CONFIG_IR_PWM_TX=m
 # CONFIG_IR_SERIAL is not set
-# CONFIG_IR_SIR is not set
 # CONFIG_RC_XBOX_DVD is not set
 # CONFIG_IR_TOY is not set
 CONFIG_CEC_CORE=y
+
+#
+# CEC support
+#
 CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_CEC_CH7322 is not set
 # CONFIG_CEC_GPIO is not set
 # CONFIG_USB_PULSE8_CEC is not set
 # CONFIG_USB_RAINSHADOW_CEC is not set
+# end of CEC support
+
 CONFIG_MEDIA_SUPPORT=m
 # CONFIG_MEDIA_SUPPORT_FILTER is not set
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
@@ -3911,6 +3931,7 @@ CONFIG_VIDEO_TVP5150=m
 #
 CONFIG_VIDEO_APTINA_PLL=m
 # CONFIG_VIDEO_HI556 is not set
+# CONFIG_VIDEO_HI846 is not set
 # CONFIG_VIDEO_IMX208 is not set
 # CONFIG_VIDEO_IMX214 is not set
 # CONFIG_VIDEO_IMX219 is not set
@@ -3934,6 +3955,7 @@ CONFIG_VIDEO_APTINA_PLL=m
 # CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV5670 is not set
 # CONFIG_VIDEO_OV5675 is not set
+# CONFIG_VIDEO_OV5693 is not set
 # CONFIG_VIDEO_OV5695 is not set
 # CONFIG_VIDEO_OV7251 is not set
 # CONFIG_VIDEO_OV772X is not set
@@ -3946,6 +3968,7 @@ CONFIG_VIDEO_APTINA_PLL=m
 # CONFIG_VIDEO_OV9640 is not set
 # CONFIG_VIDEO_OV9650 is not set
 # CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_OV13B10 is not set
 # CONFIG_VIDEO_VS6624 is not set
 # CONFIG_VIDEO_MT9M001 is not set
 # CONFIG_VIDEO_MT9M032 is not set
@@ -4222,7 +4245,6 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_IMX_IPUV3_CORE is not set
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_DP_AUX_BUS=m
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DEBUG_MM is not set
 CONFIG_DRM_KMS_HELPER=y
@@ -4230,8 +4252,7 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 # CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_CMA_HELPER=m

 #
 # I2C encoder or helper chips
@@ -4261,7 +4282,8 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_ARMADA is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
+# CONFIG_DRM_RCAR_USE_LVDS is not set
+# CONFIG_DRM_RCAR_MIPI_DSI is not set
 CONFIG_DRM_OMAP=y
 # CONFIG_OMAP2_DSS_DEBUG is not set
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
@@ -4288,11 +4310,13 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
+# CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 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=m
 CONFIG_DRM_PANEL_LVDS=y
 CONFIG_DRM_PANEL_SIMPLE=m
+# CONFIG_DRM_PANEL_EDP is not set
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
@@ -4302,6 +4326,7 @@ CONFIG_DRM_PANEL_SIMPLE=m
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_JDI_R63452 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
@@ -4311,6 +4336,7 @@ CONFIG_DRM_PANEL_LG_LB035Q02=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 CONFIG_DRM_PANEL_NEC_NL8048HL11=m
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
@@ -4325,6 +4351,7 @@ CONFIG_DRM_PANEL_NEC_NL8048HL11=m
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
@@ -4335,11 +4362,13 @@ CONFIG_DRM_PANEL_NEC_NL8048HL11=m
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS060T1SX01 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 CONFIG_DRM_PANEL_SONY_ACX565AKM=m
+# CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
 CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
@@ -4400,6 +4429,7 @@ CONFIG_DRM_TI_TPD12S015=m
 # CONFIG_DRM_GM12U320 is not set
 # CONFIG_DRM_SIMPLEDRM is not set
 # CONFIG_TINYDRM_HX8357D is not set
+# CONFIG_TINYDRM_ILI9163 is not set
 # CONFIG_TINYDRM_ILI9225 is not set
 # CONFIG_TINYDRM_ILI9341 is not set
 # CONFIG_TINYDRM_ILI9486 is not set
@@ -4413,12 +4443,6 @@ CONFIG_DRM_TI_TPD12S015=m
 # CONFIG_DRM_PANFROST is not set
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_TIDSS is not set
-CONFIG_SGX=y
-CONFIG_PVRSGX_1_17_4948957=y
-# CONFIG_SGX_DEBUG is not set
-CONFIG_SGX_DRM=y
-CONFIG_SGX_OMAP=m
-# CONFIG_SGX_GENERIC is not set
 # CONFIG_DRM_GUD is not set
 CONFIG_DRM_LEGACY=y
 # CONFIG_DRM_TDFX is not set
@@ -4427,6 +4451,7 @@ CONFIG_DRM_LEGACY=y
 # CONFIG_DRM_VIA is not set
 # CONFIG_DRM_SAVAGE is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+CONFIG_DRM_NOMODESET=y

 #
 # Frame buffer Devices
@@ -4530,6 +4555,7 @@ CONFIG_HDMI=y
 #
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@@ -4656,6 +4682,7 @@ CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_ADI is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
+# CONFIG_SND_AMD_ACP_CONFIG is not set
 # CONFIG_SND_ATMEL_SOC is not set
 # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
 # CONFIG_SND_DESIGNWARE_I2S is not set
@@ -4730,6 +4757,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ADAU7118_I2C is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4118 is not set
+# CONFIG_SND_SOC_AK4375 is not set
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4613 is not set
@@ -4745,6 +4773,8 @@ CONFIG_SND_SOC_CPCAP=m
 # CONFIG_SND_SOC_CS35L34 is not set
 # CONFIG_SND_SOC_CS35L35 is not set
 # CONFIG_SND_SOC_CS35L36 is not set
+# CONFIG_SND_SOC_CS35L41_SPI is not set
+# CONFIG_SND_SOC_CS35L41_I2C is not set
 # CONFIG_SND_SOC_CS42L42 is not set
 # CONFIG_SND_SOC_CS42L51_I2C is not set
 # CONFIG_SND_SOC_CS42L52 is not set
@@ -4777,6 +4807,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9867 is not set
 # CONFIG_SND_SOC_MAX98927 is not set
+# CONFIG_SND_SOC_MAX98520 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
@@ -4799,6 +4830,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_RT5640 is not set
 # CONFIG_SND_SOC_RT5659 is not set
+# CONFIG_SND_SOC_RT9120 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
@@ -4822,6 +4854,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
 # CONFIG_SND_SOC_TFA989X is not set
+# CONFIG_SND_SOC_TLV320ADC3XXX is not set
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
 # CONFIG_SND_SOC_TLV320AIC23_SPI is not set
@@ -4867,6 +4900,7 @@ CONFIG_SND_SOC_TWL6040=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 # CONFIG_SND_SOC_NAU8824 is not set
 CONFIG_SND_SOC_TPA6130A2=m
@@ -4879,6 +4913,8 @@ CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
+# CONFIG_SND_AUDIO_GRAPH_CARD2 is not set
+# CONFIG_SND_TEST_COMPONENT is not set
 # CONFIG_SND_VIRTIO is not set

 #
@@ -4929,6 +4965,7 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_VIEWSONIC is not set
+# CONFIG_HID_XIAOMI is not set
 # CONFIG_HID_GYRATION is not set
 # CONFIG_HID_ICADE is not set
 # CONFIG_HID_ITE is not set
@@ -4938,6 +4975,7 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_LCPOWER is not set
 # CONFIG_HID_LED is not set
 # CONFIG_HID_LENOVO is not set
+# CONFIG_HID_LETSKETCH is not set
 # CONFIG_HID_LOGITECH is not set
 # CONFIG_HID_MAGICMOUSE is not set
 # CONFIG_HID_MALTRON is not set
@@ -4946,6 +4984,7 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_MICROSOFT is not set
 # CONFIG_HID_MONTEREY is not set
 # CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NINTENDO is not set
 # CONFIG_HID_NTI is not set
 # CONFIG_HID_NTRIG is not set
 # CONFIG_HID_ORTEK is not set
@@ -4954,7 +4993,6 @@ CONFIG_HID_GENERIC=m
 # 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
@@ -5454,6 +5492,10 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 # CONFIG_LEDS_TRIGGER_PATTERN is not set
 # CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set
+
+#
+# Simple LED drivers
+#
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_ATOMIC_SCRUB=y
@@ -5743,7 +5785,7 @@ CONFIG_COMMON_CLK=y
 #
 # Clock driver for ARM Reference designs
 #
-# CONFIG_ICST is not set
+# CONFIG_CLK_ICST is not set
 # CONFIG_CLK_SP810 is not set
 # end of Clock driver for ARM Reference designs

@@ -5757,6 +5799,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_LAN966X is not set
 CONFIG_CLK_TWL6040=y
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 CONFIG_COMMON_CLK_PALMAS=m
@@ -5910,8 +5953,12 @@ CONFIG_IIO_SW_TRIGGER=m
 #
 # CONFIG_ADIS16201 is not set
 # CONFIG_ADIS16209 is not set
+# CONFIG_ADXL313_I2C is not set
+# CONFIG_ADXL313_SPI is not set
 # CONFIG_ADXL345_I2C is not set
 # CONFIG_ADXL345_SPI is not set
+# CONFIG_ADXL355_I2C is not set
+# CONFIG_ADXL355_SPI is not set
 # CONFIG_ADXL372_SPI is not set
 # CONFIG_ADXL372_I2C is not set
 # CONFIG_BMA180 is not set
@@ -6015,6 +6062,12 @@ CONFIG_TWL6030_GPADC=y
 # CONFIG_XILINX_XADC is not set
 # end of Analog to digital converters

+#
+# Analog to digital and digital to analog converters
+#
+# CONFIG_AD74413R is not set
+# end of Analog to digital and digital to analog converters
+
 #
 # Analog Front Ends
 #
@@ -6044,10 +6097,12 @@ CONFIG_IIO_RESCALE=y
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
+# CONFIG_SCD4X is not set
 # CONFIG_SENSIRION_SGP30 is not set
 # CONFIG_SENSIRION_SGP40 is not set
 # CONFIG_SPS30_I2C is not set
 # CONFIG_SPS30_SERIAL is not set
+# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
 # CONFIG_VZ89X is not set
 # end of Chemical Sensors

@@ -6074,6 +6129,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # Digital to analog converters
 #
+# CONFIG_AD3552R is not set
 # CONFIG_AD5064 is not set
 # CONFIG_AD5360 is not set
 # CONFIG_AD5380 is not set
@@ -6093,6 +6149,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5766 is not set
 # CONFIG_AD5770R is not set
 # CONFIG_AD5791 is not set
+# CONFIG_AD7293 is not set
 # CONFIG_AD7303 is not set
 # CONFIG_AD8801 is not set
 # CONFIG_DPOT_DAC is not set
@@ -6117,6 +6174,11 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # end of IIO dummy driver

+#
+# Filters
+#
+# end of Filters
+
 #
 # Frequency Synthesizers DDS/PLL
 #
@@ -6132,6 +6194,8 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
+# CONFIG_ADMV1013 is not set
+# CONFIG_ADRF6780 is not set
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL

@@ -6378,6 +6442,7 @@ CONFIG_BMP280_SPI=m
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 # CONFIG_MAX31856 is not set
+# CONFIG_MAX31865 is not set
 # end of Temperature sensors

 # CONFIG_NTB is not set
@@ -6414,15 +6479,23 @@ CONFIG_RESET_CONTROLLER=y
 #
 CONFIG_GENERIC_PHY=y
 # CONFIG_PHY_CAN_TRANSCEIVER is not set
+
+#
+# PHY drivers for Broadcom platforms
+#
 # CONFIG_BCM_KONA_USB2_PHY is not set
+# end of PHY drivers for Broadcom platforms
+
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
 # CONFIG_PHY_CADENCE_SIERRA is not set
 # CONFIG_PHY_CADENCE_SALVO is not set
 # CONFIG_PHY_FSL_IMX8MQ_USB is not set
 # CONFIG_PHY_MIXEL_MIPI_DPHY is not set
+# CONFIG_PHY_FSL_IMX8M_PCIE is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_LAN966X_SERDES is not set
 CONFIG_PHY_CPCAP_USB=m
 CONFIG_PHY_MAPPHONE_MDM6600=m
 # CONFIG_PHY_OCELOT_SERDES is not set
@@ -6660,6 +6733,7 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
 CONFIG_PSTORE_RAM=y
+# CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 # CONFIG_EROFS_FS is not set
@@ -6945,21 +7019,6 @@ CONFIG_CRYPTO_JITTERENTROPY=y
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=y
-# CONFIG_CRYPTO_LIB_BLAKE2S is not set
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-# CONFIG_CRYPTO_LIB_CHACHA is not set
-# CONFIG_CRYPTO_LIB_CURVE25519 is not set
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-# CONFIG_CRYPTO_LIB_POLY1305 is not set
-# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
 CONFIG_CRYPTO_DEV_OMAP=m
@@ -7006,6 +7065,23 @@ CONFIG_CORDIC=m
 CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+# CONFIG_CRYPTO_LIB_CHACHA is not set
+# CONFIG_CRYPTO_LIB_CURVE25519 is not set
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+# CONFIG_CRYPTO_LIB_POLY1305 is not set
+# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
@@ -7039,6 +7115,7 @@ CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
+# CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
@@ -7161,6 +7238,11 @@ CONFIG_HAVE_KCSAN_COMPILER=y

 # CONFIG_DEBUG_KERNEL is not set

+#
+# Networking Debugging
+#
+# end of Networking Debugging
+
 #
 # Memory Debugging
 #
@@ -7175,6 +7257,8 @@ CONFIG_HAVE_ARCH_KASAN=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

 #
@@ -7224,6 +7308,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
@@ -7303,7 +7388,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_XARRAY is not set
 # CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
+# CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
@@ -1,3 +1,3 @@
-# Tag wwan ports of device samsung-serranove to reduce the facility
+# Tag wwan ports of some Samsung devices to reduce the facility
 # lock query by ModemManager, avoiding a QMI protocol error.
 SUBSYSTEM=="wwan", ENV{ID_MM_QMI_FACILITY_LOCK_QUERY_REDUCED}="1"
@@ -2,7 +2,7 @@
 # Co-Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
-pkgver=14
+pkgver=16
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -14,11 +14,13 @@ subpackages="
 	$pkgname-rproc-none:rproc_none
 	$pkgname-rproc-no-modem:rproc_no_modem
 	$pkgname-rproc-all:rproc_all
+	soc-samsung-msm8916-modem-workaround:samsung_modem_workaround
 "

-_ucm_commit="d9c15108e4301e0dc0192fa15fddc83f623bca97"
+_ucm_commit="23f9d6d4d12c13821d473d6f86908335d3a72026"
 source="$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8916-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz
 	q6voiced.conf
+	77-modem-samsung-msm8916.rules
 	90-feedbackd-pm8916.rules
 	"

@@ -73,8 +75,17 @@ rproc_all() {
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

+samsung_modem_workaround() {
+	pkgdesc="Workaround for modem facility lock issue on some Samsung devices"
+	depends=""
+
+	install -Dm644 "$srcdir"/77-modem-samsung-msm8916.rules \
+		"$subpkgdir"/lib/udev/rules.d/77-modem-samsung-msm8916.rules
+}
+
 sha512sums="
-274ef82a949ea51ec1a1628e4793f99d22982d34165cffb8cdfabb3247f3797987652c43ad81d29f49071d184241d873362a17a1694331f402b69a8dbda42aea  soc-qcom-msm8916-d9c15108e4301e0dc0192fa15fddc83f623bca97.tar.gz
+807499a7620a0a7d51aa29fea157cf12f46bf4dcb05e5150f6c2355bf18d1805610988ad98d181e8ba69c8c9844e4d9a51f1553438d167ade89a387eabafd8f9  soc-qcom-msm8916-23f9d6d4d12c13821d473d6f86908335d3a72026.tar.gz
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
+bcebc36ec62140f4620d462be2b95858adae380e5d74f6b9c9b956fb76a6541f39749f4dcec6ac3c39b868dbfed6fac7a34ba357510532a3df2d39f7ea818d55  77-modem-samsung-msm8916.rules
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8916.rules
 "
@@ -1,7 +1,7 @@
 # Maintainer: Caleb Connolly (kalube) <caleb@connolly.tech>
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -17,7 +17,7 @@ subpackages="
 	$pkgname-ucm
 "

-_ucm_commit="f959b6c46165f23eebcf34ffefef14c6be015a55"
+_ucm_commit="621c71fd5f5742c60d38766ebb2d1bd3b863a2a4"
 source="
 	alsa-ucm-conf-$_ucm_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_ucm_commit/alsa-ucm-conf-$_ucm_commit.tar.gz
 	90-feedbackd-pmi8998.rules
@@ -28,15 +28,16 @@ package() {
 	mkdir -p "$pkgdir"
 	install -Dm644 "$srcdir"/90-feedbackd-pmi8998.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-pmi8998.rules
-	install -Dm644 "$srcdir"/modemmanager.conf \
-		"$pkgdir"/etc/conf.d/modemmanager
 }

 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware"
-	depends="pd-mapper pd-mapper-openrc tqftpserv tqftpserv-openrc msm-modem"
-	install="$subpkgname.post-install"
+	depends="pd-mapper pd-mapper-openrc tqftpserv tqftpserv-openrc q6voiced q6voiced-openrc msm-modem"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
+
+	install -Dm644 "$srcdir"/modemmanager.conf \
+		"$subpkgdir"/etc/conf.d/modemmanager
 }

 ucm() {
@@ -48,7 +49,7 @@ ucm() {
 }

 sha512sums="
-48fba9c041a2a2dfef9f038dfeeb7f636ed4e3b4d1babe2bd9b6ee350a4a34472b0f20d69b57864aa79fb28b24bb38a88ef1542a6d3211db713b361a4d136745  alsa-ucm-conf-f959b6c46165f23eebcf34ffefef14c6be015a55.tar.gz
+a1a6c6f5a6156e76e5a15b0078e3baedf07fa02b354cb025b1124ed688434a620d80aa8c0069b2d7ded1a29e2bb9318ab6e8f8a85af33a9dd2478a7b7ec6b494  alsa-ucm-conf-621c71fd5f5742c60d38766ebb2d1bd3b863a2a4.tar.gz
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 e33f41360ccc4900bb76a26cc7b46bde1fb90facdf45c4fbcebc80499386939948401cacd6df9f779eafab10f4ee77ee1fef3e7bd06f483f8c2a4a644c84f327  modemmanager.conf
 "
@@ -1,3 +1,4 @@
 #!/bin/sh
 rc-update add tqftpserv boot
 rc-update add pd-mapper boot
+rc-update add q6voiced default
@@ -0,0 +1 @@
+soc-qcom-sdm845-nonfree-firmware.post-install
@@ -0,0 +1,3 @@
+# https://source.puri.sm/Librem5/librem5-base/-/commit/11cf55f56593aee5ac2aca7adfbd650d09993e2f
+# enables xwayland acceleration
+export ETNA_MESA_DEBUG=nir
@@ -3,9 +3,9 @@
 # Co-Maintainer: Bhushan Shah <bshah@kde.org>
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.29
+pkgver=1.30
 pkgrel=0
-_confver=47
+_confver=49
 _purismrel=1
 # <librem5-base ver>.<purism release>
 _purismver=${_confver}pureos$_purismrel
@@ -40,14 +40,16 @@ source="
 	pcscd-librem5.initd
 	uboot-script.cmd
 	xorg.conf
+	70-librem5-xwayland-accel.sh
 	0001-librem5-pm.udev-disable-PM-for-broadmobi-modem.patch
 	0002-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
 "
 subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
 	$pkgname-pulseaudio
 	$pkgname-smartcard
-	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-tinydm
 "
 install="$pkgname.post-install $pkgname.post-upgrade"

@@ -79,6 +81,13 @@ pulseaudio() {
 	cp -r "$builddir"/default/audio/profile-sets "$subpkgdir"/usr/share/pulseaudio/alsa-mixer/
 }

+tinydm() {
+	pkgdesc="Tinydm config for the Librem 5"
+	install_if="$pkgname tinydm"
+	install -Dm755 "$srcdir"/70-librem5-xwayland-accel.sh \
+		"$subpkgdir"/etc/tinydm.d/env-wayland.d/70-librem5-xwayland-accel.sh
+}
+
 smartcard() {
 	pkgdesc="OpenPGP SmartCard support for the Librem 5"
 	depends="$pkgname ccid gnupg-scdaemon pcsc-lite pcsc-tools"
@@ -135,7 +144,7 @@ nonfree_firmware() {
 }

 sha512sums="
-e4729fbf111e691179d1aa11970c486315b88563782b46fddcfcb8e4ec02fb9a70a99cd3b74c039f26420d70a79b228f3bd8b0de8f995adfa2e9931e0275cb62  librem5-base-pureos-47pureos1.tar.gz
+eb96cb23f2fe28ef528afe0d267453461611bfe7e8dffaf5afcd2de96f8e3c1f4612c3a9ec43feb50bbec8094ce31b5333ed85f14aaba5461e715024dff9ac9c  librem5-base-pureos-49pureos1.tar.gz
 2e72d9a084ecd6c96cafbbd8fda461ae8b2ebd14ffda601d9f36d73f08f04088213de17da078293ddd958d4c76d33148c7af6e252eb0709f6934855a55578509  00-mesa.sh
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6  77-mm-broadmobi-port-types.rules
@@ -148,6 +157,7 @@ a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f
 2618b40eebd3602066ee75ab85cbdbb4cfee498def9879c95a304f05a6eeedf1ab28c5dd9fa5efc8f88c790f49c96458c61d5dfe8a3ca0f96bcc0e244313ab01  pcscd-librem5.initd
 5da1e39c36d8d83d159f8f9aa0b77c3de98b5d65054d0c3d376d64d87ef1e21b7570e0039e761b015917d4808e896e102d432dc8229e6189e80104dbd148ae4b  uboot-script.cmd
 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616  xorg.conf
+fad386071fc45f9880a94cc8004fabd5d98b3e6a12606c98d8e72e0208f22ab54f03b921f5967a959782507e2bff67d2fa92e46d8cd242011a3afcdbda529279  70-librem5-xwayland-accel.sh
 f535b43b8defe75e72049e4eee181bfe821f6304a096413bccf6d08c8bb11b947fa1fee305af85616abd778745fadd52ebd610c2d135a4f907915b99ab2c526a  0001-librem5-pm.udev-disable-PM-for-broadmobi-modem.patch
 b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378  0002-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
 "
@@ -1,4 +1,4 @@
-From faf5874c12ec57232e5389691d12db1a945629bb Mon Sep 17 00:00:00 2001
+From 7e0f3a31e1071b2c6e14cffd503e8d16a4d6d5d1 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 41ce680e5f8d..6740e6a97161 100644
+index 8fa5c060a4fe..a4b389fc8f14 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.31.1
+2.35.1

@@ -1,4 +1,4 @@
-From c0e6e18c3d4acc79f34af16d76e8af39c275f5bb Mon Sep 17 00:00:00 2001
+From 9f489e765e4fc442822f9504582bb63c4610edc3 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,7 +10,7 @@ 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 6740e6a97161..bd9d8fa9738f 100644
+index a4b389fc8f14..7990e59067ca 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.1.dtb
@@ -57,5 +57,5 @@ index 000000000000..1e287f2fb9f3
 +	};
 +};
 -- 
-2.31.1
+2.35.1

@@ -1,4 +1,4 @@
-From a76ae09d570406690bde1436aa910e76ae179716 Mon Sep 17 00:00:00 2001
+From 10ade7effd6cc0462d59b1bc49258133324fb9c9 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,10 +13,10 @@ 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 91d27bc93a3e..c33c5690a87b 100644
+index 5d8081a093b6..26ca14a66462 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 {
+@@ -237,7 +237,15 @@ &i2c0_pins {
 &i2c1 {
 	status = "okay";
 
@@ -33,7 +33,7 @@ index 91d27bc93a3e..c33c5690a87b 100644
 };
 
 &lradc {
-@@ -291,6 +299,10 @@ &ohci0 {
+@@ -303,6 +311,10 @@ &ohci0 {
 	status = "okay";
 };
 
@@ -45,5 +45,5 @@ index 91d27bc93a3e..c33c5690a87b 100644
 	status = "okay";
 };
 -- 
-2.31.1
+2.35.1

@@ -1,4 +1,4 @@
-From bf487dec17b09c377e8661c18af8b1b746e02142 Mon Sep 17 00:00:00 2001
+From a3921e9d5f47eeb3b355d9948a8beb3031eb41f9 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,10 +8,10 @@ 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 c33c5690a87b..ac66fd12f59f 100644
+index 26ca14a66462..ffb36f69f517 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 {
+@@ -514,6 +514,19 @@ &uart0 {
 	status = "okay";
 };
 
@@ -32,5 +32,5 @@ index c33c5690a87b..ac66fd12f59f 100644
 	dr_mode = "otg";
 	status = "okay";
 -- 
-2.31.1
+2.35.1

@@ -1,4 +1,4 @@
-From 77f6107336aa2171c4b3086f8a98af42b93f65f5 Mon Sep 17 00:00:00 2001
+From 74932da126383a356db3eb7a864ca68e3e23e141 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,10 +8,10 @@ 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 ac66fd12f59f..1923c6d0debe 100644
+index ffb36f69f517..faa0eb2e5718 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 {
+@@ -487,19 +487,20 @@ hdmi_out_con: endpoint {
 
 &sound {
 	status = "okay";
@@ -38,5 +38,5 @@ index ac66fd12f59f..1923c6d0debe 100644
 			"ADCR", "Right ADC",
 			"Internal Microphone Left", "MBIAS",
 -- 
-2.31.1
+2.35.1

@@ -1,4 +1,4 @@
-From 1879de83c95ba0e133b2ed8c945fe1be3b46f8f1 Mon Sep 17 00:00:00 2001
+From 73ec00a74b44f860457e263afef8e983fb6220ed 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
@@ -11,10 +11,10 @@ Subject: [PATCH] dts: pinephone: drop modem-power node
 4 files changed, 24 insertions(+), 68 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 a21c6d78a0ef..7f0cfdafed15 100644
+index 864f887e1362..23223541dd03 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
-@@ -86,28 +86,6 @@ &reg_drivevbus {
+@@ -87,28 +87,6 @@ &reg_drivevbus {
 	status = "okay";
 };
 
@@ -43,7 +43,7 @@ index a21c6d78a0ef..7f0cfdafed15 100644
 &usbphy {
 	usb-role-switch;
 
-@@ -118,6 +96,10 @@ usb0_drd_sw: endpoint {
+@@ -119,6 +97,10 @@ usb0_drd_sw: endpoint {
 	};
 };
 
@@ -55,10 +55,10 @@ index a21c6d78a0ef..7f0cfdafed15 100644
 	enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
 	flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
 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 d67f31ef529e..e7b636299d15 100644
+index 053e4add9973..853a8f55348e 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
-@@ -114,29 +114,6 @@ &sgm3140 {
+@@ -101,29 +101,6 @@ &sgm3140 {
 	flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
 };
 
@@ -88,19 +88,22 @@ index d67f31ef529e..e7b636299d15 100644
 &usbphy {
 	usb-role-switch;
 
-@@ -146,3 +123,7 @@ usb0_drd_sw: endpoint {
- 		};
+@@ -134,6 +111,10 @@ usb0_drd_sw: endpoint {
 	};
 };
-+
+ 
 +&ring_indicator {
 +	gpios = <&pio 1 2 GPIO_ACTIVE_LOW>; /* PB2 */
 +};
+
+ &hdmi {
+ 	extcon = <&anx7688 0>;
+ };
 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 9b33186c7e7d..44b3d6555ff7 100644
+index ec4927dfe9dc..9ddd042b7799 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
-@@ -107,29 +107,6 @@ &sgm3140 {
+@@ -93,29 +93,6 @@ &sgm3140 {
 	flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
 };
 
@@ -130,19 +133,22 @@ index 9b33186c7e7d..44b3d6555ff7 100644
 &usbphy {
 	usb-role-switch;
 
-@@ -139,3 +116,7 @@ usb0_drd_sw: endpoint {
- 		};
+@@ -126,6 +103,10 @@ usb0_drd_sw: endpoint {
 	};
 };
-+
+ 
 +&ring_indicator {
 +	gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
 +};
+
+ &hdmi {
+ 	extcon = <&anx7688 0>;
+ };
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index d3d4f1a53c8d..3cf2f3e6a41a 100644
+index 4e88bcbcc968..c07e89d4a90b 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -192,6 +192,17 @@ ec25_codec: ec25-codec {
+@@ -310,6 +310,17 @@ ec25_codec: ec25-codec {
 		sound-name-prefix = "Modem";
 	};
 
@@ -160,7 +166,7 @@ index d3d4f1a53c8d..3cf2f3e6a41a 100644
 	i2c_csi: i2c-csi {
 		compatible = "i2c-gpio";
 		sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PE13 */
-@@ -264,6 +275,7 @@ reg_usb_5v: usb-5v {
+@@ -382,6 +393,7 @@ reg_usb_5v: usb-5v {
 	reg_vbat_bb: vbat-bb {
 		compatible = "regulator-fixed";
 		regulator-name = "vbat-bb";
@@ -169,5 +175,5 @@ index d3d4f1a53c8d..3cf2f3e6a41a 100644
 		regulator-max-microvolt = <3500000>;
 		gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
 -- 
-2.31.1
+2.35.1

@@ -1,409 +0,0 @@
-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
-
-The autofocus functionality needs a firmware blob loaded into the
-internal microcontroller.
-
-V4L2 doesn't have an api to control all autofocus functionality, but
-this at least makes it possible to focus on the center of the sensor.
-
-Signed-off-by: Martijn Braam <martijn@brixit.nl>
---
- drivers/media/i2c/ov5640.c | 273 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 273 insertions(+)
-
-diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
-index 7764e755bd05..65ab69f6b71a 100644
--- a/drivers/media/i2c/ov5640.c
-+++ b/drivers/media/i2c/ov5640.c
-@@ -9,6 +9,7 @@
- #include <linux/clkdev.h>
- #include <linux/ctype.h>
- #include <linux/delay.h>
-+#include <linux/firmware.h>
- #include <linux/device.h>
- #include <linux/gpio/consumer.h>
- #include <linux/i2c.h>
-@@ -31,7 +32,11 @@
- 
- #define OV5640_DEFAULT_SLAVE_ID 0x3c
- 
-+#define OV5640_REG_SYS_RESET00		0x3000
-+#define OV5640_REG_SYS_RESET01		0x3001
- #define OV5640_REG_SYS_RESET02		0x3002
-+#define OV5640_REG_SYS_CLOCK_ENABLE00	0x3004
-+#define OV5640_REG_SYS_CLOCK_ENABLE01	0x3005
- #define OV5640_REG_SYS_CLOCK_ENABLE02	0x3006
- #define OV5640_REG_SYS_CTRL0		0x3008
- #define OV5640_REG_SYS_CTRL0_SW_PWDN	0x42
-@@ -41,6 +46,14 @@
- #define OV5640_REG_PAD_OUTPUT_ENABLE01	0x3017
- #define OV5640_REG_PAD_OUTPUT_ENABLE02	0x3018
- #define OV5640_REG_PAD_OUTPUT00		0x3019
-+#define OV5640_REG_FW_CMD_MAIN		0x3022
-+#define OV5640_REG_FW_CMD_ACK		0x3023
-+#define OV5640_REG_FW_CMD_PARA0		0x3024
-+#define OV5640_REG_FW_CMD_PARA1		0x3025
-+#define OV5640_REG_FW_CMD_PARA2		0x3026
-+#define OV5640_REG_FW_CMD_PARA3		0x3027
-+#define OV5640_REG_FW_CMD_PARA4		0x3028
-+#define OV5640_REG_FW_STATUS		0x3029
- #define OV5640_REG_SYSTEM_CONTROL1	0x302e
- #define OV5640_REG_SC_PLL_CTRL0		0x3034
- #define OV5640_REG_SC_PLL_CTRL1		0x3035
-@@ -59,6 +72,7 @@
- #define OV5640_REG_AEC_PK_MANUAL	0x3503
- #define OV5640_REG_AEC_PK_REAL_GAIN	0x350a
- #define OV5640_REG_AEC_PK_VTS		0x350c
-+#define OV5640_REG_VCM_CONTROL4		0x3606
- #define OV5640_REG_TIMING_DVPHO		0x3808
- #define OV5640_REG_TIMING_DVPVO		0x380a
- #define OV5640_REG_TIMING_HTS		0x380c
-@@ -96,6 +110,20 @@
- #define OV5640_REG_SDE_CTRL4		0x5584
- #define OV5640_REG_SDE_CTRL5		0x5585
- #define OV5640_REG_AVG_READOUT		0x56a1
-+#define OV5640_REG_FIRMWARE_BASE	0x8000
-+
-+#define OV5640_FW_STATUS_S_FIRMWARE	0x7f
-+#define OV5640_FW_STATUS_S_STARTUP	0x7e
-+#define OV5640_FW_STATUS_S_IDLE		0x70
-+#define OV5640_FW_STATUS_S_FOCUSING	0x00
-+#define OV5640_FW_STATUS_S_FOCUSED	0x10
-+
-+#define OV5640_FW_CMD_TRIGGER_FOCUS	0x03
-+#define OV5640_FW_CMD_CONTINUOUS_FOCUS	0x04
-+#define OV5640_FW_CMD_GET_FOCUS_RESULT	0x07
-+#define OV5640_FW_CMD_RELEASE_FOCUS	0x08
-+#define OV5640_FW_CMD_ZONE_CONFIG	0x12
-+#define OV5640_FW_CMD_DEFAULT_ZONES	0x80
- 
- enum ov5640_mode_id {
- 	OV5640_MODE_QQVGA_160_120 = 0,
-@@ -220,6 +248,12 @@ struct ov5640_ctrls {
- 		struct v4l2_ctrl *auto_gain;
- 		struct v4l2_ctrl *gain;
- 	};
-+	struct {
-+		struct v4l2_ctrl *focus_auto;
-+		struct v4l2_ctrl *af_start;
-+		struct v4l2_ctrl *af_stop;
-+		struct v4l2_ctrl *af_status;
-+	};
- 	struct v4l2_ctrl *brightness;
- 	struct v4l2_ctrl *light_freq;
- 	struct v4l2_ctrl *saturation;
-@@ -263,6 +297,8 @@ struct ov5640_dev {
- 
- 	bool pending_mode_change;
- 	bool streaming;
-+
-+	bool af_initialized;
- };
- 
- static inline struct ov5640_dev *to_ov5640_dev(struct v4l2_subdev *sd)
-@@ -1927,6 +1963,118 @@ static void ov5640_reset(struct ov5640_dev *sensor)
- 	usleep_range(20000, 25000);
- }
- 
-+static int ov5640_copy_fw_to_device(struct ov5640_dev *sensor,
-+					const struct firmware *fw)
-+{
-+	struct i2c_client *client = sensor->i2c_client;
-+	const u8 *data = (const u8 *)fw->data;
-+	u8 fw_status;
-+	int i;
-+	int ret;
-+
-+	// Putting MCU in reset state
-+	ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x20);
-+	if (ret)
-+		return ret;
-+
-+	// Write firmware
-+	for (i = 0; i < fw->size / sizeof(u8); i++)
-+		ov5640_write_reg(sensor,
-+				OV5640_REG_FIRMWARE_BASE + i, 
-+				data[i]);
-+
-+	// Reset MCU state
-+	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_MAIN, 0x00);
-+	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_ACK, 0x00);
-+	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA0, 0x00);
-+	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA1, 0x00);
-+	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA2, 0x00);
-+	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA3, 0x00);
-+	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA4, 0x00);
-+	ov5640_write_reg(sensor, OV5640_REG_FW_STATUS, 0x7f);
-+
-+	// Start AF MCU
-+	ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x00);
-+	if (ret)
-+		return ret;
-+
-+	dev_info(&client->dev, "firmware upload success\n");
-+
-+	// Wait for firmware to be ready
-+	for (i = 0; i < 5; i++) {
-+		ret = ov5640_read_reg(sensor, OV5640_REG_FW_STATUS, &fw_status);
-+		if (fw_status == OV5640_FW_STATUS_S_IDLE) {
-+			dev_info(&client->dev, "fw started after %d ms\n", i * 50);
-+			return ret;
-+		}
-+		msleep(50);
-+	}
-+	dev_err(&client->dev, "uploaded firmware didn't start, got to 0x%x, retrying...\n", fw_status);
-+
-+	// Putting MCU in reset state
-+	ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x20);
-+	if (ret)
-+		return ret;
-+	// Start AF MCU
-+	ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x00);
-+	if (ret)
-+		return ret;
-+	// Wait for firmware to be ready
-+	for (i = 0; i < 5; i++) {
-+		ret = ov5640_read_reg(sensor, OV5640_REG_FW_STATUS, &fw_status);
-+		if (fw_status == OV5640_FW_STATUS_S_IDLE) {
-+			dev_info(&client->dev, "fw started after %d ms\n", i * 50);
-+			return ret;
-+		}
-+		msleep(50);
-+	}
-+	dev_err(&client->dev, "uploaded firmware didn't start, got to 0x%x\n", fw_status);
-+	return -ETIMEDOUT;
-+}
-+
-+static int ov5640_af_init(struct ov5640_dev *sensor)
-+{
-+	struct i2c_client *client = sensor->i2c_client;
-+	const char* fwname = "ov5640_af.bin";
-+	const struct firmware *fw;
-+	int ret;
-+
-+	if (sensor->af_initialized) {
-+		return 0;
-+	}
-+
-+	if (firmware_request_nowarn(&fw, fwname, &client->dev) == 0) {
-+		ret = ov5640_copy_fw_to_device(sensor, fw);
-+		if (ret == 0)
-+			sensor->af_initialized = 1;
-+	} else {
-+		dev_warn(&client->dev, "%s: no autofocus firmware available (%s)\n",
-+			__func__, fwname);
-+		ret = -1;
-+	}
-+	release_firmware(fw);
-+
-+	if (ret)
-+		return ret;
-+
-+	// Enable AF systems
-+	ret = ov5640_mod_reg(sensor, OV5640_REG_SYS_CLOCK_ENABLE00,
-+			     (BIT(6) | BIT(5)), (BIT(6) | BIT(5)));
-+	if (ret)
-+		return ret;
-+	ret = ov5640_mod_reg(sensor, OV5640_REG_SYS_CLOCK_ENABLE01,
-+			     BIT(6), BIT(6));
-+	if (ret)
-+		return ret;
-+
-+	// Set lens focus driver on
-+	ov5640_write_reg(sensor, OV5640_REG_VCM_CONTROL4, 0x3f);
-+	if (ret)
-+		return ret;
-+
-+	return ret;
-+}
-+
- static int ov5640_set_power_on(struct ov5640_dev *sensor)
- {
- 	struct i2c_client *client = sensor->i2c_client;
-@@ -1948,6 +2096,8 @@ static int ov5640_set_power_on(struct ov5640_dev *sensor)
- 		goto xclk_off;
- 	}
- 
-+	sensor->af_initialized = 0;
-+
- 	ov5640_reset(sensor);
- 	ov5640_power(sensor, true);
- 
-@@ -2463,6 +2613,35 @@ static int ov5640_set_framefmt(struct ov5640_dev *sensor,
- 			      is_jpeg ? (BIT(5) | BIT(3)) : 0);
- }
- 
-+static int ov5640_fw_command(struct ov5640_dev *sensor, int command)
-+{
-+	u8 fw_ack;
-+	int i;
-+	int ret;
-+
-+	ret = ov5640_write_reg(sensor, OV5640_REG_FW_CMD_ACK, 0x01);
-+	if(ret)
-+		return ret;
-+	
-+	ret = ov5640_write_reg(sensor, OV5640_REG_FW_CMD_MAIN, command);
-+	if(ret)
-+		return ret;
-+
-+	for (i = 0; i < 100; i++) {
-+		ret = ov5640_read_reg(sensor, OV5640_REG_FW_CMD_ACK, &fw_ack);
-+		if (ret)
-+			return ret;
-+
-+		if (fw_ack == 0){
-+			return ret;
-+		}
-+
-+		msleep(50);
-+	}
-+	return -ETIMEDOUT;
-+}
-+
-+
- /*
-  * Sensor Controls.
-  */
-@@ -2579,6 +2758,41 @@ static int ov5640_set_ctrl_exposure(struct ov5640_dev *sensor,
- 	return ret;
- }
- 
-+static int ov5640_set_ctrl_focus(struct ov5640_dev *sensor, int command)
-+{
-+	struct i2c_client *client = sensor->i2c_client;
-+	int ret;
-+
-+	ret = ov5640_af_init(sensor);
-+	if (ret) {
-+		dev_err(&client->dev, "%s: no autofocus firmware loaded\n",
-+			__func__);
-+		return 0;
-+	}
-+
-+	if (command == OV5640_FW_CMD_RELEASE_FOCUS) {
-+		dev_dbg(&client->dev, "%s: Releasing autofocus\n",
-+			__func__);
-+		return ov5640_fw_command(sensor, OV5640_FW_CMD_RELEASE_FOCUS);
-+	}
-+	
-+	// Restart zone config
-+	ret = ov5640_fw_command(sensor, OV5640_FW_CMD_ZONE_CONFIG);
-+	if (ret)
-+		return ret;
-+
-+	// Set default focus zones
-+	ret = ov5640_fw_command(sensor, OV5640_FW_CMD_DEFAULT_ZONES);
-+	if (ret)
-+		return ret;
-+
-+	dev_dbg(&client->dev, "%s: Triggering autofocus\n",
-+		__func__);
-+
-+	// Start focussing
-+	return ov5640_fw_command(sensor, command);
-+}
-+
- static int ov5640_set_ctrl_gain(struct ov5640_dev *sensor, bool auto_gain)
- {
- 	struct ov5640_ctrls *ctrls = &sensor->ctrls;
-@@ -2685,6 +2899,32 @@ static int ov5640_set_ctrl_vflip(struct ov5640_dev *sensor, int value)
- 			      (BIT(2) | BIT(1)) : 0);
- }
- 
-+static int ov5640_get_af_status(struct ov5640_dev *sensor)
-+{
-+	u8 fw_status;
-+	int ret;
-+
-+	ret = ov5640_read_reg(sensor, OV5640_REG_FW_STATUS, &fw_status);
-+	if (ret)
-+		return ret;
-+
-+	switch (fw_status) {
-+		case OV5640_FW_STATUS_S_FIRMWARE:
-+		case OV5640_FW_STATUS_S_STARTUP:
-+			return V4L2_AUTO_FOCUS_STATUS_FAILED;
-+			break;
-+		case OV5640_FW_STATUS_S_IDLE:
-+			return V4L2_AUTO_FOCUS_STATUS_IDLE;
-+			break;
-+		case OV5640_FW_STATUS_S_FOCUSED:
-+			return V4L2_AUTO_FOCUS_STATUS_REACHED;
-+			break;
-+		default:
-+			return V4L2_AUTO_FOCUS_STATUS_BUSY;
-+			break;
-+	}
-+}
-+
- static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
- {
- 	struct v4l2_subdev *sd = ctrl_to_sd(ctrl);
-@@ -2706,6 +2946,12 @@ static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
- 			return val;
- 		sensor->ctrls.exposure->val = val;
- 		break;
-+	case V4L2_CID_FOCUS_AUTO:
-+		val = ov5640_get_af_status(sensor);
-+		if (val < 0)
-+			return val;
-+		sensor->ctrls.af_status->val = val;
-+		break;
- 	}
- 
- 	return 0;
-@@ -2737,6 +2983,18 @@ static int ov5640_s_ctrl(struct v4l2_ctrl *ctrl)
- 	case V4L2_CID_AUTO_WHITE_BALANCE:
- 		ret = ov5640_set_ctrl_white_balance(sensor, ctrl->val);
- 		break;
-+	case V4L2_CID_FOCUS_AUTO:
-+		if (ctrl->val)
-+			ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_CONTINUOUS_FOCUS);
-+		else
-+			ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_RELEASE_FOCUS);
-+		break;
-+	case V4L2_CID_AUTO_FOCUS_START:
-+		ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_TRIGGER_FOCUS);
-+		break;
-+	case V4L2_CID_AUTO_FOCUS_STOP:
-+		ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_RELEASE_FOCUS);
-+		break;
- 	case V4L2_CID_HUE:
- 		ret = ov5640_set_ctrl_hue(sensor, ctrl->val);
- 		break;
-@@ -2809,6 +3067,20 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
- 	ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAIN,
- 					0, 1023, 1, 0);
- 
-+	/* Autofocus */
-+	ctrls->focus_auto = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FOCUS_AUTO,
-+					    0, 1, 1, 0);
-+	ctrls->af_start = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_AUTO_FOCUS_START,
-+					    0, 1, 1, 0);
-+	ctrls->af_stop = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_AUTO_FOCUS_STOP,
-+					   0, 1, 1, 0);
-+	ctrls->af_status = v4l2_ctrl_new_std(hdl, ops,
-+					     V4L2_CID_AUTO_FOCUS_STATUS, 0,
-+					     (V4L2_AUTO_FOCUS_STATUS_BUSY |
-+					      V4L2_AUTO_FOCUS_STATUS_REACHED |
-+					      V4L2_AUTO_FOCUS_STATUS_FAILED),
-+					     0, V4L2_AUTO_FOCUS_STATUS_IDLE);
-+
- 	ctrls->saturation = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SATURATION,
- 					      0, 255, 1, 64);
- 	ctrls->hue = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_HUE,
-@@ -2842,6 +3114,7 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
- 	v4l2_ctrl_auto_cluster(3, &ctrls->auto_wb, 0, false);
- 	v4l2_ctrl_auto_cluster(2, &ctrls->auto_gain, 0, true);
- 	v4l2_ctrl_auto_cluster(2, &ctrls->auto_exp, 1, true);
-+	v4l2_ctrl_cluster(4, &ctrls->focus_auto);
- 
- 	sensor->sd.ctrl_handler = hdl;
- 	return 0;
-- 
-2.31.1
-
@@ -1,4 +1,4 @@
-From 49edde139be2fee279e4b1f3eeba67912d551601 Mon Sep 17 00:00:00 2001
+From a709b4f0b89f8745e4fb097e4588f15c1dab67fa 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 4e2dad314c79..cd507bf895f5 100644
+index 3c08f9827acf..95ffc2a7c57e 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2179,6 +2179,30 @@ static const struct panel_desc hannstar_hsd100pxn1 = {
+@@ -1928,6 +1928,30 @@ static const struct panel_desc hannstar_hsd100pxn1 = {
 	.connector_type = DRM_MODE_CONNECTOR_LVDS,
 };
 
@@ -42,7 +42,7 @@ index 4e2dad314c79..cd507bf895f5 100644
 static const struct drm_display_mode hitachi_tx23d38vm0caa_mode = {
 	.clock = 33333,
 	.hdisplay = 800,
-@@ -4265,6 +4289,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -3806,6 +3830,9 @@ static const struct of_device_id platform_of_match[] = {
 	}, {
 		.compatible = "hit,tx23d38vm0caa",
 		.data = &hitachi_tx23d38vm0caa
@@ -53,5 +53,5 @@ index 4e2dad314c79..cd507bf895f5 100644
 		.compatible = "innolux,at043tn24",
 		.data = &innolux_at043tn24,
 -- 
-2.31.1
+2.35.1

@@ -1,4 +1,4 @@
-From cd06dec28f2c6a61cb3c2ef00c2a68efe4c26db6 Mon Sep 17 00:00:00 2001
+From 723b6344c456548b18920ad0acf08953933ffc3a 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 127a10cb590d..ba31b42f1e18 100644
+index 3fc5032a18b4..4dc23b505f06 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1136,6 +1136,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
+@@ -1218,6 +1218,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.1
+2.35.1

@@ -1,4 +1,4 @@
-From 8e2f5f4d514b94cfac85f3dce3d39e042b3ade69 Mon Sep 17 00:00:00 2001
+From dab9ccdbf81b008f091add185508f81bde46d4b3 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 cd507bf895f5..ac8cfb3ce163 100644
+index 95ffc2a7c57e..1a1bdd343bfb 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2124,6 +2124,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
+@@ -1873,6 +1873,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 cd507bf895f5..ac8cfb3ce163 100644
 static const struct display_timing hannstar_hsd070pww1_timing = {
 	.pixelclock = { 64300000, 71100000, 82000000 },
 	.hactive = { 1280, 1280, 1280 },
-@@ -4280,6 +4304,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -3821,6 +3845,9 @@ static const struct of_device_id platform_of_match[] = {
 	}, {
 		.compatible = "giantplus,gpm940b0",
 		.data = &giantplus_gpm940b0,
@@ -53,5 +53,5 @@ index cd507bf895f5..ac8cfb3ce163 100644
 		.compatible = "hannstar,hsd070pww1",
 		.data = &hannstar_hsd070pww1,
 -- 
-2.31.1
+2.35.1

@@ -1,4 +1,4 @@
-From e9ac5ae02481dfe87335d9f2033785f0263c820d Mon Sep 17 00:00:00 2001
+From 6131f16f167be12ecda507d1ea24301346355e77 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 ba31b42f1e18..f5df06c4d564 100644
+index 4dc23b505f06..2a01d5e8c650 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1098,6 +1098,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
+@@ -1179,6 +1179,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.1
+2.35.1

@@ -1,4 +1,4 @@
-From 3453110622f9f5ab3a602bd5e126f4a598d9b7c4 Mon Sep 17 00:00:00 2001
+From df584b45ea726f86b6d7696fc6cd0e0b4ef67301 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Sat, 24 Aug 2019 01:36:44 +0200
 Subject: [PATCH] eMMC workaround
@@ -34,5 +34,5 @@ index 55ca34803a3f..962c948fef17 100644
 
 	ret = mmc_of_parse(mmc);
 -- 
-2.33.0
+2.35.1

@@ -1,4 +1,4 @@
-From a337472571ea8d154e22325a2c06a8b982716fb0 Mon Sep 17 00:00:00 2001
+From e5afc97afebf2982c740dc691e801ed3b9e5e382 Mon Sep 17 00:00:00 2001
 From: Maxim Karasev <begs@disroot.org>
 Date: Sat, 4 Sep 2021 14:56:01 +0300
 Subject: [PATCH] arm64: dts: allwinner: orangepi-3: fix ethernet
@@ -10,10 +10,10 @@ patch from LibreELEC tree.
 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-index adf2134ec1a4..82740a8aef9b 100644
+index 5780ae248964..14a0394a4823 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-@@ -141,7 +141,7 @@ hdmi_out_con: endpoint {
+@@ -145,7 +145,7 @@ hdmi_out_con: endpoint {
 &emac {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ext_rgmii_pins>;
@@ -22,7 +22,7 @@ index adf2134ec1a4..82740a8aef9b 100644
 	phy-handle = <&ext_rgmii_phy>;
 	/*
 	 * The board uses 2.5V RGMII signalling. Power sequence to enable
-@@ -151,8 +151,8 @@ &emac {
+@@ -155,8 +155,8 @@ &emac {
 	 */
 	phy-supply = <&reg_aldo2>;
 	phy-io-supply = <&reg_gmac_2v5>;
@@ -34,5 +34,5 @@ index adf2134ec1a4..82740a8aef9b 100644
 };
 
 -- 
-2.33.0
+2.35.1

@@ -6,9 +6,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=5.16.4_git20220131
+pkgver=5.17.0_git20220313
 pkgrel=2
-_tag="orange-pi-5.16-20220131-0002"
+_tag="orange-pi-5.17-20220313-2345"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -43,14 +43,13 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
 	0003-dts-pinetab-add-missing-bma223-ohci1.patch
 	0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
 	0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
-	0006-media-ov5640-Implement-autofocus.patch
-	0007-dts-pinephone-drop-modem-power-node.patch
-	0008-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
-	0009-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
-	0010-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
-	0011-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
-	0012-sunxi-mmc-h6-fix.patch
-	0013-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+	0006-dts-pinephone-drop-modem-power-node.patch
+	0007-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+	0008-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+	0009-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+	0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+	0011-eMMC-workaround.patch
+	0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
 	"
 subpackages="$pkgname-dev"
 builddir="$srcdir/linux-$_tag"
@@ -98,20 +97,19 @@ dev() {
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }
 sha512sums="
-7ed825eb7311838cd14661192e80149c0a1cd24541eb50808c7261ecb866cf39028c3c7dda0410aeb913670aac63af23d764f98af9e563bf5165cac7f0e51026  linux-postmarketos-allwinner-orange-pi-5.16-20220131-0002.tar.gz
-73d1adb55c51bc96b411db7573da39b2f69f274982037b2eee05022664802bdc44fd5740377114fe0b735e723fe4eda20b3845c0118ac072e0bb7a0e66e5e1c7  config-postmarketos-allwinner.aarch64
+b24b34e9a8ef66d37891c1d21eb71f9de83e0fde167ac08d776ac3e7b6262e9911908b453b598eb2e01658ec141d4d08337e4cc20f77af298e639ef9119edb61  linux-postmarketos-allwinner-orange-pi-5.17-20220313-2345.tar.gz
+ee1c627c21dd79e502bc3117c4121bd208591dc3167d8113bd6de94dc03ea39dfa3c331e2219ae7e791e3914cda89d205898137ae6fa3ea85dfdf0cc961784cb  config-postmarketos-allwinner.aarch64
 18738214275280f45375de9ccff83df7c9f37eb66dfd0834780e6b155d95a7d39c55f00fd66be4dde4a8b85accd285b6ef10285b41f75618ad7f44ddcdd0b9a9  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
-5e0566074fcb18b95c8ea079178f5d6716eb1ea325a25176e67f80eff1e5b10f90e282c8059a0a3315606546c61f05bd9ebad06adb67086cd123f0276cccbdc8  0006-media-ov5640-Implement-autofocus.patch
-62809ac84db9d684b02d56dfc543451a1a13f319287466cfe913a847b945584ec60f7f556b1259ad3e26a44259a3fe587eeabeef6333f73a77204c3d3573f2ab  0007-dts-pinephone-drop-modem-power-node.patch
-c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e9b07db67019104d98933e31457891a5ce1e6010e06232875  0008-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
-7f57e4ebc0b0cebb624f340c568f22e93116f2753b634d9bc75eea1a1bc013b8f9375e1efd24a20bff79c3725166df210a3a30bb7643a4525e3d40b63b91c536  0009-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
-71fad7ecff66a2cb692f3dd3d02301c4b419873f27693de81f50226b8ab93c229299e7dc663fdd07a7e8f03a6541527f3bb449626f865fcfde6a780ef1b91976  0010-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
-902708a5a8dd8a815d3d1793933d307c551e3c10368d1805431b70691ee5d4438b7146c466549f457468e365f94073a35ae3304928af7581e5dc91ba5c8fa682  0011-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
-2feeab0a6c3db46e514d45c9708f351c6d7dfb0bf951a5cb6f2dc01b4bdc8d4c46931000758a819a6d7317b16cb1933bb3946e6a78cbf448cc77f57a56c503bf  0012-sunxi-mmc-h6-fix.patch
-22af33264090dac027ee054b4345a07f0b2ee077e2ae1620e83960bfeea096169aec710973fdd50531ed4f1db6cfd59b5796cd235316cb3512aee034f741a694  0013-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+244d2c1356f5de77a5d05ba16d10e0d19915f634b3b1b96259857b1a3d57a023027a94622ffb56d5c72aeaeb7a9a220d629d51cfbb24225a7eca0140eb1ba19b  0001-dts-add-dontbeevil-pinephone-devkit.patch
+31e2f5e0f590f017a355469609b5fd97fbc18d54c42a98bd44944a91a8e42eade0963def4704bc04d6cc5316a8adfe97b7854a2053fc33847ee797830218e029  0002-dts-add-pinetab-dev-old-display-panel.patch
+8b7f5b3fccc030d3278725131d1af4c13efbc6ba037f3d734ff8bd1bcd5d2f2a2f024d83b90f0f780e9ddbfbdc20c8f5f1541580c5da3fb3cefb7f391c285aaa  0003-dts-pinetab-add-missing-bma223-ohci1.patch
+f5c8e1acd9f3a25915d22d94e380c1e6cde1d7b056d0d7080ae4e012f0eeccbe5d4fb57847049564c7d8eb791e6622619004af25a8f62646403c171d4ed10c82  0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
+f6ec1e0cc5b0a34e5b98535f9ff45dc0b1b6b5ec1f622ef6780cc9fac0db2ada455aae37d731e4ae7d7c51be773e400a8d6215bbcc97f9dd223ae4f2b0c8782e  0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+623a08ef4138b150917edaa76f5d2c1b099acae6dab01bd255f55824d967424537c731cb83fe85597ac46506361b7ed7a68b0d35feb537c25daa6e7e03641b6d  0006-dts-pinephone-drop-modem-power-node.patch
+139c78ffcd66d813f2bd729b7aa81550608f1fc97667dbcd0cb55d00807e69adcbe86e59b637a3dad5336afabbb8e8d7d045955506a4a382d63ddb5caf5f4f01  0007-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+e9897068210edd3295fb813390b263ccc146541f4bc89e66fea4a48ce9114ac0ac0b2ef584943fbc590d111cb6748247c3c3f6f2da122ba6b9bd20e9c3ea45f4  0008-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+7d6a1c7c916f817104f40615be410de9015a1356bd77f087ded5259c80a979d8c4e2baf5f35555eb648f6ab5d43c585c67a2f9a5db10156df4eeb6ea8e762147  0009-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+f1e4658bc699cfb3f0e0eba7833a7e09da266b8817c427de6312c270379d9d8c6cc55d4a270984c5b95cd04cf3be85c36f0d1127abe513698f874b8cde0b1a95  0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+6235d08a6a90ca2234cee4d092a4314cb8efdbe7d68fb9c954abe9a6921c93e160db3f680a408210755ed71c429171919320592ea1f6769f74f55b70b7dbf22e  0011-eMMC-workaround.patch
+9ac8d531fe25365c6d1d1bf2903febc573746abde80b54852f31160a98bd31bb8ac29f6a0b7883706ef0bafbd4e0696a0a9f30bede5b211fae98cd93f453e8a3  0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
 "
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.16.4 Kernel Configuration
+# Linux/arm64 5.17.0-rc8 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 11.2.1_git20220117) 11.2.1 20220117"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=110201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23700
+CONFIG_AS_VERSION=23800
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23700
+CONFIG_LD_VERSION=23800
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -175,6 +175,7 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
 # CONFIG_CGROUP_MISC is not set
+# CONFIG_CGROUP_DEBUG is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_TIME_NS=y
@@ -202,9 +203,10 @@ CONFIG_LD_ORPHAN_WARN=y
 CONFIG_SYSCTL=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-# CONFIG_EXPERT is not set
+CONFIG_EXPERT=y
 CONFIG_UID16=y
 CONFIG_MULTIUSER=y
+# CONFIG_SGETMASK_SYSCALL is not set
 CONFIG_SYSFS_SYSCALL=y
 CONFIG_FHANDLE=y
 CONFIG_POSIX_TIMERS=y
@@ -214,7 +216,6 @@ CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
-CONFIG_HAVE_FUTEX_CMPXCHG=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -225,18 +226,22 @@ CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_KCMP=y
 CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_PC104 is not set

 #
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # end of Kernel Performance Events And Counters

 CONFIG_VM_EVENT_COUNTERS=y
@@ -244,6 +249,7 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
+# CONFIG_SLOB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
@@ -350,6 +356,8 @@ CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_1508412=y
+CONFIG_ARM64_ERRATUM_2051678=y
+# CONFIG_ARM64_ERRATUM_2077057 is not set
 CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
 CONFIG_ARM64_ERRATUM_2054223=y
 CONFIG_ARM64_ERRATUM_2067961=y
@@ -392,7 +400,6 @@ CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 # CONFIG_PARAVIRT is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -402,6 +409,7 @@ CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -423,6 +431,8 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y
 #
 # ARMv8.2 architectural features
 #
+CONFIG_AS_HAS_ARMV8_2=y
+CONFIG_AS_HAS_SHA3=y
 # CONFIG_ARM64_PMEM is not set
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_CNP=y
@@ -491,6 +501,7 @@ CONFIG_SYSVIPC_COMPAT=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
 CONFIG_HIBERNATE_CALLBACKS=y
 CONFIG_HIBERNATION=y
 CONFIG_HIBERNATION_SNAPSHOT_DEV=y
@@ -660,6 +671,7 @@ CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -706,8 +718,10 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 CONFIG_MODULE_COMPRESS_XZ=y
 # CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_DECOMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG_COMMON=y
@@ -800,15 +814,16 @@ CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
+# CONFIG_HWPOISON_INJECT is not set
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
 CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_SYSFS is not set
 CONFIG_CMA_AREAS=7
+# CONFIG_ZSWAP is not set
 # CONFIG_ZPOOL is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSMALLOC_STAT=y
@@ -817,6 +832,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ARCH_HAS_ZONE_DMA_SET=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
@@ -825,6 +841,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_SECRETMEM=y
+# CONFIG_ANON_VMA_NAME is not set

 #
 # Data Access Monitoring
@@ -982,7 +999,6 @@ CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -1093,7 +1109,7 @@ CONFIG_NETFILTER_XT_MATCH_SOCKET=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
 CONFIG_NETFILTER_XT_MATCH_STRING=y
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
 CONFIG_NETFILTER_XT_MATCH_TIME=y
 CONFIG_NETFILTER_XT_MATCH_U32=y
 # end of Core Netfilter Configuration
@@ -1327,6 +1343,7 @@ CONFIG_BT_LEDS=y
 # CONFIG_BT_MSFTEXT is not set
 # CONFIG_BT_AOSPEXT is not set
 # CONFIG_BT_DEBUGFS is not set
+# CONFIG_BT_SELFTEST is not set
 # CONFIG_BT_FEATURE_DEBUG is not set

 #
@@ -1377,6 +1394,7 @@ CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=y
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
 CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
@@ -1427,6 +1445,7 @@ CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_DEVTMPFS_SAFE is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y

@@ -1443,6 +1462,9 @@ CONFIG_FW_CACHE=y
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
@@ -1481,6 +1503,7 @@ CONFIG_SUNXI_RSB=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_ARM_SCPI_POWER_DOMAIN=y
 # CONFIG_ARM_SDE_INTERFACE is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
 # CONFIG_ARM_FFA_TRANSPORT is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_ARM_PSCI_FW=y
@@ -1707,6 +1730,8 @@ CONFIG_SUN4I_EMAC=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 # CONFIG_NET_VENDOR_CORTINA is not set
 # CONFIG_DNET is not set
+CONFIG_NET_VENDOR_ENGLEDER=y
+# CONFIG_TSNEP is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_GOOGLE is not set
 # CONFIG_NET_VENDOR_HISILICON is not set
@@ -1745,6 +1770,7 @@ CONFIG_DWMAC_SUNXI=y
 CONFIG_DWMAC_SUN8I=y
 # CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
+CONFIG_NET_VENDOR_VERTEXCOM=y
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
@@ -2217,6 +2243,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+# CONFIG_TTY_PRINTK is not set
 # CONFIG_VIRTIO_CONSOLE is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
@@ -2341,13 +2368,14 @@ CONFIG_PINMUX=y
 CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
-CONFIG_PINCTRL_SINGLE=y
-# CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_STMFX is not set
-# CONFIG_PINCTRL_OCELOT is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
+# CONFIG_PINCTRL_OCELOT is not set
+CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_STMFX is not set
+# CONFIG_PINCTRL_SX150X is not set

 #
 # Renesas pinctrl drivers
@@ -2382,6 +2410,8 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
 CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=y
@@ -2438,6 +2468,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
 #
 # CONFIG_GPIO_AGGREGATOR is not set
 # CONFIG_GPIO_MOCKUP is not set
+# CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers

 # CONFIG_W1 is not set
@@ -2459,7 +2490,7 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
-# CONFIG_IP5XXX_POWER is not set
+CONFIG_IP5XXX_POWER=y
 # CONFIG_TEST_POWER is not set
 # CONFIG_CHARGER_ADP5061 is not set
 # CONFIG_BATTERY_CW2015 is not set
@@ -2485,6 +2516,7 @@ CONFIG_AXP20X_POWER=y
 # CONFIG_CHARGER_LT3651 is not set
 # CONFIG_CHARGER_LTC4162L is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+# CONFIG_CHARGER_MAX77976 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
@@ -2598,6 +2630,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
 # CONFIG_SENSORS_NZXT_KRAKEN2 is not set
+# CONFIG_SENSORS_NZXT_SMART2 is not set
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
@@ -2625,6 +2658,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_AMC6821 is not set
 # CONFIG_SENSORS_INA209 is not set
 # CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
@@ -2803,7 +2837,6 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
 # CONFIG_MFD_STPMIC1 is not set
@@ -2844,6 +2877,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MAX8893 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_MAX20086 is not set
 # CONFIG_REGULATOR_MAX77826 is not set
 # CONFIG_REGULATOR_MCP16502 is not set
 # CONFIG_REGULATOR_MP5416 is not set
@@ -3154,6 +3188,7 @@ CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV5670 is not set
 # CONFIG_VIDEO_OV5675 is not set
+# CONFIG_VIDEO_OV5693 is not set
 # CONFIG_VIDEO_OV5695 is not set
 # CONFIG_VIDEO_OV7251 is not set
 # CONFIG_VIDEO_OV772X is not set
@@ -3224,13 +3259,16 @@ CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DEBUG_MM is not set
+# CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 # CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y

@@ -3255,7 +3293,8 @@ CONFIG_DRM_MALI_DISPLAY=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
+# CONFIG_DRM_RCAR_USE_LVDS is not set
+# CONFIG_DRM_RCAR_MIPI_DSI is not set
 CONFIG_DRM_SUN4I=y
 CONFIG_DRM_SUN4I_HDMI=y
 # CONFIG_DRM_SUN4I_HDMI_CEC is not set
@@ -3271,6 +3310,7 @@ CONFIG_DRM_PANEL=y
 #
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
+# CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 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
@@ -3284,11 +3324,13 @@ 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_JDI_R63452 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
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@@ -3315,6 +3357,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 CONFIG_DRM_PANEL_SITRONIX_ST7703=y
 # CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
+# CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
@@ -3379,6 +3422,7 @@ CONFIG_DRM_PANFROST=y
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+CONFIG_DRM_NOMODESET=y

 #
 # Frame buffer Devices
@@ -3446,6 +3490,7 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@@ -3507,6 +3552,7 @@ CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_ADI is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
+# CONFIG_SND_AMD_ACP_CONFIG is not set
 # CONFIG_SND_ATMEL_SOC is not set
 # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
 # CONFIG_SND_DESIGNWARE_I2S is not set
@@ -3569,6 +3615,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ADAU7118_HW is not set
 # CONFIG_SND_SOC_ADAU7118_I2C is not set
 # CONFIG_SND_SOC_AK4118 is not set
+# CONFIG_SND_SOC_AK4375 is not set
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 CONFIG_SND_SOC_AK4613=m
@@ -3657,6 +3704,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
 # CONFIG_SND_SOC_TFA989X is not set
+# CONFIG_SND_SOC_TLV320ADC3XXX is not set
 # CONFIG_SND_SOC_TLV320AIC23_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC31XX is not set
 # CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
@@ -3770,6 +3818,7 @@ CONFIG_HID_KENSINGTON=y
 # CONFIG_HID_LCPOWER is not set
 # CONFIG_HID_LED is not set
 # CONFIG_HID_LENOVO is not set
+# CONFIG_HID_LETSKETCH is not set
 CONFIG_HID_LOGITECH=y
 CONFIG_HID_LOGITECH_DJ=y
 CONFIG_HID_LOGITECH_HIDPP=y
@@ -4074,6 +4123,7 @@ CONFIG_USB_ULPI_VIEWPORT=y
 # end of USB Physical Layer drivers

 CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
@@ -4297,6 +4347,10 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set
+
+#
+# Simple LED drivers
+#
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
@@ -4531,6 +4585,8 @@ CONFIG_RTL8723BS=m
 # end of IIO staging drivers

 CONFIG_STAGING_MEDIA=y
+# CONFIG_VIDEO_HANTRO is not set
+# CONFIG_VIDEO_MAX96712 is not set
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=y

@@ -4553,6 +4609,7 @@ CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_SURFACE_PLATFORMS=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -4574,6 +4631,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_LAN966X is not set
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=y
@@ -4726,7 +4784,7 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 #
 # DEVFREQ Drivers
 #
-# CONFIG_ARM_SUN8I_MBUS_DEVFREQ is not set
+# CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ is not set
 # CONFIG_PM_DEVFREQ_EVENT is not set
 CONFIG_EXTCON=y

@@ -4822,6 +4880,11 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_XILINX_XADC is not set
 # end of Analog to digital converters

+#
+# Analog to digital and digital to analog converters
+#
+# end of Analog to digital and digital to analog converters
+
 #
 # Analog Front Ends
 #
@@ -4900,6 +4963,11 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # end of IIO dummy driver

+#
+# Filters
+#
+# end of Filters
+
 #
 # Frequency Synthesizers DDS/PLL
 #
@@ -5018,6 +5086,7 @@ CONFIG_STK3310=m
 #
 # Magnetometer sensors
 #
+# CONFIG_AF8133J is not set
 # CONFIG_AK8974 is not set
 # CONFIG_AK8975 is not set
 # CONFIG_AK09911 is not set
@@ -5131,6 +5200,7 @@ CONFIG_IIO_ST_MAGN_I2C_3AXIS=m

 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_DEBUG is not set
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_FSL_FTM is not set
 # CONFIG_PWM_PCA9685 is not set
@@ -5179,8 +5249,10 @@ CONFIG_PHY_SUN50I_USB3=y
 # CONFIG_PHY_CADENCE_SALVO is not set
 # CONFIG_PHY_FSL_IMX8MQ_USB is not set
 # CONFIG_PHY_MIXEL_MIPI_DPHY is not set
+# CONFIG_PHY_FSL_IMX8M_PCIE is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_LAN966X_SERDES is not set
 # CONFIG_PHY_CPCAP_USB is not set
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
@@ -5202,6 +5274,7 @@ CONFIG_PHY_SAMSUNG_USB2=y
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
+# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 # end of Performance monitor support

 CONFIG_RAS=y
@@ -5702,6 +5775,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_KDF800108_CTR=y
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -5710,25 +5784,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
 # CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 # CONFIG_CRYPTO_DEV_SUN4I_SS is not set
@@ -5771,7 +5826,6 @@ CONFIG_HAVE_ARCH_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
 # CONFIG_CORDIC is not set
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_RATIONAL=y
@@ -5780,6 +5834,26 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
@@ -5901,6 +5975,7 @@ CONFIG_PRINTK_TIME=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_DYNAMIC_DEBUG_CORE is not set
 CONFIG_SYMBOLIC_ERRNAME=y
@@ -5910,13 +5985,18 @@ CONFIG_DEBUG_BUGVERBOSE=y
 #
 # Compile-time checks and compiler options
 #
+# CONFIG_DEBUG_INFO is not set
 CONFIG_FRAME_WARN=2048
 # CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
 # CONFIG_HEADERS_INSTALL is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # end of Compile-time checks and compiler options

 #
@@ -5928,29 +6008,50 @@ 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
 # CONFIG_UBSAN is not set
+CONFIG_HAVE_ARCH_KCSAN=y
 CONFIG_HAVE_KCSAN_COMPILER=y
+# CONFIG_KCSAN is not set
 # end of Generic Kernel Debugging Instruments

-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Networking Debugging
+#
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
+# end of Networking Debugging

 #
 # Memory Debugging
 #
 # CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_ARCH_HAS_DEBUG_WX=y
 # CONFIG_DEBUG_WX is not set
 CONFIG_GENERIC_PTDUMP=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_SCHED_STACK_END_CHECK is not set
 CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+# CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_VM_PGTABLE is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
@@ -5963,46 +6064,82 @@ CONFIG_HAVE_ARCH_KFENCE=y
 # CONFIG_KFENCE is not set
 # end of Memory Debugging

+# CONFIG_DEBUG_SHIRQ is not set
+
 #
 # Debug Oops, Lockups and Hangs
 #
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
+# CONFIG_SOFTLOCKUP_DETECTOR is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_WQ_WATCHDOG is not set
 # CONFIG_TEST_LOCKUP is not set
 # end of Debug Oops, Lockups and Hangs

 #
 # Scheduler Debugging
 #
+CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_INFO=y
+# CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging

 # CONFIG_DEBUG_TIMEKEEPING is not set
+CONFIG_DEBUG_PREEMPT=y

 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+# CONFIG_SCF_TORTURE_TEST is not set
+# 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

 #
 # Debug kernel data structures
 #
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # end of Debug kernel data structures

+# CONFIG_DEBUG_CREDENTIALS is not set
+
 #
 # RCU Debugging
 #
+# CONFIG_RCU_SCALE_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=y
+# CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging

+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -6010,6 +6147,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACE_CLOCK=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
@@ -6028,9 +6166,10 @@ CONFIG_STRICT_DEVMEM=y
 # Kernel Testing and Coverage
 #
 # CONFIG_KUNIT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
 CONFIG_ARCH_USE_MEMTEST=y
 # CONFIG_MEMTEST is not set
@@ -1,30 +0,0 @@
-From e2ae58c182d58a52ef77f2e9a5739e5afa5e10c4 Mon Sep 17 00:00:00 2001
-From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
-Date: Mon, 28 Feb 2022 06:01:10 +0100
-Subject: [PATCH] input: keyboard: snvs_pwrkey: Fix SNVS_HPVIDR1 register
- address
-
-Both i.MX6 and i.MX8 reference manuals list 0xBF8 as SNVS_HPVIDR1.
-
-Fixes: 1a26c920717a ("Input: snvs_pwrkey - send key events for i.MX6 S, DL and Q")
-Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
---
- drivers/input/keyboard/snvs_pwrkey.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c
-index 65286762b02a..ad8660be0127 100644
--- a/drivers/input/keyboard/snvs_pwrkey.c
-+++ b/drivers/input/keyboard/snvs_pwrkey.c
-@@ -20,7 +20,7 @@
- #include <linux/mfd/syscon.h>
- #include <linux/regmap.h>
- 
-#define SNVS_HPVIDR1_REG	0xF8
-+#define SNVS_HPVIDR1_REG	0xBF8
- #define SNVS_LPSR_REG		0x4C	/* LP Status Register */
- #define SNVS_LPCR_REG		0x38	/* LP Control Register */
- #define SNVS_HPSR_REG		0x14
-- 
-2.35.1
-
@@ -2,7 +2,7 @@
 # Maintainer:  Clayton Craft <clayton@craftyguy.net>
 # Co-Maintainer: Bhushan Shah <bshah@kde.org>
 pkgname=linux-purism-librem5
-pkgver=5.16.11
+pkgver=5.16.16
 pkgrel=0
 _purismrel=1
 # <kernel ver>.<purism kernel release>
@@ -40,7 +40,6 @@ source="
 	0001-bq25890_charger-enter-ship-mode-on-power-off.patch
 	0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch
 	0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch
-	0004-input-keyboard-snvs_pwrkey-Fix-SNVS_HPVIDR1-register.patch
 	$_config
 "
 builddir="$srcdir/$_repository-pureos-$_purismver"
@@ -80,10 +79,9 @@ dev() {
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }
 sha512sums="
-4f1d8d9cfc151780a2a9bfbc86899aa049a6353fab202cb28f38a720267a88b40ef9a637899fc4f4f26624dd3983e4a5728f50f9915072353be96f04766313a2  linux-purism-librem5-5.16.11pureos1.tar.gz
+0f776cdbdd6529a8618818a19e5817e302d2df70f2fe0ca7971d0daadb47ebd94d3c2394e78d4a5a42bf0c9515f84e991dde4a53bb7a83ac1642a0d26e0d0d5f  linux-purism-librem5-5.16.16pureos1.tar.gz
 0e3caf6275247e31b874b94330dc4f991837a4b62f3c15a1f8ad39a7edd02ae499679bcd7ddc9463bb1c1a5073ea5980fa144a2ece804d72a6b2fc8c76c50766  0001-bq25890_charger-enter-ship-mode-on-power-off.patch
 1dbf2adaf097bcce3ee179cd6b0f10d2ebefdc82191d34fffea8cb336c9dcbc66b717bf97a2e264b8068f178c0254f2b1281a09ae72d4825fd7b4a39916c0461  0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch
 c52f9e7e17f876697000a0c3b959a0d571ca506ba55ee5158e30ac00e148372097c88951a354190f669137a955405c87042a925c1bbe3cd91df40721650d45d3  0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch
-f48c80d81e748499411dbc255229b6957082d251f43c8b4b1996ca56ed141ba968ef17ee731260a5cb3f9e7467ae0b73b40fbf09d8ac462e1db10f4e9f5e1b53  0004-input-keyboard-snvs_pwrkey-Fix-SNVS_HPVIDR1-register.patch
 9f561f74d826bf1cd166f87a22936c744ef9148f3508359d423df75efdf60ec24f18b0938ae3bb16b5aa5eaba4826fcde38b2ad2feae2027378f19e94ff60394  config-purism-librem5.aarch64
 "
@@ -3,7 +3,7 @@
 pkgname=device-alcatel-idol3
 pkgdesc="Alcatel OneTouch Idol 3 (5.5)"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8939
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo rootston.ini"
+source="deviceinfo phoc.ini"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
@@ -35,11 +35,11 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -D -m644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -D -m644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 sha512sums="
 59f4d65c5bb5ef53968bfd1f7d2c0175835badfc15347cedef67b240c6c54baad039beb197d7b6b49cfa379531a00f6a5d3ce615da97c3598e47091b40019c44  deviceinfo
-fbaa0e0ecfc5d6debc345d4a7475687bef4c89c463df382ecb9f5577f3fbf045bbcf1d2cacedf6322b5e81e2ba7503d1bb093ff6d55c209ed79805a49408234c  rootston.ini
+fbaa0e0ecfc5d6debc345d4a7475687bef4c89c463df382ecb9f5577f3fbf045bbcf1d2cacedf6322b5e81e2ba7503d1bb093ff6d55c209ed79805a49408234c  phoc.ini
 "
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-oppo-a51f
-pkgdesc="OPPO Mirror 5s"
-pkgver=3
-pkgrel=1
+pkgname=device-ark-peach
+pkgdesc="ARK Benefit A3"
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -21,14 +21,9 @@ package() {
 }

 nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Video firmware"
-	# msm-firmware-loader not needed because modem is not supported yet
-	depends="firmware-qcom-adreno-a300
-		 firmware-qcom-msm8916-wcnss firmware-oppo-a51f-wcnss-nv
-		 firmware-qcom-msm8916-venus"
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-qcom-msm8916-wcnss firmware-qcom-msm8916-venus firmware-ark-peach-wcnss-nv"
 	mkdir "$subpkgdir"
 }

-sha512sums="
-bcd3115119f4b3bee851315035b0f5f735e62c293d8e9ac22ca5c8012f349e5cb5b055b0d1b6ea0fefaed06a4db10b2b5b61e81a70e83194805a787ce59feee5  deviceinfo
-"
+sha512sums="cc78b3779893a3f851205d448eaf9f76556427c25f0dcf2dadbe1a3706507a77945440c8fa2765819beeb108c02998fb247ec806d4982346d84864dc597f5b68  deviceinfo"
@@ -2,25 +2,24 @@
 # Please use double quotes only. You can source this file in shell scripts.

 deviceinfo_format_version="0"
-deviceinfo_name="OPPO Mirror 5s"
-deviceinfo_manufacturer="OPPO"
-deviceinfo_codename="oppo-a51f"
+deviceinfo_name="ARK Benefit A3"
+deviceinfo_manufacturer="ARK"
+deviceinfo_codename="ark-peach"
 deviceinfo_year="2015"
-deviceinfo_dtb="qcom/msm8916-oppo-a51f"
+deviceinfo_dtb="qcom/msm8916-ark-peach"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="panel-ark-peach-nt35521-dj msm goodix"
 deviceinfo_arch="aarch64"

 # Device related
 deviceinfo_chassis="handset"
+deviceinfo_gpu_accelerated="true"
 deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
 deviceinfo_getty="ttyMSM0;115200"

-# MSM DRM cannot take over the framebuffer from the bootloader at the moment
-deviceinfo_no_framebuffer="true"
-
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
@@ -2,7 +2,7 @@
 pkgname=device-asus-grouper
 pkgdesc="Google Nexus 7 2012 (grouper)"
 pkgver=5
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -15,7 +15,7 @@ subpackages="$pkgname-phosh
 	$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo
 	pointercal
-	rootston.ini"
+	phoc.ini"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -29,8 +29,8 @@ package() {

 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 kernel_e1565() {
@@ -54,5 +54,5 @@ nonfree_firmware() {
 sha512sums="
 ff94b9f679d66d8d3965515a476c588c522c6025c459db8802fe0451441de278da170638f17147b94283d7c35d1a351f9a856eb24437bbb6952d37569b1c7ba1  deviceinfo
 1f9d77df433c7199a9f07d6fd1d90cdf1ab40021bf1970be9400e5f32155d92f7fa338162a0ca95d441d1701eff0f5e0cbb64a0555de48740a62e8ff59fe11e5  pointercal
-6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  rootston.ini
+6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  phoc.ini
 "
@@ -4,7 +4,7 @@
 pkgname=device-asus-tf201
 pkgdesc="Asus Transformer Prime TF201"
 pkgver=3
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -22,7 +22,7 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	pointercal
-	rootston.ini
+	phoc.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -44,8 +44,8 @@ package() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 nonfree_firmware() {
@@ -63,5 +63,5 @@ x11() {
 sha512sums="
 5c8652e181c741002aafa2ca714ee169172ad83fe8d8d0156176ed253d40381a90e3868737ae7b2fefc107277ce80d68553dbe8a985ecb4747fa43e0fd63fe6f  deviceinfo
 dcb4e5b6b808205811d9e4f8d5dfa88ff357eb98a8e73ebe46c5cb22f1d2addfc49e552a93bfe678e91467907032676cf7602d418463a20da245b2dbdb494b78  pointercal
-6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  rootston.ini
+6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  phoc.ini
 "
@@ -3,7 +3,7 @@
 pkgname=device-asus-tf300t
 pkgdesc="Asus Transformer Pad TF300T"
 pkgver=3
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,7 +21,7 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	pointercal
-	rootston.ini
+	phoc.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -43,8 +43,8 @@ package() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 nonfree_firmware() {
@@ -62,5 +62,5 @@ x11() {
 sha512sums="
 0728a74cce8de74cf15cbbc155963ebc4ff3abf59ea0d3f80a74f66130e2da1f852829e31ad882ade894872cc23dbedd7a3bfc3d2c9e537c196801af3d086e52  deviceinfo
 c0f1aa7b041f9bbf8f6d2a7e2e42d1a54770eaf44fb27cd6b13dd8dd10a8c3960325027deb5766c750a9357b60da752ca6ce96374cdf52cbc8bea5750d6449a9  pointercal
-6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  rootston.ini
+6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  phoc.ini
 "
@@ -3,7 +3,7 @@
 pkgname=device-asus-tf300tg
 pkgdesc="Asus Transformer Pad 3G TF300TG"
 pkgver=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,7 +21,7 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	pointercal
-	rootston.ini
+	phoc.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -43,8 +43,8 @@ package() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 nonfree_firmware() {
@@ -62,5 +62,5 @@ x11() {
 sha512sums="
 fe051ecca0a74dbde0195daed9602152fe20149d286694c3b37e03806f0fcf7700ed343cc2431c9ff92a8a19a0c4d9a0f7ef6478736f78de839239cda1f37b1a  deviceinfo
 d4270d13750b4c63a2f02a31ef42d00496ae71fc2c9cb8a7505da41d343911df353ff9150136f5cef143bf844024fee096f751ec0fa18589fae51dc30b1063c6  pointercal
-6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  rootston.ini
+6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  phoc.ini
 "
@@ -4,7 +4,7 @@
 pkgname=device-asus-tf700t
 pkgdesc="Asus Transformer Infinity TF700T"
 pkgver=3
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -22,7 +22,7 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	pointercal
-	rootston.ini
+	phoc.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -44,8 +44,8 @@ package() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 nonfree_firmware() {
@@ -63,5 +63,5 @@ x11() {
 sha512sums="
 52a5910f3d404793918710a8c6f03e670fe6310d47e13df7c224329e234afde55a85d4ad52657ed8aed21a544736e388a705cdb725ef62eb7b093a7df9478a96  deviceinfo
 715e4814b7357442ad848626c9210dd1f1c54ed8707fafcfabbf691001ecafd85e28b39eadd32a633887488eb58a34e1d4592d99647ab3133cbaa834b8b7694d  pointercal
-c15e0d54e311892556cf9447d8431b6239fcce29bb011bf4931c909b4d59af2f00b87637b0eb67554ccd063f569ad24c868433c551e27354b3b9af604a08f3d8  rootston.ini
+c15e0d54e311892556cf9447d8431b6239fcce29bb011bf4931c909b4d59af2f00b87637b0eb67554ccd063f569ad24c868433c551e27354b3b9af604a08f3d8  phoc.ini
 "
@@ -2,7 +2,7 @@
 pkgname=device-asus-tilapia
 pkgdesc="Google Nexus 7 2012 (tilapia)"
 pkgver=5
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,7 +13,7 @@ subpackages="$pkgname-phosh
 	     $pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo
 	pointercal
-	rootston.ini"
+	phoc.ini"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -27,8 +27,8 @@ package() {

 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
 }

 nonfree_firmware() {
@@ -40,5 +40,5 @@ nonfree_firmware() {
 sha512sums="
 73b689f6aadb77c577aa4d59c048126a7bce0679e76140003cdd80319e6c8190d2e8e3d20adfd1e8707e476c53ababf4f1be9824f9f017c3749e4e2d58282be6  deviceinfo
 1f9d77df433c7199a9f07d6fd1d90cdf1ab40021bf1970be9400e5f32155d92f7fa338162a0ca95d441d1701eff0f5e0cbb64a0555de48740a62e8ff59fe11e5  pointercal
-6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  rootston.ini
+6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  phoc.ini
 "
				`@@ -0,0 +1 @@`
				`soc-qcom-sdm845-nonfree-firmware.post-install`