Build kernel

Update hello world
Use pmos runner
2022-03-11 20:41:02 +01:00 · 2022-03-11 19:49:32 +01:00 · 2022-03-11 19:49:02 +01:00
650 changed files with 25519 additions and 37580 deletions
@@ -121,10 +121,6 @@ def main():
        print("it more easily. Many times one person did a port with basic")
        print("functionality, and then someone else jumped in and")
        print("contributed major new features.")
-        print("")
-        print("NOTE: if you renamed a device in pmaports, rename it in the")
-        print("wiki as well and make sure to add it here:")
-        print("https://postmarketos.org/renamed")
        return 1
    else:
        print("*** Wiki check successful!")
@@ -26,6 +26,7 @@ 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,9 +17,12 @@ 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,10 +153,16 @@ build-x86:
  extends: .build

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

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

 build-armhf:
+  tags:
+    - aarch64
  extends: .build
@@ -6,10 +6,5 @@ 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,10 +8,10 @@ fi

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

 _arch="aarch64"
-_mirror="http://uk.alpinelinux.org/alpine/"
+_mirror="http://dl-4.alpinelinux.org/alpine/"

 url="http://busybox.net"
 license="GPL2"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-cea078b709b3bb1e1a4eec3e2b75ebaa9057131461cbf8be799f4840a510d8d0341cd218bfd154533c735f7ddc000b606ad590f44b5e997855e7e300d1b4effa  busybox-static-1.35.0-r13-aarch64-edge.apk
+5be7db2e4793b74ffa487153b1ca52027b6d1a4ca316c152163d1b3030ba3270e645d02522f9c8187b14fc193b5471ccedc7439b38463fabeac08b404f1b6fbb  busybox-static-1.35.0-r5-aarch64-edge.apk
 "
@@ -8,10 +8,10 @@ fi

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

 _arch="armhf"
-_mirror="http://uk.alpinelinux.org/alpine/"
+_mirror="http://dl-4.alpinelinux.org/alpine/"

 url="http://busybox.net"
 license="GPL2"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-c62128c0c1bb4e9888342f079b4306f73ae6771173606e0a60802f95d31673f9bbf3426f301f2161c08c72137da5373bb6ea8acbf0b9ababc003aee4786d6229  busybox-static-1.35.0-r13-armhf-edge.apk
+dcfd4a8af7c0f2ae33cacdc933f38906c9173b9a6476b04624d0dce7bf03277328bc3422182cbf0cf784495ff663326779a39d4a259064d5a740f8bea4f5a3be  busybox-static-1.35.0-r5-armhf-edge.apk
 "
@@ -8,10 +8,10 @@ fi

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

 _arch="armv7"
-_mirror="http://uk.alpinelinux.org/alpine/"
+_mirror="http://dl-4.alpinelinux.org/alpine/"

 url="http://busybox.net"
 license="GPL2"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-5b1bca1f7d8c0c331c7a2712a909507c1cab8710fb5cce7199e584dbbc67612850e8c87edbdd8a0ca2d901819d0eab343ca9bb537b824eb438fc1d3b1faaa32b  busybox-static-1.35.0-r13-armv7-edge.apk
+2b2ff67a0cf0ab1b1fc67458f328c7b2e91a24a6c57d4d7707c5c88a68b715af11b2ee29381aaa15946d6bccaf3d6f899f8a760ff87df2156a59bd12e67af71d  busybox-static-1.35.0-r5-armv7-edge.apk
 "
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=2
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -252,7 +252,6 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 	0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 	0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-	libgo-musl-1.2.3.patch
 	"

 # we build out-of-tree
@@ -768,5 +767,4 @@ c44c6e5b28b622897af60e7e2dbf0d0284379eb57b39b480936e6d8b3743a24287c2a9ed69a530ef
 160ef16fde90546474e1548f1487c18d9b8edbae1d42a13ad06041b03214d06ff2c3586acd4d0bae27d48e48bb651861c6b9a140ade4ac59f00a268e85275da4  0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 f4d9ebf6d5c80d2f303404b9bf315bf81435c0d369b03b92f8e8510d82db72c2a30d84603307ddc0697df3845862ba93045e4a3724f8e491e7c01bd4396d8864  0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 8ac54b3a46f7270d975fa3e1198ac37a2311a4b9940938958ffc148e4e9c82c3e81cf3e3c3abd43cef29137897cd6768220b432f828672e036308f7994422d2e  0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93  libgo-musl-1.2.3.patch
 "
@@ -1,13 +0,0 @@
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 6fef104..06289a4 100755
--- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -126,7 +126,7 @@ if ! grep '^const SIGCLD ' ${OUT} >/dev/null 2>&1; then
- fi
- 
- # The syscall numbers.  We force the names to upper case.
-grep '^const _SYS_' gen-sysinfo.go | \
-+grep '^const _SYS_[a-z]' gen-sysinfo.go | \
-   sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \
-   while read sys; do
-     sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=2
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -252,7 +252,6 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 	0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 	0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-	libgo-musl-1.2.3.patch
 	"

 # we build out-of-tree
@@ -768,5 +767,4 @@ c44c6e5b28b622897af60e7e2dbf0d0284379eb57b39b480936e6d8b3743a24287c2a9ed69a530ef
 160ef16fde90546474e1548f1487c18d9b8edbae1d42a13ad06041b03214d06ff2c3586acd4d0bae27d48e48bb651861c6b9a140ade4ac59f00a268e85275da4  0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 f4d9ebf6d5c80d2f303404b9bf315bf81435c0d369b03b92f8e8510d82db72c2a30d84603307ddc0697df3845862ba93045e4a3724f8e491e7c01bd4396d8864  0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 8ac54b3a46f7270d975fa3e1198ac37a2311a4b9940938958ffc148e4e9c82c3e81cf3e3c3abd43cef29137897cd6768220b432f828672e036308f7994422d2e  0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93  libgo-musl-1.2.3.patch
 "
@@ -1,13 +0,0 @@
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 6fef104..06289a4 100755
--- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -126,7 +126,7 @@ if ! grep '^const SIGCLD ' ${OUT} >/dev/null 2>&1; then
- fi
- 
- # The syscall numbers.  We force the names to upper case.
-grep '^const _SYS_' gen-sysinfo.go | \
-+grep '^const _SYS_[a-z]' gen-sysinfo.go | \
-   sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \
-   while read sys; do
-     sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=2
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -252,7 +252,6 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 	0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 	0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-	libgo-musl-1.2.3.patch
 	"

 # we build out-of-tree
@@ -768,5 +767,4 @@ c44c6e5b28b622897af60e7e2dbf0d0284379eb57b39b480936e6d8b3743a24287c2a9ed69a530ef
 160ef16fde90546474e1548f1487c18d9b8edbae1d42a13ad06041b03214d06ff2c3586acd4d0bae27d48e48bb651861c6b9a140ade4ac59f00a268e85275da4  0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 f4d9ebf6d5c80d2f303404b9bf315bf81435c0d369b03b92f8e8510d82db72c2a30d84603307ddc0697df3845862ba93045e4a3724f8e491e7c01bd4396d8864  0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 8ac54b3a46f7270d975fa3e1198ac37a2311a4b9940938958ffc148e4e9c82c3e81cf3e3c3abd43cef29137897cd6768220b432f828672e036308f7994422d2e  0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93  libgo-musl-1.2.3.patch
 "
@@ -1,13 +0,0 @@
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 6fef104..06289a4 100755
--- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -126,7 +126,7 @@ if ! grep '^const SIGCLD ' ${OUT} >/dev/null 2>&1; then
- fi
- 
- # The syscall numbers.  We force the names to upper case.
-grep '^const _SYS_' gen-sysinfo.go | \
-+grep '^const _SYS_[a-z]' gen-sysinfo.go | \
-   sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \
-   while read sys; do
-     sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-aarch64
-pkgver=1.2.3
-pkgrel=0
+pkgver=1.2.2
+pkgrel=7
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-a21d0c879f36c42da82c384403bb31a9562521a7a68b965d3fab6fcf133734ee93fccc6dc5131b99c54c7eb6fbe4329829b915bb801e6ac602d4091617ac03ed  musl-1.2.3-r0-aarch64-edge.apk
-a5742520f5a8aaf3fea931697126b777fed7a58d08be64e30e5ea2dfde571d7b317e40f4fea31979325d9c1d407c18a46cb354483aa906dae08301e563db5f4f  musl-dev-1.2.3-r0-aarch64-edge.apk
+9477f129facfcb46474e72a576714e762d03bc306dc6a64c246d793c9018f57baab7120f689a1f13f331158c6bdf06c82d6e43c19af1660363a9292b953ad48a  musl-1.2.2-r7-aarch64-edge.apk
+23b3fa1f6a2971dfd2444fe0f967b84e880e5862248c0bc5c5f4b56e91dc6dc6c1f849618a331c0fbaf74d1b6b6fbd592a4781db9b247dd4c5adf7c57aae3ffa  musl-dev-1.2.2-r7-aarch64-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-armhf
-pkgver=1.2.3
-pkgrel=0
+pkgver=1.2.2
+pkgrel=7
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-20724b1bad5b986e5644799b2b9c0ae2699c25506be72fc28a68fbe9215054b752a9972a556a0f93356452ab12cece77e89b4cfa63310d08cb2f749b35e1acfc  musl-1.2.3-r0-armhf-edge.apk
-fb05d24e7c90b41c04bbdb6499d35e376931b4e13491031631bade0c1b3b596f678c813e872438fda33ff7300c40bc1235f0145bff1b5a32ee2aba0f8c575925  musl-dev-1.2.3-r0-armhf-edge.apk
+aa7ea9cf329f9fae659575337b5a9c8cb885abe712c3fc7befe8c9161ce5dc0b30283a99f29ebf1df32dfb397ce03ff9a524b7fd0feb5e97dbfab0b3d9faa357  musl-1.2.2-r7-armhf-edge.apk
+21c8746f904cee6a0e3069fde337408fc3b6d73c29068401bfca991240f1ff99a3094820a829ace98981afc441c7d3d7754d95803328ea23279aee0be56bf215  musl-dev-1.2.2-r7-armhf-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-armv7
-pkgver=1.2.3
-pkgrel=0
+pkgver=1.2.2
+pkgrel=7
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-88b034bc37d800e0f279437a1a1a5973e994873ab0e44d372ac6cd49c999d6c1f834266d646fb17777d9a018a9bfd0cc9346d7525d1726ffe96cc56096d70281  musl-1.2.3-r0-armv7-edge.apk
-c865bde907a17accf33a4cd7b8caad496c510b3227d8cf5e12a597613df7a629778eb08a32692e67bfead3422a2add2833e4e49df1e970d2067c2f65a372dc46  musl-dev-1.2.3-r0-armv7-edge.apk
+1ec15f6a2924eeabb8c247fdaafefd97a679afdde51749897f86afdcea721dae3af8cb9c3256c7793938003996f0665d8958d7f91291da2e37c4833dc7da0868  musl-1.2.2-r7-armv7-edge.apk
+476023adad8e9e14233741d491756159d6b93856c647efc030b2e538c15351e49000e1f84763b60a2f9f9283a6ddface81797120526fb7cebebb35adb1d9d4cd  musl-dev-1.2.2-r7-armv7-edge.apk
 "
@@ -1,44 +0,0 @@
-From 9d2231c5d74e13b2a0546fee6737ee4446017903 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max.kellermann@ionos.com>
-Date: Mon, 21 Feb 2022 11:03:13 +0100
-Subject: lib/iov_iter: initialize "flags" in new pipe_buffer
-
-The functions copy_page_to_iter_pipe() and push_pipe() can both
-allocate a new pipe_buffer, but the "flags" member initializer is
-missing.
-
-Fixes: 241699cd72a8 ("new iov_iter flavour: pipe-backed")
-To: Alexander Viro <viro@zeniv.linux.org.uk>
-To: linux-fsdevel@vger.kernel.org
-To: linux-kernel@vger.kernel.org
-Cc: stable@vger.kernel.org
-Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
-Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
- lib/iov_iter.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/iov_iter.c b/lib/iov_iter.c
-index b0e0acdf96c15..6dd5330f7a995 100644
--- a/lib/iov_iter.c
-+++ b/lib/iov_iter.c
-@@ -414,6 +414,7 @@ static size_t copy_page_to_iter_pipe(struct page *page, size_t offset, size_t by
- 		return 0;
- 
- 	buf->ops = &page_cache_pipe_buf_ops;
-+	buf->flags = 0;
- 	get_page(page);
- 	buf->page = page;
- 	buf->offset = offset;
-@@ -577,6 +578,7 @@ static size_t push_pipe(struct iov_iter *i, size_t size,
- 			break;
- 
- 		buf->ops = &default_pipe_buf_ops;
-+		buf->flags = 0;
- 		buf->page = page;
- 		buf->offset = 0;
- 		buf->len = min_t(ssize_t, left, PAGE_SIZE);
-- 
-cgit 
-
-
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=3
 _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
-	phoc.ini
+	rootston.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"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
 75243e3d0bc9a352465683ec8cf8b83566e4131bb7fae0f388267a62bdbf4691c955ed034b30df550f921b771080688123ae8db144b72f786bf1677ef1d83f57  3155254999ac36c3051a2118c415de25a072c0f6.tar.gz
 8dfeb1d928aa3ac94e9015d4b98713ec4d56eab68a7aee8cb7ce6a877b3d015670800bae456190ae57bcb35047738de5559460f2f7b785987f1394b605119ae5  deviceinfo
-3823556d741a352fc7f43567d7218255a27c45c2c5d4d4bdf23f4d26ce2828c5a1c642519b84fef7f59756c990e6a199d72e6ba0c277939b08a40526c3ff3714  phoc.ini
+a60d1785f0163d4a4eb63ea5e3017631aab7dd6683baad6a74b09809d33888d581ca8b14526c19d18234dcf727d1fdb4ff0489ed4bd5523905d0e4da7d93bc56  rootston.ini
 "
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1.75
@@ -4,7 +4,7 @@
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
 pkgver=6
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -39,5 +39,5 @@ nonfree_firmware() {
 }

 sha512sums="
-285087d1309c7bc6d4c11aaf4c89f754e5386cb53e1ab5ee6cfabe8fefa5ad95042d0b55fa12d2615df0bd82b668c6131435d8b770fa751ca5f6bd464e3bdecb  deviceinfo
+9b52a7db71484e614b3f8efc5b4450dcbe93165f8372b22006f4c84f62cd243785f262f29d892feeb6bd59c92df6a649511eb1f58be56a0f6f1384e8a7320392  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-hx852x"
+deviceinfo_modules_initfs="smb1360 panel-longcheer-yushun-nt35520 panel-longcheer-truly-otm1288a msm himax_852xES"
 deviceinfo_arch="aarch64"

 # Device related
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
-pkgver=6
-pkgrel=0
+pkgver=5
+pkgrel=1
 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 phoc.ini"
+source="deviceinfo rootston.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"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
 c860b43edd7dcc2b10a7ee1dc8b2b7e225c469db6f7d45231b78e4e8a76bbe242b65e40488dcae2503ecdc407844eee50964db7b8d3a392a8f3f064afe690b99  deviceinfo
-10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
+cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951  rootston.ini
 "
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1.8
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
-pkgver=6
-pkgrel=0
+pkgver=5
+pkgrel=1
 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 phoc.ini"
+source="deviceinfo rootston.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"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
 f5971257def301439b3786dada60333ad34b15b2221a296698cff7a0a8f7c5c6a54547c91bb024a883fe8f4f5f0b2926c044acc24e240ce1caeaf77697caad75  deviceinfo
-10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
+cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951  rootston.ini
 "
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1.8
@@ -4,12 +4,12 @@
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
 pkgver=8
-pkgrel=3
+pkgrel=2
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-nokia-n900 u-boot-tools kbd kbd-bkeymaps ofono mesa-dri-gallium alsa-utils"
+depends="postmarketos-base linux-nokia-n900 u-boot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast alsa-utils"
 makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
 install="$pkgname.post-install"
 subpackages="
@@ -3,8 +3,8 @@

 pkgname=device-odroid-hc2
 pkgdesc="ODROID HC2"
-pkgver=0.5
-pkgrel=0
+pkgver=0.4
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -56,5 +56,5 @@ tools() {
 sha512sums="
 d02702884d47c2c6b98f1ec194fc3a11b2c6559d416c112d41ddecfbbd84f0706adfc72e13e9943f130e548d987aa7d151f4f416443d15b7dff2375d4d067144  deviceinfo
 06239b979ad78cadc1bc764b8c6a2ce57c7f2a44456ba918e83ea7ae2846c983ec6cb8eea708540e7c4f3abe2a1ff942b8c8ae5e6d68dbc65a8f5c34942af49e  uboot-script.cmd
-669a0561251f287f072c9c1fc37d89b49a47fc4a4e5134c9e6681750ae960e5827043166136b7d5b9ad52c931b060bdcb6d0b5335c2e9fdb4eefd82f131ded93  install-rootfs-hdd.sh
+8273be5a8c5a7b9a27ae91a1581ca2d247d0fb45e24e25e46ba8272955d7fce31c62562c3fae402f6a66918c9c61d838de692cca11eea3cdfde6a91f478f2955  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 old_rootfs
+e2label $MMC_ROOT_PARTITION pmOS_root_old
 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=5
+pkgver=4
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -18,11 +18,7 @@ depends="
 	soc-qcom-sdm845-ucm
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	phoc.ini
-	q6voiced.conf
-"
+source="deviceinfo rootston.ini"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"

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

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

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

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

 [output:DSI-1]
@@ -3,7 +3,7 @@

 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=5
+pkgver=4
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -18,7 +18,7 @@ depends="
 	soc-qcom-sdm845-ucm
 "
 makedepends="devicepkg-dev"
-source="deviceinfo phoc.ini"
+source="deviceinfo rootston.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 soc-qcom-sdm845-nonfree-firmware"
+	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs"
 	mkdir "$subpkgdir"
 }

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

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

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

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

 package() {
@@ -162,7 +162,7 @@ sha512sums="
 6274b664ad42456ff51ec4ec2dea9749bff59e0eee0c2d1f7e8950934ee92e410e554df246f81bd01813ddfae5e6a9001a8fcad05815beab536d1547251d5aeb  deviceinfo
 9244687bfea20c78120f7c48388d141eff3e23a421e48504eac1479ec7f51197d9ca72468c9cc33c6e3d3fa32ee3514711545816e607d49870226e4a41a60a85  gsk-renderer-gl.sh
 6bc22b369b2d9058b702ac7a7862abaefaf8179b43491868bdb008d181b59104f1ded89db1da51a810e1ccdc803a579b924a438674283a65afc3a9c4d2894caf  kirigami-lowpower.sh
-5c683f2cf27b2f982c8581251688834634957143334011861400d3eed27b6590f37055fe61c8af632552435dba581fa990a44c1e5689a3c8fe642fd095b740ce  phoc.ini
+38827d9636c48b133eb333764a6799a6e93454e01ecb0cfde1ecad3ee149606ba59eb1a5e6c8366e3b3891e54bd664a0a5acdd89d38ac3a3551260e9b9a6d3fc  rootston.ini
 9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2  sway.conf
 181438ed8723c29bf201a5d4ad1ae588afcd03763deadb267b23d96ad40c8956e08b2e3b800f4ee5d77774625d0b0e6a70c4068f98fbfad50d31e71b30a24164  uboot-script.cmd
 a2fd8037c9a1af000f31c7005436d791525317f818c553d1e2f472b4df76c71d769ecbf67b369a478bea720a6215eaa9fb6a26ba218ac9410513e2345ebe7b4c  HiFi.conf
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1
@@ -4,18 +4,18 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-a3
 pkgdesc="Samsung Galaxy A3 (2015)"
-pkgver=11
+pkgver=9
 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-samsung-msm8916-modem-workaround"
+	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	phoc.ini
+	rootston.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"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
 dac014f2ebc1c461e43917fcfc020675c10ac39e17b83b0e0e2246b159db1f61ce024df21624f2635729f29521b30b4cce29b4451931cb27cf4d0f34b19ec509  deviceinfo
-e8f734a2f8d154813dbb493f0d58af50a7f624ffed41967a81493b975a6211efc6d30743b23825562cfd126791cbdd3348bfbed32eeece9b8acec0a37c3c51b6  phoc.ini
+f3667b914bb955be9e97db31dc7ed4a7c5d0c369be9549d587bb7208e270590c0c3fa36a0dd997d6f8305c5c9afb3b906423af6ca8724e806f995e61226cfc83  rootston.ini
 "
@@ -1,5 +0,0 @@
-[cursor:seat0]
-map-to-output = DSI-1
-
-[output:DSI-1]
-scale = 1
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1
@@ -3,14 +3,14 @@
 # Co-Maintainer: Alexey Min <alexey.min@gmail.com>
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
-pkgver=10
+pkgver=9
 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-samsung-msm8916-modem-workaround"
+	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 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=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base postmarketos-update-kernel linux-samsung-espresso3g mesa-dri-gallium mkbootimg"
+depends="postmarketos-base postmarketos-update-kernel linux-samsung-espresso3g mkbootimg"
 makedepends="devicepkg-dev"
-source="deviceinfo"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo xorg.conf"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-nonfree-userland:nonfree_userland"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -28,6 +28,28 @@ 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="
-dbf180ad55042899074ea71d2c50754f2b8c9a12becdffc8fd52794b36c5c5ee2038e5074be66cbc53068d2ac7abae5b22ae3585b17caf9e179101c9101f6d57  deviceinfo
+41897ea67a1773023269a37aab57dc6a60e6804319ae329ce355cac464809c16699262dca1f4b1895b01e9e20bfc640ce3577ac0703a33ba2201555e4d0f28f9  deviceinfo
+41f0d61da6f5029be51396fdcdc91aa241c47825adc32cc03f81d1c2ada633f1e293a03dd3ed75a7e8c3e2d960aec889ecdb3af7db5f106444c06f4f6c45debd  xorg.conf
 "
@@ -17,7 +17,7 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1024"
 deviceinfo_screen_height="600"
-deviceinfo_gpu_accelerated="false"
+deviceinfo_gpu_accelerated="true"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -0,0 +1,12 @@
+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
@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt510
 pkgdesc="Samsung Galaxy Tab A 9.7 (2015)"
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,7 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	pointercal
-	phoc.ini
+	rootston.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -45,12 +45,12 @@ nonfree_firmware() {

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

 sha512sums="
 5acddf5145a0ec2cbe056bd120b1413fd6efee441f15127ce6f132ab470f326ba729f71afc70ba4d8dc9dab62e49fa20217632f08f9ed6d5b2ddda033ed32009  deviceinfo
 6aedd5eeac4d21356678f5399f3f0946392c9a7477ac21d39b8e761133dc8ed67adb4966647314f71d5263483ab68cad92847dacff95ffa45eabfc33c9f405b5  pointercal
-ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
+bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180  rootston.ini
 "
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1
@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=1
 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
-	phoc.ini
+	rootston.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -41,11 +41,11 @@ nonfree_firmware() {

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

 sha512sums="
 b374fc9b75b0693a27c94116f652410a0b026077beba91527104fd0e3e720ddec0c1e48b54714af810b514571d5f2021f8facf34a9ea8de35b92aa060af64d19  deviceinfo
-ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
+bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180  rootston.ini
 "
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1
@@ -1,60 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Newbyte <newbyte@disroot.org>
-pkgname=device-samsung-m0
-pkgdesc="Samsung Galaxy S III"
-pkgver=6.2
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="armv7"
-options="!check !archcheck"
-depends="
-	alsa-ucm-conf
-	linux-postmarketos-exynos4
-	mesa-dri-gallium
-	mkbootimg
-	postmarketos-base
-	postmarketos-update-kernel
-	soc-samsung-exynos4412-haptics
-	"
-makedepends="devicepkg-dev"
-install="$pkgname.post-install"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="
-	deviceinfo
-	ucm/Midas.conf
-	ucm/HiFi.conf
-	modules-load.conf
-	"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-
-	_midas_audio_dir="$pkgdir/usr/share/alsa/ucm2/conf.d/Midas"
-
-	# Alsa UCM configs
-	install -Dm644 "$srcdir"/Midas.conf \
-		-t "$_midas_audio_dir"
-	install -Dm644 "$srcdir"/HiFi.conf \
-		-t "$_midas_audio_dir"
-}
-
-nonfree_firmware() {
-	pkgdesc="WiFi and Bluetooth firmware"
-	depends="
-		firmware-samsung-midas-bluetooth
-		firmware-samsung-midas-wifi
-		"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-042a7d64ea9dd6d9f31e3754fc873e98ab403f8bfa2a7ec13c849db5282a1a23745936d7e2fc64c09a2cdb140acd903948298f39c5cb8c03130411ac94e9d34d  deviceinfo
-caa81e8ab6753c0ca24c22fb6742288765dfbf2469b8b8c35c5789edfcee546ef1c3b14ad6e540c417f434258399300f17d312b58157635eafab134587ef94cc  Midas.conf
-21f64c9104ec5780fffde8ba7ce57583592469694d07dd5e2de4173d7c9f99ba57fb28bb5bcfbbce921be9c4ead9d31980e948533162fe12424c2037145debb1  HiFi.conf
-56a2bdffc273cb0a581192e65378ff50e71c7bc8a696af7d5e7c165a53c005aae104c4514c68afb668454c5a94ce78bd509f8a40e3401d67e16636b1ed81d051  modules-load.conf
-"
@@ -1,5 +0,0 @@
-# This file contains the names of kernel modules that should be loaded
-# at boot time, one per line. Lines beginning with "#" are ignored.
-
-# notification led module
-ledtrig-pattern
@@ -1,238 +0,0 @@
-# Based on https://github.com/Midas-Mainline/android_device_midas_common/blob/lineage-18.1/configs/audio.i9300.xml
-
-SectionVerb {
-
-	EnableSequence [
-
-		cdev "hw:Midas"
-
-		# do not change the adc & dac source of AIF2
-		cset "name='AIF2DACL Source' 0"
-		cset "name='AIF2DACR Source' 0"
-		cset "name='AIF2ADCL Source' 0"
-		cset "name='AIF2ADCR Source' 1"
-
-		# AIF1->DAC1
-		cset "name='DAC1 Switch' 1"
-
-		# general
-		cset "name='IN1L ZC Switch' 0"
-		cset "name='IN1R ZC Switch' 0"
-		cset "name='IN2L ZC Switch' 0"
-		cset "name='IN2R ZC Switch' 0"
-		cset "name='Output ZC Switch' 0"
-		cset "name='Speaker ZC Switch' 0"
-		cset "name='Headphone ZC Switch' 0"
-
-		# AIF1->DAC1
-		cset "name='DAC1L Mixer AIF1.1 Switch' 1"
-		cset "name='DAC1R Mixer AIF1.1 Switch' 1"
-		cset "name='DAC1 Switch' 1"
-
-		# ADC->AIF2
-		cset "name='AIF2DAC2L Mixer Left Sidetone Switch' 1"
-		cset "name='AIF2DAC2L Mixer Right Sidetone Switch' 0"
-		cset "name='AIF2DAC2R Mixer Left Sidetone Switch' 0"
-		cset "name='AIF2DAC2R Mixer Right Sidetone Switch' 1"
-		cset "name='DAC2 Left Sidetone Volume' 12"
-		cset "name='DAC2 Right Sidetone Volume' 12"
-		cset "name='DAC2 Switch' 1"
-
-		# DAC1->HP
-		cset "name='Left Headphone Mux' Mixer"
-		cset "name='Right Headphone Mux' Mixer"
-
-		# DAC1->SPKL/R->SPKL/R Boost->SPK
-		cset "name='SPKL DAC1 Switch' 1"
-		cset "name='SPKR DAC1 Switch' 1"
-		cset "name='SPKL Boost SPKL Switch' 1"
-		cset "name='SPKL Boost SPKR Switch' 1"
-		cset "name='SPKR Boost SPKL Switch' 0"
-		cset "name='SPKR Boost SPKR Switch' 0"
-		cset "name='Speaker Mixer Volume' 3"
-
-		# DAC->Output mixer->Earpiece
-		cset "name='Left Output Mixer DAC Switch' 1"
-		cset "name='Right Output Mixer DAC Switch' 1"
-		cset "name='Earpiece Mixer Left Output Switch' 1"
-		cset "name='Earpiece Mixer Right Output Switch' 1"
-		cset "name='Earpiece Switch' 1"
-
-		# LINEOUT
-		cset "name='LINEOUT2N Mixer Left Output Switch' 1"
-		cset "name='LINEOUT2P Mixer Right Output Switch' 1"
-		cset "name='LINEOUT1N Mixer Right Output Switch' 1"
-		cset "name='LINEOUT1P Mixer Left Output Switch' 1"
-
-		# Input mixer->ADC->AIF1.1
-		cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 1"
-		cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 1"
-
-		# Main Mic->IN1LP/N->Input Mixer with +30dB at mixer
-		cset "name='IN1L PGA IN1LP Switch' 1"
-		cset "name='IN1L PGA IN1LN Switch' 1"
-		cset "name='MIXINL IN1L Volume' 1"
-		cset "name='IN1L Switch' 1"
-
-		# Sub Mic->IN1RP/N->Input Mixer with +30dB at mixer
-		cset "name='IN1R PGA IN1RP Switch' 1"
-		cset "name='IN1R PGA IN1RN Switch' 1"
-		cset "name='MIXINR IN1R Volume' 1"
-		cset "name='IN1R Switch' 1"
-
-		# FM Radio->IN2RP/N->Input Mixer with +30dB at mixer
-		cset "name='IN2R PGA IN2RP Switch' 1"
-		cset "name='IN2R PGA IN2RN Switch' 1"
-		cset "name='MIXINR IN2R Volume' 1"
-		cset "name='IN2R Switch' 1"
-
-		# Ear Mic->IN2LP/N->Input Mixer with +30dB at mixer
-		cset "name='IN2L PGA IN2LP Switch' 1"
-		cset "name='IN2L PGA IN2LN Switch' 1"
-		cset "name='MIXINL IN2L Volume' 1"
-		cset "name='IN2L Switch' 1"
-
-		# Input mixer->ADC->AIF1
-		cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 1"
-		cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 1"
-		cset "name='ADCL Mux' ADC"
-
-		# HPF on to take out some bounce
-		cset "name='Sidetone HPF Switch' 0"
-
-		# Work around core issue
-		cset "name='ADCL Mux' DMIC"
-		cset "name='ADCL Mux' ADC"
-		cset "name='ADCR Mux' DMIC"
-		cset "name='ADCR Mux' ADC"
-
-		# AIF2ADCDAT to AIF3ADC mux
-		cset "name='AIF3ADC Mux' 1"
-
-		# Default all outputs off
-		cset "name='HP Switch' 0"
-		cset "name='SPK Switch' 0"
-		cset "name='RCV Switch' 0"
-		cset "name='LINE Switch' 0"
-		cset "name='HDMI Switch' 0"
-
-		# Default all inputs off
-		cset "name='Main Mic Switch' 0"
-		cset "name='Sub Mic Switch' 0"
-		cset "name='Headset Mic Switch' 0"
-		cset "name='FM In Switch' 0"
-
-		# EQ Switches
-		cset "name='AIF1DAC1 EQ Switch' 1"
-		cset "name='AIF1DAC1 EQ1 Volume' 9"
-		cset "name='AIF1DAC1 EQ2 Volume' 7"
-		cset "name='AIF1DAC1 EQ3 Volume' 10"
-		cset "name='AIF1DAC1 EQ4 Volume' 13"
-		cset "name='AIF1DAC1 EQ5 Volume' 12"
-
-		cset "name='Headphone Volume' 50"
-		cset "name='AIF1DAC1 Volume' 96"
-		cset "name='AIF1 Boost Volume' 0"
-		cset "name='DAC1 Volume' 96"
-		cset "name='Left Output Mixer DAC Volume' 7"
-		cset "name='Right Output Mixer DAC Volume' 7"
-	]
-
-	DisableSequence [
-	]
-}
-
-SectionDevice."Speaker" {
-
-	Comment "Built-in speaker"
-
-	EnableSequence [
-		cset "name='SPK Switch' 1"
-		cset "name='AIF1DAC1 Volume' 96"
-		cset "name='AIF1 Boost Volume' 0"
-		cset "name='DAC1 Volume' 96"
-		cset "name='Left Output Mixer DAC Volume' 7"
-		cset "name='Right Output Mixer DAC Volume' 7"
-		cset "name='SPKL DAC1 Volume' 1"
-		cset "name='SPKR DAC1 Volume' 1"
-		cset "name='Speaker Mixer Volume' 3"
-		cset "name='Speaker Boost Volume' 4"
-		cset "name='Speaker Volume' 57"
-	]
-
-	DisableSequence [
-		cset "name='SPK Switch' 0"
-		cset "name='Speaker Mixer Volume' 1"
-		cset "name='Speaker Volume' 0"
-	]
-
-	Value {
-		PlaybackVolume "Speaker Volume"
-		PlaybackSwitch "SPK Switch"
-		PlaybackChannels 2
-		PlaybackPCM "hw:${CardId}"
-	}
-}
-
-SectionDevice."Mic1" {
-	Comment "Back Internal Microphone"
-
-	EnableSequence [
-		cset "name='Sub Mic Switch' 1"
-		cset "name='IN1R Volume' 22"
-		cset "name='MIXINR IN1R Switch' 1"
-		cset "name='MIXINR IN1R Volume' 1"
-		cset "name='AIF1ADCR Source' 1"
-		cset "name='AIF2ADCR Source' 1"
-		cset "name='AIF1ADC1 HPF Mode' 1"
-		cset "name='AIF1ADC1 HPF Switch' 1"
-		cset "name='AIF1ADC1 Volume' 96"
-	]
-
-	DisableSequence [
-		cset "name='Sub Mic Switch' 0"
-		cset "name='MIXINR IN1R Switch' 0"
-		cset "name='IN1R Volume' 10"
-	]
-
-	Value {
-		CapturePCM "hw:${CardId}"
-		CaptureChannels 2
-		CaptureVolume "IN1R Volume"
-	}
-}
-
-SectionDevice."Headset" {
-	Comment "Headset Input"
-
-	EnableSequence [
-		cset "name='MIXINL IN1L Switch' 0"
-		cset "name='MIXINR IN1R Switch' 0"
-		cset "name='Headset Mic Switch' 1"
-		cset "name='IN2L Volume' 22"
-		cset "name='MIXINL IN2L Switch' 1"
-		cset "name='MIXINL IN2L Volume' 1"
-		cset "name='AIF1ADC1 HPF Mode' 1"
-		cset "name='AIF1ADC1 HPF Switch' 1"
-		cset "name='AIF1ADC1 Volume' 96"
-		cset "name='AIF1ADCL Source' 0"
-		cset "name='AIF1ADCR Source' 0"
-		cset "name='AIF2ADCL Source' 0"
-	]
-
-	DisableSequence [
-		cset "name='Headset Mic Switch' 0"
-		cset "name='IN2L Volume' 10"
-		cset "name='MIXINL IN2L Switch' 0"
-		cset "name='MIXINL IN2L Volume' 0"
-		cset "name='AIF1ADC1 HPF Mode' 0"
-		cset "name='AIF1ADC1 HPF Switch' 0"
-		cset "name='AIF1ADC1 Volume' 96"
-	]
-
-	Value {
-		CapturePCM "hw:${CardId}"
-		CaptureChannels 2
-		CaptureVolume "IN2L Volume"
-	}
-}
@@ -1,6 +0,0 @@
-Syntax 2
-
-SectionUseCase."HiFi" {
-	File "HiFi.conf"
-	Comment "Play high quality music"
-}
@@ -1,3 +1,3 @@
-# Tag wwan ports of some Samsung devices to reduce the facility
+# Tag wwan ports of device samsung-serranove 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,18 +2,19 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
-pkgver=12
+pkgver=10
 pkgrel=0
 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-samsung-msm8916-modem-workaround"
+	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
 source="
+	77-modem-samsung-serranove.rules
 	deviceinfo
-	phoc.ini
+	rootston.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -33,6 +34,8 @@ 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() {
@@ -47,11 +50,12 @@ phosh() {
 	replaces="$_substitutes-phosh"
 	provides="$replaces=$pkgver-r$pkgrel"
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
+4b747284acf73a401255093dfd7b6406fa8e3428307f031d39b1631d1a3ae6404789fc2dfff0cf2da6b2f0757071363cc70b4ef7d445c7b3c047b6feb88b9125  77-modem-samsung-serranove.rules
 d666cf805d292d13d9e15a350b203580f016f455dad16cbc4a94471edb145fd464c5ad92a50077995234a9db1322e605e0294a6c5d7342fa6675b1bfec4eb69e  deviceinfo
-1bc90a1a67309b43435039332b2a1d7e606408c6429b3cb8991a57f53dd4de36fbe471481b6481fbdb098c3819344e8093dd8eab0d34eb3c091ab6d8abd5c087  phoc.ini
+94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea  rootston.ini
 "
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1.5
@@ -4,8 +4,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
-pkgver=5
-pkgrel=1
+pkgver=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -27,8 +27,7 @@ subpackages="

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

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

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

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

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

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

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

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

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


 sha512sums="
-52ba13a75f14c8d75a719f463a870df34eb59765bd43f29a49fb0dff201410fa388a04f73ec8e6e86d634547bf6ef0164466333b24da36d882b0d7254bfbe213  deviceinfo
+f0f2f6598947e8261607f259bb869e2845b08a5c1df28126bc705f8e7a11547e5702395741da5a7f50a41e17e6840b9ef01a4e3248b387b4d00510aef54118ee  deviceinfo
 e9ee9c1404b41ba15eafff3f728ff6e0e78dc17e9a88483fca92db1aa3efe0e4d5bf26142e533c4ff12b1bf8ce04ccabb7ca0f93aaea586d5b30910282aad237  pointercal
-38409d4ce48db4624539dbfd695d3c6e1596a29fd7c3004a41368b28cba646495d05360420ad728f82c63d6ddeeca71d09944df06ebaca120aedd9cc2b436eb3  phoc.ini
+035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini
 a1ca623314e80045ea8d64be06d12ffc091a5585ca40f9713039883e20889ba47f4a3f9c3bd92bd3b616bb6bb621e87409b6b6fa43bfe566a2a46468609c16f4  30-gpu-firmware.files
 "
@@ -6,7 +6,7 @@ deviceinfo_name="Xiaomi Mi Note 2"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-scorpio"
 deviceinfo_year="2016"
-deviceinfo_dtb="qcom/msm8996pro-xiaomi-scorpio"
+deviceinfo_dtb="qcom/msm8996-xiaomi-scorpio"
 deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs="atmel_mxt_ts msm panel-lgphilips-sw43101 qcom_fg"
 deviceinfo_arch="aarch64"
@@ -1,4 +1,4 @@
-# /etc/phosh/phoc.ini
+# /etc/phosh/rootston.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=6
+pkgver=5
 pkgrel=0
 pkgdesc="Firmware for OnePlus 6 / 6T"
 url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845"
 arch="aarch64"
-depends="linux-firmware-qcom linux-firmware-ath10k"
+depends="soc-qcom-sdm845-nonfree-firmware linux-firmware-qcom linux-firmware-ath10k"
 license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
+options="!check !strip !archcheck !tracedeps"

 _version="3ec855b2247291c79652b319dfe93f7747363c86"

@@ -1,55 +0,0 @@
-pkgname=firmware-samsung-midas
-pkgver=5.1
-pkgrel=0
-pkgdesc="Samsung Galaxy Midas board firmware (m0, m3, t0lte, ...)"
-_commit="fdd8c44568a148c22fbf008de822ff4e27992da1"
-url="https://github.com/TheMuppets/proprietary_vendor_samsung"
-_armbian_commit="5ff122ef309a1ddabb4bf7f37c8347c43b314a61"
-_armbian_url="https://github.com/armbian/firmware"
-_androguide_commit="d5a8735a6ad1fff3091f100383ac004f411d7528"
-_androguide_url="https://raw.githubusercontent.com/Androguide/android_vendor_samsung"
-arch="armv7"
-license="proprietary"
-replaces="firmware-samsung-m0"
-subpackages="
-	$pkgname-bluetooth
-	$pkgname-wifi
-	"
-source="
-	$url/raw/$_commit/smdk4412-common/proprietary/bin/bcm4334.hcd
-	brcmfmac4334-sdio.samsung,i9300-$_armbian_commit.txt::$_armbian_url/raw/$_armbian_commit/brcm/brcmfmac4334-sdio.rockchip%2Crk3318-box.txt
-	brcmfmac4334-sdio.samsung,i9305-$_androguide_commit.txt::$_androguide_url/$_androguide_commit/smdk4412-common/proprietary/system/etc/wifi/nvram_net.txt
-	"
-options="!check !strip !archcheck !spdx !tracedeps pmb:cross-native"
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-bluetooth() {
-	depends="$pkgname"
-	replaces="firmware-samsung-m0-mainline"
-
-	install -Dm644 "$srcdir"/bcm4334.hcd \
-		"$subpkgdir"/lib/firmware/brcm/BCM4334B0.hcd
-}
-
-wifi() {
-	depends="$pkgname linux-firmware-brcm"
-	replaces="firmware-samsung-m0-mainline"
-
-	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,i9300-$_armbian_commit.txt \
-		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9300.txt
-	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,i9305-$_androguide_commit.txt \
-		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9305.txt
-	ln -s /lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9305.txt \
-		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,n710x.txt
-	ln -s /lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9300.txt \
-		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,n8010.txt
-}
-
-sha512sums="
-cbed1dc60829161c7ac9649dcae67fc45204c1a25e8de320ad3bc4e9d5cae573fb8a4745f91355fa96d2d3d4124a9e707341fc5bd1b22705cb2efb16831e029f  bcm4334.hcd
-d5c83e1dcd67630e186ab484d150ca5c0af12810de62a46ec6e525b50dabf64a75f1231ef8d7c1d102fb76389210fdb952975460179ca767acd0ffdd869907d7  brcmfmac4334-sdio.samsung,i9300-5ff122ef309a1ddabb4bf7f37c8347c43b314a61.txt
-146aefcccd23d63e434bd7f7d0ac6d5975ad25e44362da10bc583ab9e38b18c53f6ce18890c9790ee88fbb8f6358085bb615d0595388ca43a322f7c819614049  brcmfmac4334-sdio.samsung,i9305-d5a8735a6ad1fff3091f100383ac004f411d7528.txt
-"
@@ -1,6 +1,6 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=firmware-siliconlabs-rs9116
-pkgver=2.5.1
+pkgver=2.0.0
 pkgrel=0
 pkgdesc="Firmware for the SiliconLabs RS9116 Wifi/BT adapter"
 url="https://github.com/SiliconLabs/RS911X-nLink-OSD"
@@ -15,6 +15,4 @@ package() {
 		"$pkgdir"/lib/firmware/postmarketos/pmemdata_wlan_bt_classic
 }

-sha512sums="
-e14a6cbdb6233de2b2ea87f02fd05cf6103d23c4859429e5a589cd5880910b90ddf2fe85c916bffce0182f944febdae52201708f1fbf80d8fb3299ce8e16ac1d  firmware-siliconlabs-rs9116-2.5.1.tar.gz
-"
+sha512sums="3b7c9ea8a9a150896a429e85409e6dbc3b44711a851c3160d27744dd260400ffb30e467940c671a7a5f8fa7738919337c6d0b7f8ddc7572431039df27eb4f15f  firmware-siliconlabs-rs9116-2.0.0.tar.gz"
@@ -2,14 +2,14 @@
 # Co-Maintainer: Joel Selvaraj <jo@jsfamily.in>

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

 _commit="b4937f06a796cd30b8ddecd6cf7ed416eecc06a0"

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

 pkgname=linux-nokia-n900
-pkgver=5.15.31
+pkgver=5.15.25
 pkgrel=0
 pkgdesc="Mainline kernel fork for Nokia N900"
 arch="armv7"
@@ -15,15 +15,11 @@ _carch="arm"
 _flavor=nokia-n900
 _config="config-$_flavor.armv7"
 case $pkgver in
-	*.*.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;;
+	*.*.*)	_kernver=${pkgver%.*};;
+	*.*) _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
@@ -35,6 +31,11 @@ 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() {
@@ -62,9 +63,9 @@ package() {
 }

 sha512sums="
+6fb9c2744ec9c0fee7ac6e3e83714c95f4d31ee8e31929f3f816e88dea784ba6496d0c5df069fad92ecd4222667acad361966214697a859cff469e9f86b84f0a  linux-5.15.25.patch.xz
 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a  linux-5.15.tar.xz
-1dc78db565dda619aa9f1d59bb78cf7ee43e8922f6e055bdd6f8b419556be8838235aa26e29fd1bd38cf12d8fb81e267714bb647921dee2c2aeab9319fbe294d  linux-5.15.31.patch.xz
-465cb8fcc3a5dc043323c0767e4918b68556c1f1b693e0959b486c0e3a72264704d1889137e640e6262b4fd22feeedcfc454b6515876168ff5f0f6ccc30c4a1e  config-nokia-n900.armv7
+082de68f15bdbc4f2e0897c3885b0dcb68ee2b9e1afab9567f355630cf7a62fbcc2ff806e4a7c5abfa43c1f0837e77cb59126fc137f32e8b07408d441df0de13  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.31 Kernel Configuration
+# Linux/arm 5.15.25 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,7 +407,6 @@ 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
@@ -1444,7 +1443,6 @@ 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
@@ -1632,6 +1630,7 @@ 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.16.14
-pkgrel=0
+pkgver=5.15.7
+pkgrel=1
 pkgdesc="ODROID XU3/XU4/HC1/HC2/MC1 kernel fork"
 arch="armv7"
 _carch="arm"
@@ -30,12 +30,15 @@ makedepends="
 # Source
 _config="config-$_flavor.$arch"
 _pkgname="linux"
+_commit="77ebfca65d59167038ef5fcc62d2e8d49f47fa49"
 source="
-	$_pkgname-$pkgver.tar.xz::https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-$pkgver.tar.xz
+	$_pkgname-$pkgver.tar.gz::https://github.com/tobetter/linux/archive/$_commit.tar.gz
 	$_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-$pkgver"
+builddir="$srcdir/$_pkgname-$_commit"

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

 sha512sums="
-3daf1b5a01cbab632492e18a8e71aaf2085545f4944ce587bc7c27e86a0a739d0cbffe7890ce9c5bc863b3c5083281bca6ed4df8d3c69d60c6dcc210cd86993e  linux-5.16.14.tar.xz
-22d641b681dffd5348076e8dc095d3a1b402bc496e05156356d0be7a77b8e7a270a66dedc1d6197320806740508589d359ea7335859972f4cadd9ebf1d81212d  config-odroid-hc2.armv7
+7a377c6afcb5d62f223c909709ab22644ee4345dafa348cc9293d58bd9251b5c77e4be894a2b6238c2cb3478d6430d0e45dd1de918468a9f038514e47f234197  linux-5.15.7.tar.gz
+bf3e599de30d88ab9c0df3e7a9487bf9aa0b511615208c82a1c7f2fc254839a896637effa3bb49a7081eded25168aa3aa5855feb516b935d33f106995cffbfba  config-odroid-hc2.armv7
+59d480b6379dcfff94d05b08e28c005d507f640dc0147841e7df4827fce8db01dab1d4d50fb45b2b3fff72cdeb219a8cd87a889078a6372aea4469c861c378b1  36dfdf11af49d3c009c711fb16f5c6e7a274505d.patch
+61f862cda24e7b14e55e9a9ce3a537adfc7a1c77e0670255dc485886e2c19156ddaf49fdd88b629ddde3cf25a83fd603678caebb96e18f59245917d3a2e51bb0  6eea4ace62fa6414432692ee44f0c0a3d541d97a.patch
 "
@@ -1,95 +0,0 @@
-diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
-index 968c7943653e..73eda2984053 100644
--- a/arch/arm/boot/dts/exynos4412-midas.dtsi
-+++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
-@@ -17,6 +17,7 @@
- #include <dt-bindings/interrupt-controller/irq.h>
- #include <dt-bindings/clock/maxim,max77686.h>
- #include <dt-bindings/pinctrl/samsung.h>
-+#include <dt-bindings/leds/common.h>
- 
- / {
- 	compatible = "samsung,midas", "samsung,exynos4412", "samsung,exynos4";
-@@ -24,6 +25,7 @@ / {
- 	aliases {
- 		i2c11 = &i2c_max77693;
- 		i2c12 = &i2c_max77693_fuel;
-+		i2c13 = &i2c_an30259a;
- 	};
- 
- 	chosen {
-@@ -170,7 +170,7 @@ i2c_max77693: i2c-gpio-1 {
- 		#address-cells = <1>;
- 		#size-cells = <0>;
- 
-		pmic@66 {
-+		max77693_pmic: pmic@66 {
- 			compatible = "maxim,max77693";
- 			interrupt-parent = <&gpx1>;
- 			interrupts = <5 IRQ_TYPE_LEVEL_LOW>;
-@@ -249,6 +251,39 @@ touchkey@20 {
- 			linux,keycodes = <KEY_BACK KEY_MENU>;
- 		};
- 	};
-+	
-+	i2c_an30259a: i2c-gpio-5 {
-+		compatible = "i2c-gpio";
-+		gpios = <&gpf2 7 GPIO_ACTIVE_HIGH>, <&gpf2 6 GPIO_ACTIVE_HIGH>;
-+		i2c-gpio,delay-us = <2>;
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		led-controller@30 {
-+			compatible = "panasonic,an30259a";
-+			reg = <0x30>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			led@1 {
-+				reg = <1>;
-+				function = LED_FUNCTION_STATUS;
-+				color = <LED_COLOR_ID_RED>;
-+			};
-+
-+			led@2 {
-+				reg = <2>;
-+				function = LED_FUNCTION_STATUS;
-+				color = <LED_COLOR_ID_GREEN>;
-+			};
-+
-+			led@3 {
-+				reg = <3>;
-+				function = LED_FUNCTION_STATUS;
-+				color = <LED_COLOR_ID_BLUE>;
-+			};
-+		};
-+	};
- 
- 	i2c-mhl {
- 		compatible = "i2c-gpio";
-diff --git a/arch/arm/boot/dts/exynos4412-n710x.dts b/arch/arm/boot/dts/exynos4412-n710x.dts
-index 9ae05b0d684c..b63d6920aa13 100644
--- a/arch/arm/boot/dts/exynos4412-n710x.dts
-+++ b/arch/arm/boot/dts/exynos4412-n710x.dts
-@@ -138,6 +138,21 @@ &ldo25_reg {
- 	regulator-max-microvolt = <3000000>;
- };
- 
-+&max77693_pmic {
-+	led {
-+		compatible = "maxim,max77693-led";
-+		maxim,boost-mode = <LEDS_BOOST_ADAPTIVE>;
-+		maxim,boost-mvout = <5000>;
-+		camera-flash {
-+			label = "white:flash";
-+			led-sources = <0>, <1>;
-+			led-max-microamp = <140625>;
-+			flash-max-microamp = <500000>;
-+			flash-max-timeout-us = <500000>;
-+		};
-+	};
-+};
-+
- &s5c73m3 {
- 	standby-gpios = <&gpm0 6 GPIO_ACTIVE_LOW>;   /* ISP_STANDBY */
- 	vdda-supply = <&cam_vdda_reg>;
@@ -1,32 +0,0 @@
-From afa77e0b9ca9ba36327aa42f8da43aea4b891f29 Mon Sep 17 00:00:00 2001
-From: Newbyte <newbie13xd@gmail.com>
-Date: Thu, 24 Mar 2022 11:25:26 +0100
-Subject: [PATCH] drm: Allow DRM_IOCTL_MODE_CREATE_DUMB on render nodes
-
-Due to a change in Mesa, the render node ends up being picked
-instead of the primary node when using Exynos DRM kmsro. In turn,
-this results in that dumb buffers cannot be allocated with
-DRM_IOCTL_MODE_CREATE_DUMB, so many applications crash. This works
-around that by allowing dumb buffers to be created by render nodes.
-
-Mesa issue: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5510
---
- drivers/gpu/drm/drm_ioctl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
-index 51fcf1298023..eada5e9aac89 100644
--- a/drivers/gpu/drm/drm_ioctl.c
-+++ b/drivers/gpu/drm/drm_ioctl.c
-@@ -672,7 +672,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
- 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb_ioctl, 0),
- 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_PAGE_FLIP, drm_mode_page_flip_ioctl, DRM_MASTER),
- 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl, DRM_MASTER),
-	DRM_IOCTL_DEF(DRM_IOCTL_MODE_CREATE_DUMB, drm_mode_create_dumb_ioctl, 0),
-+	DRM_IOCTL_DEF(DRM_IOCTL_MODE_CREATE_DUMB, drm_mode_create_dumb_ioctl, DRM_RENDER_ALLOW),
- 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_MAP_DUMB, drm_mode_mmap_dumb_ioctl, 0),
- 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DESTROY_DUMB, drm_mode_destroy_dumb_ioctl, 0),
- 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_GETPROPERTIES, drm_mode_obj_get_properties_ioctl, 0),
-- 
-2.35.1
-
@@ -1,82 +0,0 @@
-From patchwork Thu Feb  3 20:29:47 2022
-Subject: [PATCH v2 1/2] ARM: dts: exynos: add charger and battery to p4note
-Date: Thu,  3 Feb 2022 21:29:47 +0100
-Message-Id: 
- <d7f7b0f87a18b5cc44ba97390461c15469439829.1643919230.git.martin.juecker@gmail.com>
-X-Mailer: git-send-email 2.25.1
-MIME-Version: 1.0
-Precedence: bulk
-List-ID: <linux-samsung-soc.vger.kernel.org>
-X-Mailing-List: linux-samsung-soc@vger.kernel.org
-
-Add device tree entry to support the Summit SMB347 charger which is
-built into the p4note devices, as well as a simple battery node.
-
-Signed-off-by: Martin Jücker <martin.juecker@gmail.com>
---
-Changes in v2:
-  - squash charger and battery commits
---
- arch/arm/boot/dts/exynos4412-p4note.dtsi | 35 ++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
-diff --git a/arch/arm/boot/dts/exynos4412-p4note.dtsi b/arch/arm/boot/dts/exynos4412-p4note.dtsi
-index b386a9b8e188..fcd75cceb877 100644
--- a/arch/arm/boot/dts/exynos4412-p4note.dtsi
-+++ b/arch/arm/boot/dts/exynos4412-p4note.dtsi
-@@ -16,6 +16,7 @@
- #include <dt-bindings/input/linux-event-codes.h>
- #include <dt-bindings/interrupt-controller/irq.h>
- #include <dt-bindings/pinctrl/samsung.h>
-+#include <dt-bindings/power/summit,smb347-charger.h>
- 
- / {
- 	compatible = "samsung,p4note", "samsung,exynos4412", "samsung,exynos4";
-@@ -114,6 +115,17 @@ wlan_pwrseq: sdhci3-pwrseq {
- 		clock-names = "ext_clock";
- 	};
- 
-+	battery_cell: battery-cell {
-+		compatible = "simple-battery";
-+		device-chemistry = "lithium-ion";
-+		constant-charge-current-max-microamp = <2200000>;
-+		precharge-current-microamp = <250000>;
-+		charge-term-current-microamp = <250000>;
-+		constant-charge-voltage-max-microvolt = <4200000>;
-+
-+		power-supplies = <&power_supply>;
-+	};
-+
- 	i2c-gpio-1 {
- 		compatible = "i2c-gpio";
- 		sda-gpios = <&gpy2 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-@@ -182,6 +194,29 @@ stmpe_adc {
- 			};
- 		};
- 	};
-+
-+	i2c-gpio-4 {
-+		compatible = "i2c-gpio";
-+		sda-gpios = <&gpm2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-+		scl-gpios = <&gpm2 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-+
-+		i2c-gpio,delay-us = <2>;
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		power_supply: charger@6 {
-+			compatible = "summit,smb347";
-+			reg = <0x6>;
-+			summit,enable-usb-charging;
-+			summit,enable-charge-control = <SMB3XX_CHG_ENABLE_SW>;
-+			summit,fast-voltage-threshold-microvolt = <2600000>;
-+			summit,chip-temperature-threshold-celsius = <130>;
-+			summit,usb-current-limit-microamp = <1800000>;
-+
-+			monitored-battery = <&battery_cell>;
-+		};
-+	};
-+
- };
- 
- &adc {
@@ -4,8 +4,8 @@

 _flavor="postmarketos-qcom-msm8916"
 pkgname=linux-$_flavor
-pkgver=5.17
-pkgrel=0
+pkgver=5.15
+pkgrel=1
 pkgdesc="Mainline kernel fork for Qualcomm MSM8916 devices"
 arch="aarch64 armv7"
 url="https://github.com/msm8916-mainline/linux"
@@ -41,6 +41,8 @@ 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
 "
@@ -72,7 +74,9 @@ package() {
 }

 sha512sums="
-b702f5fe31e017c73e1841b18b36cf56a9dde92c71cee921f37a84024ef290199aba1b02db497b3a4b54f01b6a1636ad27de649454abca7fa1c63ff2f86b0919  linux-postmarketos-qcom-msm8916-v5.17-msm8916.tar.gz
-7d2dfefd615eee49bf83065d5c8ac0e260fd1ee30fcb264a8cf794490444a894005e9517a9674df7635ba65b182b1b8eab1c61a639ef3dbbb9e853a1b9437512  config-postmarketos-qcom-msm8916.aarch64
-384b41020f93fde33fb46251491282147bcde51c14e953653f6fd058131dc5f95c3c2246511941e49aae05ef241b5fffac4dbb455bf534af1caed5d31710108b  config-postmarketos-qcom-msm8916.armv7
+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
 "
@@ -3,7 +3,7 @@

 _flavor="postmarketos-qcom-msm8996"
 pkgname=linux-$_flavor
-pkgver=5.17.6
+pkgver=5.16.12
 pkgrel=0
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices"
 arch="aarch64"
@@ -53,6 +53,6 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb
 }
 sha512sums="
-cd303502509198b52c4d818388645ecc20729cd751d6283d8dd3013cb12f7e17498d1ceab26fbc15c78b32d8b86a33f6b3e708dca1b8de4f811c0588078b981a  linux-v5.17.6-msm8996.tar.gz
-6e779ee346d73b8ff6ee827d32133d24a5ac6e7e98f7ec7ac8e94719a32cc873720beb6a8080edafdbe2c787dbce34bfbd380eb6b062713d771bed306589b7e9  config-postmarketos-qcom-msm8996.aarch64
+2cbe733bf4c76417ff7f0222564dcfb8d1c183d74c926dd0959b9b3ed794899d3306cce7b1c78d34400ca6c9bed6ae4fe6e52d5e9cc86fef4ec26f45bfdc426b  linux-v5.16.12-msm8996.tar.gz
+aec533a349a2fc7e9ad8bc0ee9bc574f387d22bb75b03a1735761e2f89bf209341e5353d886651d67bb01676e75709f399d908715eb7dcc547baa70a63503c14  config-postmarketos-qcom-msm8996.aarch64
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.17.6 Kernel Configuration
+# Linux/arm64 5.16.12 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
@@ -220,6 +220,7 @@ 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
@@ -360,7 +361,6 @@ CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_1508412=y
 CONFIG_ARM64_ERRATUM_2051678=y
-CONFIG_ARM64_ERRATUM_2077057=y
 CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
 CONFIG_ARM64_ERRATUM_2054223=y
 CONFIG_ARM64_ERRATUM_2067961=y
@@ -397,6 +397,10 @@ CONFIG_NR_CPUS=256
 CONFIG_HOTPLUG_CPU=y
 CONFIG_NUMA=y
 CONFIG_NODES_SHIFT=2
+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
@@ -405,6 +409,7 @@ 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,7 +420,6 @@ 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
@@ -437,8 +441,6 @@ 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
@@ -677,7 +679,6 @@ 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
@@ -731,7 +732,6 @@ CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
-CONFIG_BLK_ICQ=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_INTEGRITY_T10=y
@@ -833,16 +833,13 @@ CONFIG_MEMORY_FAILURE=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE 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_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=y
 # CONFIG_ZBUD is not set
 CONFIG_Z3FOLD=y
@@ -861,7 +858,6 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 # CONFIG_GUP_TEST is not set
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# CONFIG_ANON_VMA_NAME is not set

 #
 # Data Access Monitoring
@@ -983,6 +979,7 @@ 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
@@ -1396,7 +1393,6 @@ CONFIG_RFKILL_LEDS=y
 # CONFIG_RFKILL_INPUT is not set
 # CONFIG_RFKILL_GPIO is not set
 CONFIG_NET_9P=y
-CONFIG_NET_9P_FD=y
 CONFIG_NET_9P_VIRTIO=y
 # CONFIG_NET_9P_XEN is not set
 # CONFIG_NET_9P_DEBUG is not set
@@ -1545,7 +1541,6 @@ CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
 # CONFIG_DEVTMPFS_MOUNT is not set
-# CONFIG_DEVTMPFS_SAFE is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y

@@ -1815,6 +1810,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_XEN_BLKDEV_BACKEND 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
@@ -2501,7 +2497,6 @@ 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 is not set
 CONFIG_SERIAL_OF_PLATFORM=y

 #
@@ -2741,11 +2736,11 @@ CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
-# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
-# CONFIG_PINCTRL_OCELOT is not set
 # CONFIG_PINCTRL_SINGLE is not set
-# CONFIG_PINCTRL_STMFX is not set
 # 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_MSM=y
 # CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_APQ8084 is not set
@@ -2778,11 +2773,9 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=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 is not set
 # CONFIG_PINCTRL_SM8250 is not set
 # CONFIG_PINCTRL_SM8350 is not set
-# CONFIG_PINCTRL_SM8450 is not set
 # CONFIG_PINCTRL_LPASS_LPI is not set

 #
@@ -2873,7 +2866,6 @@ CONFIG_GPIO_XGENE=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 is not set
@@ -2920,7 +2912,6 @@ CONFIG_BATTERY_BQ27XXX_I2C=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_QCOM_SMBB is not set
 CONFIG_CHARGER_QCOM_SMBCHG=y
 # CONFIG_CHARGER_BQ2415X is not set
@@ -3045,7 +3036,6 @@ 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
@@ -3075,7 +3065,6 @@ 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
@@ -3284,6 +3273,7 @@ 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
@@ -3326,7 +3316,6 @@ 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
@@ -3614,7 +3603,6 @@ CONFIG_VIDEO_IMX318=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
@@ -3728,8 +3716,7 @@ CONFIG_DRM_SCHED=m
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_USE_LVDS is not set
-# CONFIG_DRM_RCAR_MIPI_DSI is not set
+# CONFIG_DRM_RCAR_LVDS is not set
 # CONFIG_DRM_QXL is not set
 # CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_MSM=m
@@ -3753,7 +3740,6 @@ 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 is not set
@@ -3779,7 +3765,6 @@ CONFIG_DRM_PANEL_LGPHILIPS_SW43101=m
 # 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 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
@@ -3814,7 +3799,6 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E3FA5=m
 # CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 CONFIG_DRM_PANEL_SONY_SYNAPTICS_JDI=m
-# 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
@@ -3876,7 +3860,6 @@ CONFIG_DRM_PANEL_BRIDGE=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
@@ -3892,7 +3875,6 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
-CONFIG_DRM_NOMODESET=y

 #
 # Frame buffer Devices
@@ -4068,7 +4050,6 @@ 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
@@ -4145,7 +4126,6 @@ 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
@@ -4252,7 +4232,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
 CONFIG_SND_SOC_TFA989X=m
-# 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
@@ -4377,7 +4356,6 @@ 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
@@ -4499,7 +4477,6 @@ 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
@@ -4834,10 +4811,6 @@ 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
@@ -5160,7 +5133,6 @@ CONFIG_ASHMEM=y
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
-# CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -5184,7 +5156,6 @@ 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 is not set
@@ -5221,7 +5192,6 @@ CONFIG_QCOM_CLK_SMD_RPM=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 is not set
 CONFIG_MSM_GCC_8996=y
@@ -5258,14 +5228,12 @@ CONFIG_MSM_MMCC_8996=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_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
 # CONFIG_SM_GCC_6350 is not set
 # CONFIG_SM_GCC_8150 is not set
 # CONFIG_SM_GCC_8250 is not set
 # CONFIG_SM_GCC_8350 is not set
-# CONFIG_SM_GCC_8450 is not set
 # CONFIG_SM_GPUCC_8150 is not set
 # CONFIG_SM_GPUCC_8250 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
@@ -5592,12 +5560,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # 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
 #
@@ -5655,7 +5617,6 @@ CONFIG_QCOM_SPMI_ADC5=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
@@ -5675,7 +5636,6 @@ CONFIG_QCOM_SPMI_ADC5=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
@@ -5699,12 +5659,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 #
 # end of IIO dummy driver

-#
-# Filters
-#
-# CONFIG_ADMV8818 is not set
-# end of Filters
-
 #
 # Frequency Synthesizers DDS/PLL
 #
@@ -5720,7 +5674,6 @@ CONFIG_QCOM_SPMI_ADC5=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
@@ -6017,15 +5970,12 @@ 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
@@ -6052,7 +6002,6 @@ CONFIG_PHY_QCOM_USB_SS=y
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
-# CONFIG_HISI_PCIE_PMU is not set
 # end of Performance monitor support

 CONFIG_RAS=y
@@ -6125,7 +6074,6 @@ CONFIG_INTERCONNECT_QCOM=y
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 CONFIG_INTERCONNECT_QCOM_MSM8996=y
 # CONFIG_INTERCONNECT_QCOM_OSM_L3 is not set
-# CONFIG_INTERCONNECT_QCOM_QCM2290 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 # CONFIG_INTERCONNECT_QCOM_SDM660 is not set
 CONFIG_INTERCONNECT_QCOM_SMD_RPM=y
@@ -6450,7 +6398,6 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 # end of Kernel hardening options
 # end of Security options

-CONFIG_XOR_BLOCKS=y
 CONFIG_CRYPTO=y

 #
@@ -6602,6 +6549,25 @@ CONFIG_CRYPTO_USER_API_RNG=y
 # 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=y
+CONFIG_CRYPTO_LIB_BLAKE2S=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA=y
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
+CONFIG_CRYPTO_LIB_CURVE25519=y
+CONFIG_CRYPTO_LIB_DES=y
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
+CONFIG_CRYPTO_LIB_POLY1305=y
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y
+CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
@@ -6651,6 +6617,7 @@ 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
@@ -6659,26 +6626,6 @@ 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=y
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
-CONFIG_CRYPTO_LIB_CHACHA=y
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
-CONFIG_CRYPTO_LIB_CURVE25519=y
-CONFIG_CRYPTO_LIB_DES=y
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
-CONFIG_CRYPTO_LIB_POLY1305=y
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y
-CONFIG_CRYPTO_LIB_SHA256=y
-# end of Crypto library routines
-
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
@@ -6844,21 +6791,12 @@ 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=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
 #
@@ -7003,12 +6941,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
@@ -7026,7 +6964,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_SIPHASH is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
@@ -5,7 +5,7 @@

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

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

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

 sha512sums="
-7fdeb034628c2440d015b68dfff7bf491ba170d365b604e59e79885da440a6d37bb1042cb8e35893cd9277c463b60c7a9a1fe8434d24be9cd0e169a34091e559  linux-sdm845-5.17.5.tar.gz
-11e1176e01e3199ad6f5da76e8c436c2452a520f354cfc51848faa41521c079d935b70c8284018dfa93602d39ec4a7922c15e81d32e4f38b17971c90fc234a0a  config-postmarketos-qcom-sdm845.aarch64
+f30d0992c5b3cb3198841f71a94a2306425211601e3fa347b3e39780fd1be0b3becc2c5eee870744a2d7a5821c66937d594f3ccfe59f38ceb6acb2e21c205504  linux-sdm845-5.16.12.tar.gz
+5fe621ec5413cc7a4408ca58e7599435fee0063582f7f50e4b8378bddb574b7ed63644d31778bc6660ff221331c0574fa14c02fd496ae15b7b6cb4a318f4ebfb  config-postmarketos-qcom-sdm845.aarch64
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.17.5 Kernel Configuration
+# Linux/arm64 5.16.12 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,6 +216,7 @@ 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
@@ -234,7 +235,6 @@ 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,7 +355,6 @@ 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,6 +391,10 @@ 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
@@ -400,6 +403,7 @@ 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
@@ -411,7 +415,6 @@ 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
@@ -433,8 +436,6 @@ 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
@@ -621,11 +622,9 @@ 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
@@ -736,7 +735,6 @@ 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
@@ -890,16 +888,13 @@ CONFIG_MEMORY_FAILURE=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE 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_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=19
-# CONFIG_ZSWAP is not set
 # CONFIG_ZPOOL is not set
 CONFIG_ZSMALLOC=m
 CONFIG_ZSMALLOC_STAT=y
@@ -916,7 +911,6 @@ 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
@@ -1060,6 +1054,7 @@ 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
@@ -1633,7 +1628,6 @@ 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

@@ -1752,7 +1746,6 @@ 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
@@ -1797,6 +1790,7 @@ 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
@@ -2078,6 +2072,8 @@ CONFIG_BCMGENET=m
 # CONFIG_BNX2X is not set
 # CONFIG_SYSTEMPORT is not set
 # CONFIG_BNXT is not set
+CONFIG_NET_VENDOR_BROCADE=y
+# CONFIG_BNA is not set
 CONFIG_NET_VENDOR_CADENCE=y
 # CONFIG_MACB is not set
 CONFIG_NET_VENDOR_CAVIUM=y
@@ -2105,8 +2101,6 @@ 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
@@ -2135,6 +2129,7 @@ CONFIG_E1000E=y
 # CONFIG_ICE is not set
 # CONFIG_FM10K is not set
 # CONFIG_IGC is not set
+CONFIG_NET_VENDOR_MICROSOFT=y
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_LITEX=y
 # CONFIG_LITEX_LITEETH is not set
@@ -2161,14 +2156,11 @@ 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_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_FEALNX is not set
-# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NS83820 is not set
@@ -2177,6 +2169,7 @@ CONFIG_NET_VENDOR_NETERION=y
 # CONFIG_VXGE is not set
 CONFIG_NET_VENDOR_NETRONOME=y
 # CONFIG_NFP is not set
+# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_NE2K_PCI is not set
 CONFIG_NET_VENDOR_NVIDIA=y
@@ -2193,8 +2186,6 @@ CONFIG_NET_VENDOR_QLOGIC=y
 # CONFIG_QLCNIC is not set
 # CONFIG_NETXEN_NIC is not set
 # CONFIG_QED is not set
-CONFIG_NET_VENDOR_BROCADE=y
-# CONFIG_BNA is not set
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
@@ -2212,14 +2203,14 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SAMSUNG=y
 # CONFIG_SXGBE_ETH is not set
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+# CONFIG_SFC is not set
+# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SILAN=y
 # CONFIG_SC92031 is not set
 CONFIG_NET_VENDOR_SIS=y
 # CONFIG_SIS900 is not set
 # CONFIG_SIS190 is not set
-CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
-# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_SMC91X is not set
 # CONFIG_EPIC100 is not set
@@ -2240,8 +2231,6 @@ 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
@@ -2305,7 +2294,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=y
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DP83869_PHY is not set
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_XILINX_GMII2RGMII is not set
@@ -2606,7 +2595,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_FOCALTECH_FTS=m
+CONFIG_TOUCHSCREEN_FTS=m
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 CONFIG_TOUCHSCREEN_GOODIX=m
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
@@ -2677,7 +2666,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=m
+# CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_PWM_VIBRA=m
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_DA7280_HAPTICS is not set
@@ -2765,7 +2754,6 @@ 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

 #
@@ -2829,11 +2817,11 @@ CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_BA431 is not set
 # CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_CAVIUM is not set
 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
@@ -3039,11 +3027,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_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_STMFX is not set
+# CONFIG_PINCTRL_OCELOT is not set
+# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_APQ8084 is not set
@@ -3077,11 +3065,9 @@ 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

 #
@@ -3176,7 +3162,6 @@ 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
@@ -3222,7 +3207,6 @@ 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
@@ -3293,7 +3277,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=m
+# CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_POWR1220 is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LTC2945 is not set
@@ -3352,7 +3336,6 @@ CONFIG_SENSORS_JC42=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
@@ -3382,7 +3365,6 @@ CONFIG_SENSORS_JC42=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
@@ -3600,6 +3582,7 @@ 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
@@ -3644,7 +3627,6 @@ 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
@@ -3854,14 +3836,13 @@ 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=m
+# CONFIG_VIDEO_OV5640 is not set
 # 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
@@ -3945,7 +3926,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=m
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y

 #
@@ -3975,8 +3956,7 @@ 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_USE_LVDS=y
-# CONFIG_DRM_RCAR_MIPI_DSI is not set
+# CONFIG_DRM_RCAR_LVDS is not set
 # CONFIG_DRM_QXL is not set
 # CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_MSM=y
@@ -3999,7 +3979,6 @@ 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
@@ -4015,7 +3994,6 @@ 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
@@ -4025,7 +4003,6 @@ 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
@@ -4057,7 +4034,6 @@ 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
@@ -4122,7 +4098,6 @@ 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
@@ -4143,7 +4118,6 @@ 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
@@ -4364,7 +4338,6 @@ 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
@@ -4413,8 +4386,6 @@ 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
@@ -4446,7 +4417,6 @@ 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
@@ -4555,12 +4525,10 @@ 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=m
-CONFIG_SND_SOC_TLV320AIC32X4=m
-CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
@@ -4684,7 +4652,6 @@ 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
@@ -4808,7 +4775,6 @@ 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
@@ -5212,10 +5178,6 @@ 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
@@ -5262,7 +5224,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=m
+# CONFIG_RTC_DRV_PCF85063 is not set
 # CONFIG_RTC_DRV_PCF85363 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
@@ -5522,7 +5484,6 @@ 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

 #
@@ -5586,7 +5547,6 @@ 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
@@ -5623,7 +5583,6 @@ 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
@@ -5660,7 +5619,6 @@ 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
@@ -5668,7 +5626,6 @@ 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
@@ -6002,12 +5959,6 @@ 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
 #
@@ -6074,7 +6025,6 @@ 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
@@ -6094,7 +6044,6 @@ 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
@@ -6118,12 +6067,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # end of IIO dummy driver

-#
-# Filters
-#
-# CONFIG_ADMV8818 is not set
-# end of Filters
-
 #
 # Frequency Synthesizers DDS/PLL
 #
@@ -6139,7 +6082,6 @@ 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
@@ -6447,15 +6389,12 @@ 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
@@ -6488,7 +6427,6 @@ CONFIG_QCOM_L3_PMU=y
 # CONFIG_ARM_SPE_PMU is not set
 # CONFIG_ARM_DMC620_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
@@ -6541,9 +6479,7 @@ 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
@@ -6556,7 +6492,6 @@ 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
@@ -6871,7 +6806,6 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 # end of Kernel hardening options
 # end of Security options

-CONFIG_XOR_BLOCKS=m
 CONFIG_CRYPTO=y

 #
@@ -6968,7 +6902,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=y
+CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SM3=m
@@ -7016,7 +6950,6 @@ 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
@@ -7025,6 +6958,26 @@ 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
@@ -7072,6 +7025,7 @@ 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
@@ -7080,27 +7034,6 @@ 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
@@ -7274,13 +7207,6 @@ 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
 #
@@ -7426,12 +7352,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
@@ -7449,7 +7375,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_SIPHASH is not set
+# CONFIG_TEST_HASH 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
-381064728710b2e74fbf623e7ce2ab84251ec656030e8c96c5f7630afd9e6786f725791ef5b4493eb6c821a0b87126e391a94b0ffc6999c4580f870b9cdfa1c8  config-postmarketos-rockchip.armv7
+62a05ed0d8f040981454216939b044cc48deb4aa566e952b6bca2881b21e28f7f68e9a5d399ec5a5ec545ac3898757cdf139b1f1554841d73bf8a841ae407e6f  config-postmarketos-rockchip.armv7
 "
@@ -0,0 +1,47 @@
+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,104 +0,0 @@
-Patch picked from https://raw.githubusercontent.com/hansemro/kc1-linux/v5.16.x/patches/0006-Add-clk32kg-to-twl6030.patch
-
-
-From 6418e8fe6b80d906ac5a1d3570dd92ab0e7ec3e8 Mon Sep 17 00:00:00 2001
-From: Hansem Ro <hansemro@outlook.com>
-Date: Wed, 12 May 2021 18:26:38 -0700
-Subject: [PATCH] Add clk32kg to twl6030
-
-Needed for wl1271/wlcore driver bringup on Kindle Fire.
-
-Patch from Robert Nelson:
-https://github.com/RobertCNelson/armv7-multiplatform/commit/27fd28715ecf47dee1f36e70faecc1243125b06d
-
-
-
-This patch also fixes a WiFi reboot issue on Samsung Galaxy Tab 2 7.0 tablet,
-see https://gitlab.com/postmarketOS/pmaports/-/issues/1211
-
---
- arch/arm/boot/dts/twl6030.dtsi        |  5 +++++
- drivers/regulator/twl6030-regulator.c | 23 +++++++++++++++++++++++
- 2 files changed, 28 insertions(+)
-
-diff --git a/arch/arm/boot/dts/twl6030.dtsi b/arch/arm/boot/dts/twl6030.dtsi
-index 9d588cfaa5cb..4eee3133ce4e 100644
--- a/arch/arm/boot/dts/twl6030.dtsi
-+++ b/arch/arm/boot/dts/twl6030.dtsi
-@@ -97,6 +97,11 @@ twl_pwmled: pwmled {
- 		#pwm-cells = <2>;
- 	};
- 
-+	clk32kg: regulator-clk32kg {
-+		compatible = "ti,twl6030-clk32kg";
-+		regulator-always-on;
-+	};
-+
- 	gpadc {
- 		compatible = "ti,twl6030-gpadc";
- 		interrupts = <3>;
-diff --git a/drivers/regulator/twl6030-regulator.c b/drivers/regulator/twl6030-regulator.c
-index 430265c404d6..8ee55a0e3d2f 100644
--- a/drivers/regulator/twl6030-regulator.c
-+++ b/drivers/regulator/twl6030-regulator.c
-@@ -299,6 +299,13 @@ static const struct regulator_ops twl6030fixed_ops = {
- 	.get_status	= twl6030reg_get_status,
- };
- 
-+static struct regulator_ops twl6030_fixed_resource = {
-+	.enable	= twl6030reg_enable,
-+	.disable	= twl6030reg_disable,
-+	.is_enabled	= twl6030reg_is_enabled,
-+	.get_status	= twl6030reg_get_status,
-+};
-+
- /*
-  * SMPS status and control
-  */
-@@ -572,6 +579,19 @@ static const struct twlreg_info TWLSMPS_INFO_##label = { \
- 		}, \
- 	}
- 
-+#define TWL6030_FIXED_RESOURCE(label, offset, turnon_delay) \
-+static struct twlreg_info TWLRES_INFO_##label = { \
-+	.base = offset, \
-+	.desc = { \
-+		.name = #label, \
-+		.id = TWL6030_REG_##label, \
-+		.ops = &twl6030_fixed_resource, \
-+		.type = REGULATOR_VOLTAGE, \
-+		.owner = THIS_MODULE, \
-+		.enable_time = turnon_delay, \
-+		}, \
-+	}
-+
- /* VUSBCP is managed *only* by the USB subchip */
- /* 6030 REG with base as PMC Slave Misc : 0x0030 */
- /* Turnon-delay and remap configuration values for 6030 are not
-@@ -601,6 +621,7 @@ TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 0);
- TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0);
- TWL6030_FIXED_LDO(V1V8, 0x16, 1800, 0);
- TWL6030_FIXED_LDO(V2V1, 0x1c, 2100, 0);
-+TWL6030_FIXED_RESOURCE(CLK32KG, 0x8C, 0);
- TWL6032_ADJUSTABLE_SMPS(SMPS3, 0x34);
- TWL6032_ADJUSTABLE_SMPS(SMPS4, 0x10);
- TWL6032_ADJUSTABLE_SMPS(VIO, 0x16);
-@@ -632,6 +653,7 @@ static u8 twl_get_smps_mult(void)
- #define TWL6030_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6030, label)
- #define TWL6032_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6032, label)
- #define TWLFIXED_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLFIXED, label)
-+#define TWLRES_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLRES, label)
- #define TWLSMPS_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLSMPS, label)
- 
- static const struct of_device_id twl_of_match[] = {
-@@ -659,6 +681,7 @@ static const struct of_device_id twl_of_match[] = {
- 	TWLFIXED_OF_MATCH("ti,twl6030-vusb", VUSB),
- 	TWLFIXED_OF_MATCH("ti,twl6030-v1v8", V1V8),
- 	TWLFIXED_OF_MATCH("ti,twl6030-v2v1", V2V1),
-+	TWLRES_OF_MATCH("ti,twl6030-clk32kg", CLK32KG),
- 	TWLSMPS_OF_MATCH("ti,twl6032-smps3", SMPS3),
- 	TWLSMPS_OF_MATCH("ti,twl6032-smps4", SMPS4),
- 	TWLSMPS_OF_MATCH("ti,twl6032-vio", VIO),
-- 
-2.31.1
-
@@ -0,0 +1,110 @@
+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.17.0
-pkgrel=1
+pkgver=5.15.2
+pkgrel=4
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch) mainline kernel"
 arch="armv7"
 _carch="arm"
@@ -16,21 +16,18 @@ 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="
-	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
-	03-Add-clk32kg-to-twl6030-and-fix-wifi-reboot-issue.patch
+	$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
 	$_config
 "
-builddir="$srcdir/linux-$_kernver"
+builddir="$srcdir/linux_openpvrsgx-$_commit"

 prepare() {
 	default_prepare
@@ -57,10 +54,11 @@ package() {
 }

 sha512sums="
-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
-c98479208876387a0e9b3aabe9e496ed41af348b459d9180ce48d08b556578e3e607727e14e2fc9569d7fd86dce539f97f6341a4b010e59fd7fc1da4600c2b88  03-Add-clk32kg-to-twl6030-and-fix-wifi-reboot-issue.patch
-3bf676ddaf2201088c223b5f67933041d47b0cb20aefb678af271887107658f334fb6f3a778470a824b1c1a1a256ac68e17bded27c6d661f7b0a92eb15326fa3  config-samsung-espresso3g.armv7
+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
 "
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.17.0 Kernel Configuration
+# Linux/arm 5.15.2 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 11.2.1_git20211128) 11.2.1 20211128"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=110201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23800
+CONFIG_AS_VERSION=23700
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23800
+CONFIG_LD_VERSION=23700
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -17,7 +17,6 @@ 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
@@ -67,6 +66,7 @@ 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,7 +100,6 @@ 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
@@ -151,7 +150,6 @@ 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
@@ -211,6 +209,7 @@ 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
@@ -277,6 +276,7 @@ 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,7 +415,6 @@ 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
@@ -464,7 +463,6 @@ 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
@@ -702,8 +700,6 @@ 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
@@ -845,11 +841,12 @@ 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
@@ -858,8 +855,6 @@ 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
@@ -953,8 +948,6 @@ 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
@@ -993,6 +986,7 @@ 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
@@ -1380,6 +1374,8 @@ 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

@@ -1599,7 +1595,6 @@ 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

@@ -1618,7 +1613,6 @@ 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
@@ -1827,6 +1821,7 @@ 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
@@ -1844,6 +1839,7 @@ 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
@@ -1854,6 +1850,7 @@ 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
@@ -2138,7 +2135,6 @@ 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

@@ -2157,6 +2153,7 @@ 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
@@ -2167,7 +2164,6 @@ 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
@@ -2197,8 +2193,6 @@ 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
@@ -2231,8 +2225,6 @@ 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
@@ -2326,8 +2318,6 @@ 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
@@ -2507,6 +2497,8 @@ 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
@@ -2537,7 +2529,6 @@ 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
@@ -2549,7 +2540,6 @@ 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
@@ -2637,7 +2627,6 @@ 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
@@ -2805,10 +2794,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

 #
@@ -2964,7 +2953,6 @@ 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
@@ -3041,12 +3029,12 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_MCP23S08 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
+# 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

 #
 # Renesas pinctrl drivers
@@ -3144,7 +3132,6 @@ 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
@@ -3226,7 +3213,6 @@ 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
@@ -3312,7 +3298,6 @@ 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
@@ -3349,7 +3334,6 @@ 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
@@ -3379,7 +3363,6 @@ 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
@@ -3523,6 +3506,7 @@ 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
@@ -3580,6 +3564,7 @@ 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
@@ -3602,6 +3587,7 @@ 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
@@ -3646,7 +3632,6 @@ 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
@@ -3708,20 +3693,15 @@ 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
@@ -3931,7 +3911,6 @@ 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
@@ -3955,7 +3934,6 @@ 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
@@ -3968,7 +3946,6 @@ 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
@@ -4245,6 +4222,7 @@ 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
@@ -4252,7 +4230,8 @@ 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=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y

 #
 # I2C encoder or helper chips
@@ -4282,8 +4261,7 @@ 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_USE_LVDS is not set
-# CONFIG_DRM_RCAR_MIPI_DSI is not set
+# CONFIG_DRM_RCAR_LVDS is not set
 CONFIG_DRM_OMAP=y
 # CONFIG_OMAP2_DSS_DEBUG is not set
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
@@ -4310,13 +4288,11 @@ 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
@@ -4326,7 +4302,6 @@ 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
@@ -4336,7 +4311,6 @@ 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
@@ -4351,7 +4325,6 @@ 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
@@ -4362,13 +4335,11 @@ 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
@@ -4429,7 +4400,6 @@ 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
@@ -4443,6 +4413,12 @@ 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
@@ -4451,7 +4427,6 @@ 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
@@ -4555,7 +4530,6 @@ 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
@@ -4682,7 +4656,6 @@ 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
@@ -4757,7 +4730,6 @@ 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
@@ -4773,8 +4745,6 @@ 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
@@ -4807,7 +4777,6 @@ 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
@@ -4830,7 +4799,6 @@ 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
@@ -4854,7 +4822,6 @@ 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
@@ -4900,7 +4867,6 @@ 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
@@ -4913,8 +4879,6 @@ 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

 #
@@ -4965,7 +4929,6 @@ 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
@@ -4975,7 +4938,6 @@ 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
@@ -4984,7 +4946,6 @@ 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
@@ -4993,6 +4954,7 @@ 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
@@ -5492,10 +5454,6 @@ 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
@@ -5785,7 +5743,7 @@ CONFIG_COMMON_CLK=y
 #
 # Clock driver for ARM Reference designs
 #
-# CONFIG_CLK_ICST is not set
+# CONFIG_ICST is not set
 # CONFIG_CLK_SP810 is not set
 # end of Clock driver for ARM Reference designs

@@ -5799,7 +5757,6 @@ 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
@@ -5953,12 +5910,8 @@ 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
@@ -6062,12 +6015,6 @@ 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
 #
@@ -6097,12 +6044,10 @@ 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

@@ -6129,7 +6074,6 @@ 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
@@ -6149,7 +6093,6 @@ 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
@@ -6174,11 +6117,6 @@ 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
 #
@@ -6194,8 +6132,6 @@ 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

@@ -6442,7 +6378,6 @@ 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
@@ -6479,23 +6414,15 @@ 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
@@ -6733,7 +6660,6 @@ 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
@@ -7019,6 +6945,21 @@ 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
@@ -7065,23 +7006,6 @@ 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
@@ -7115,7 +7039,6 @@ 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
@@ -7238,11 +7161,6 @@ CONFIG_HAVE_KCSAN_COMPILER=y

 # CONFIG_DEBUG_KERNEL is not set

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

 #
@@ -7308,7 +7224,6 @@ 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
@@ -7388,7 +7303,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_SIPHASH is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
@@ -2,7 +2,7 @@
 # Co-Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
-pkgver=16
+pkgver=14
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -14,13 +14,11 @@ 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="23f9d6d4d12c13821d473d6f86908335d3a72026"
+_ucm_commit="d9c15108e4301e0dc0192fa15fddc83f623bca97"
 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
 	"

@@ -75,17 +73,8 @@ 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="
-807499a7620a0a7d51aa29fea157cf12f46bf4dcb05e5150f6c2355bf18d1805610988ad98d181e8ba69c8c9844e4d9a51f1553438d167ade89a387eabafd8f9  soc-qcom-msm8916-23f9d6d4d12c13821d473d6f86908335d3a72026.tar.gz
+274ef82a949ea51ec1a1628e4793f99d22982d34165cffb8cdfabb3247f3797987652c43ad81d29f49071d184241d873362a17a1694331f402b69a8dbda42aea  soc-qcom-msm8916-d9c15108e4301e0dc0192fa15fddc83f623bca97.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=6
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -17,7 +17,7 @@ subpackages="
 	$pkgname-ucm
 "

-_ucm_commit="621c71fd5f5742c60d38766ebb2d1bd3b863a2a4"
+_ucm_commit="f959b6c46165f23eebcf34ffefef14c6be015a55"
 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,16 +28,15 @@ 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 q6voiced q6voiced-openrc msm-modem"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="pd-mapper pd-mapper-openrc tqftpserv tqftpserv-openrc msm-modem"
+	install="$subpkgname.post-install"
 	mkdir "$subpkgdir"
-
-	install -Dm644 "$srcdir"/modemmanager.conf \
-		"$subpkgdir"/etc/conf.d/modemmanager
 }

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

 sha512sums="
-a1a6c6f5a6156e76e5a15b0078e3baedf07fa02b354cb025b1124ed688434a620d80aa8c0069b2d7ded1a29e2bb9318ab6e8f8a85af33a9dd2478a7b7ec6b494  alsa-ucm-conf-621c71fd5f5742c60d38766ebb2d1bd3b863a2a4.tar.gz
+48fba9c041a2a2dfef9f038dfeeb7f636ed4e3b4d1babe2bd9b6ee350a4a34472b0f20d69b57864aa79fb28b24bb38a88ef1542a6d3211db713b361a4d136745  alsa-ucm-conf-f959b6c46165f23eebcf34ffefef14c6be015a55.tar.gz
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 e33f41360ccc4900bb76a26cc7b46bde1fb90facdf45c4fbcebc80499386939948401cacd6df9f779eafab10f4ee77ee1fef3e7bd06f483f8c2a4a644c84f327  modemmanager.conf
 "
@@ -1,4 +1,3 @@
 #!/bin/sh
 rc-update add tqftpserv boot
 rc-update add pd-mapper boot
-rc-update add q6voiced default
@@ -1 +0,0 @@
-soc-qcom-sdm845-nonfree-firmware.post-install
@@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="max77693-haptic", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
@@ -1,29 +0,0 @@
-# Maintainer: Newbyte <newbyte@disroot.org>
-pkgname=soc-samsung-exynos4412
-pkgdesc="Common package for Samsung Exynos 4412 devices"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="BSD-3-Clause"
-arch="armv7"
-options="!check !archcheck !tracedeps"
-subpackages="
-	$pkgname-haptics
-"
-source="
-	90-feedbackd-max77693-haptic.rules
-"
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-haptics() {
-	# feedbackd haptics udev rules
-	install -Dm644 "$srcdir"/90-feedbackd-max77693-haptic.rules \
-		"$subpkgdir"/usr/lib/udev/rules.d/90-feedbackd-max77693-haptic.rules
-}
-
-sha512sums="
-083bd692bd52f6ea2dc80351b91c24d8856d3ecd68bb2823dd821073c31b0f2d4556a2b5d861bf4b709cb3b1a4dc4d28648834ee2dd09b795ebfa3b30182ae94  90-feedbackd-max77693-haptic.rules
-"
@@ -5,7 +5,7 @@
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 # Co-Maintainer: Dylan Van Assche <me@dylanvanassche.be>
 pkgname=device-pine64-pinephone
-pkgver=0.40
+pkgver=0.39
 pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
@@ -210,7 +210,7 @@ bac664c504d9a3adc6e3d25f24ac63cf7c449a82374544a5b56c259dc25af580897b9dc992865ac8
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 7dc2b7c20b4a2b15f597a6417bd01797643dad84a3683b0dee648e030fb6326e9d020307643fdcdf1bb43fc44af9975697e417003bd359610bae2d8ce614fc00  90-modem-eg25.rules
 ed0e03f7e1c0348c06be9a7922414469245604ce813bbf0c8910ef211cb993bbb0d0d4615c9c961d50712415f85d6b73e0cf02780ac784666aac56e4889341e4  UPower.conf
-4a3e607a8e8249668195c472ba181149add65be515360b4d0f465b9c798e7bf8b2f2e431eb3e95cd8620c2a580779c665762f0386239b2fb2a64352e46702edb  deviceinfo
+81f6bd25a8ba972bc73048baeda53835cb69d12b8fba47f465591f4a7a2b54e3d8811a0fcb2bda7aab7a25efbb1a6856bfe737dc15c123e50488e9048a988306  deviceinfo
 ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648  gpsd_device-hook.sh
 1017fc3f325227da58c77abdc59e9735288d91a7ccc63ec784fe0241c523786b617a11ce8045dab2a74ca12a7dd70aaa334af91836418db1e96a3266fecaa4fd  gpsd_pinephone.initd
 3dd6d612c381cb0002049d1974d8fb5aa5a53a1eb4d6bcbf62eb2ad52cfdc45f0f6ad24a699716d3513b0371aa1316f25dc72afc10d7176cc3b99d0965c3f030  hwtest.ini
@@ -8,7 +8,7 @@ deviceinfo_codename="pine64-pinephone"
 deviceinfo_year="2019"
 deviceinfo_dtb="allwinner/sun50i-a64-pinephone-1.1 allwinner/sun50i-a64-pinephone-1.2"
 # gpio_vibra: needed for osk-sdl haptic feedback
-deviceinfo_modules_initfs="sun6i_mipi_dsi sun4i_drm pwm_sun4i sun8i_mixer anx7688 gpio_vibra pinephone_keyboard"
+deviceinfo_modules_initfs="sun6i_mipi_dsi sun4i_drm pwm_sun4i sun8i_mixer anx7688 gpio_vibra kb151"
 deviceinfo_arch="aarch64"

 # Device related
@@ -0,0 +1,26 @@
+From 1b280dda3734d42b02474a0628314afc58c2065f Mon Sep 17 00:00:00 2001
+From: Clayton Craft <clayton@craftyguy.net>
+Date: Thu, 17 Jun 2021 16:59:55 -0700
+Subject: [PATCH] librem5-pm.udev: disable PM for broadmobi modem
+
+Workaround for https://source.puri.sm/Librem5/linux-next/-/issues/303
+---
+ debian/librem5-base-defaults.librem5-pm.udev | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/debian/librem5-base-defaults.librem5-pm.udev b/debian/librem5-base-defaults.librem5-pm.udev
+index dc005bb..6abdb10 100644
+--- a/debian/librem5-base-defaults.librem5-pm.udev
+++ b/debian/librem5-base-defaults.librem5-pm.udev
+@@ -9,7 +9,7 @@ DEVPATH=="/devices/platform/soc@0/38100000.usb", TEST=="power/control", ATTR{pow
+ ### Enable power management for internal USB devices:
+ 
+ # Broadmobi BM818
+-SUBSYSTEM=="usb", ATTRS{idVendor}=="2020", ATTR{idProduct}=="2060", TEST=="power/control", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="2020", ATTR{idProduct}=="2060", TEST=="power/control", ATTR{power/control}="on"
+ SUBSYSTEM=="usb", ATTRS{idVendor}=="2020", ATTR{idProduct}=="2060", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="2000"
+ 
+ # Cinterion PLS8
+-- 
+2.32.0
+
@@ -1,3 +0,0 @@
-# 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.32
+pkgver=1.29
 pkgrel=0
-_confver=49
+_confver=47
 _purismrel=1
 # <librem5-base ver>.<purism release>
 _purismver=${_confver}pureos$_purismrel
@@ -40,15 +40,14 @@ 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-tinydm
+	$pkgname-nonfree-firmware:nonfree_firmware
 "
 install="$pkgname.post-install $pkgname.post-upgrade"

@@ -80,13 +79,6 @@ 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"
@@ -138,24 +130,24 @@ package() {

 nonfree_firmware() {
 	pkgdesc="Wifi and Bluetooth firmware"
-	depends="firmware-siliconlabs-rs9116 firmware-brcm43752"
+	depends="firmware-siliconlabs-rs9116"
 	mkdir "$subpkgdir"
 }

 sha512sums="
-eb96cb23f2fe28ef528afe0d267453461611bfe7e8dffaf5afcd2de96f8e3c1f4612c3a9ec43feb50bbec8094ce31b5333ed85f14aaba5461e715024dff9ac9c  librem5-base-pureos-49pureos1.tar.gz
+e4729fbf111e691179d1aa11970c486315b88563782b46fddcfcb8e4ec02fb9a70a99cd3b74c039f26420d70a79b228f3bd8b0de8f995adfa2e9931e0275cb62  librem5-base-pureos-47pureos1.tar.gz
 2e72d9a084ecd6c96cafbbd8fda461ae8b2ebd14ffda601d9f36d73f08f04088213de17da078293ddd958d4c76d33148c7af6e252eb0709f6934855a55578509  00-mesa.sh
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6  77-mm-broadmobi-port-types.rules
-17c4cf3cfefddee8b47c62c311e177d829fc25140c56c2910ad37f64768e09dc209516d5f97c187ebdf5b1d7851ad7a3518ea5b16b01390b2906407c4f18eae1  deviceinfo
-ccb47fd421c5e35a8def8e6fb61dad99e42cf542690068a68f90c257e41d33f45f1069db0a8d89372d9029681812957033995639a6a8a5e3eed48019325e0f4d  flash_script.lst
+f67ff150e4113b1e4a1432daa52df595ce6a67d52d593918fc25215d138c9f6450b075ff095a49b9bce6391562d2833283742e3574e00fd6ad9a1d808b4e4623  deviceinfo
+2703c7a4e7f32cf102dfed644a8213497828ae1fe9f3bd789663157f79c8c8ddb05672e5c9a0c6883e9dee42afcfe9578e611dd1d9fe6cd8129d8d7738d28ad2  flash_script.lst
 110630f959e3f3a2acc335d755defeb0f49fb40f46cb2423205511f43d1dfdbb91722271fac34a6cbf04a5f0406e6a34ed77e75555acc3f420041d32224027d6  modprobe.d-ship_mode.conf
 3f62c04eb92d850e32d5e1b17534dec753563342ea6c4f9dc2572700d4f6eeb8ae8cd8e8e4f1b0f5c61f21d87bc61c02212f27313986157220003d78e2d69505  modprobe.d_rsi.conf
 a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f6e65a5d1b1a9099936382c99b49a44303f7b6d77a075a471  modules-load.d_librem5.conf
 8ef4ec7a9e9a4fb801d207e7d94b627aacc9243a93b0ec28e0823a6f44b8102416c040e4ddf499f87bb9dfa960cf6f627b008b79f197f6814b3fd881e18ae8ef  pcscd-librem5-reader.conf
 2618b40eebd3602066ee75ab85cbdbb4cfee498def9879c95a304f05a6eeedf1ab28c5dd9fa5efc8f88c790f49c96458c61d5dfe8a3ca0f96bcc0e244313ab01  pcscd-librem5.initd
-6971669a7ae4206f6d38f5050747ebc9ffb591a92921a00623e20bb9369ed25d6168dba719de0abec900f1dc5f2f02089a05b5f4e871d6a7cee5afcf38c581fc  uboot-script.cmd
+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
 "
@@ -8,7 +8,7 @@ deviceinfo_codename="purism-librem5"
 deviceinfo_year="2019"
 deviceinfo_dtb="freescale/imx8mq-librem5-r2 freescale/imx8mq-librem5-r3 freescale/imx8mq-librem5-r4"
 deviceinfo_append_dtb="false"
-deviceinfo_modules_initfs="dwc3 edt-ft5x06 goodix gpio_vibra led_bl libcomposite phy_fsl_imx8mq_usb pwm_vibra tps6598x udc_core usbhid xhci_hcd xhci_plat_hcd bq25890_charger usb_storage uas"
+deviceinfo_modules_initfs="dwc3 edt-ft5x06 goodix gpio_vibra led_bl libcomposite phy_fsl_imx8mq_usb pwm_vibra tps6598x udc_core usbhid xhci_hcd xhci_plat_hcd bq25890_charger "
 deviceinfo_arch="aarch64"
 deviceinfo_mesa_driver="mxsfb-drm"

@@ -23,5 +23,5 @@ deviceinfo_screen_height="1440"
 # Bootloader related
 deviceinfo_flash_method="uuu"
 deviceinfo_generate_legacy_uboot_initfs="false"
-deviceinfo_sd_embed_firmware="u-boot/librem5/phone-boot.img:33"
+deviceinfo_sd_embed_firmware="u-boot/librem5/phone-boot.img:2"
 deviceinfo_boot_part_start="4096"
Author	SHA1	Message	Date
Martijn Braam	784db2f9eb	Build kernel	2022-03-11 20:41:02 +01:00
Martijn Braam	590d77c95f	Update hello world	2022-03-11 19:49:32 +01:00
Martijn Braam	cc2337760d	Use pmos runner	2022-03-11 19:49:02 +01:00
				`@@ -1 +0,0 @@`
				`soc-qcom-sdm845-nonfree-firmware.post-install`
				`@@ -1 +0,0 @@`
				`SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="max77693-haptic", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"`