Merge remote-tracking branch 'upstream/master' into device/samsung-a71

2024-12-14 20:20:58 +01:00 · 2024-12-14 20:20:58 +01:00 · 98c1902f66
commit 98c1902f66
parent 3e16a6fbc6 1b83a7647e
136 changed files with 8689 additions and 8470 deletions
--- a/.ci/testcases/test_device.py
+++ b/.ci/testcases/test_device.py
@ -47,8 +47,7 @@ def test_aports_device():
            if "postmarketos-base" == dependency or "postmarketos-base>" in dependency:
                depend_flag = True
        if not depend_flag:
-            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
-                               path)
+            raise RuntimeError(f"Missing 'postmarketos-base' in depends of {path}")

        # Depends: Must not have specific packages
        for depend in apkbuild["depends"]:
@ -61,7 +60,7 @@ def test_aports_device():
            raise RuntimeError("wrong architecture, please change to arch=\""
                               f"{deviceinfo.arch}\": {path}")
        if "!archcheck" not in apkbuild["options"]:
-            raise RuntimeError("!archcheck missing in options= line: " + path)
+            raise RuntimeError(f"!archcheck missing in options= line: {path}")


 def test_aports_device_kernel():
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@ -65,7 +65,7 @@ is_symlink() {
 # available in git tree and checksums are correct.
 check_local_sources() {
 	local apkbuild="$1"
-	local startdir="${apkbuild%/*}"
+	local startdir="$2"
 	local status=0
 	local checksum_act checksum_exp content filename line sources

@ -109,11 +109,21 @@ check_file_size() {
 	fi
 }

+cleanup() {
+  [ -f "$_staged" ] && rm "$_staged"
+}
+
+trap cleanup EXIT

 for apkbuild in $(changed_files '**/APKBUILD'); do
-	check_local_sources "$apkbuild"
+	_staged="$(mktemp)"
+	git show ":$apkbuild" >"$_staged"
+	check_local_sources "$_staged" "${apkbuild%/*}"
+	cleanup
 done

 for path in $(changed_files); do
 	check_file_size "$path"
 done
+
+trap - EXIT
--- a/.gitlab/issue_templates/Default.md
+++ b/.gitlab/issue_templates/Default.md
@ -28,6 +28,7 @@
 -->
 * [ ] edge (`master` branch)
 * [ ] `v24.06`
+* [ ] `v24.12`

 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`

--- a/5
+++ b/5
@ -35,11 +35,14 @@ device/*/*-qcom-msm8953/			@barni2000 @alikates @vipaoL @jiaxyga
 device/*/*-qcom-sdm670/				@flamingradian
 device/*/*-qcom-sdm845/				@sdm845-mainline
 device/*/*-qcom-sm6350/				@z3ntu
+device/*/*-qcom-sm8250/				@jianhua
 device/*/*-samsung-a3/				@Mis012 @TravMurav @Minecrell
 device/*/*-samsung-a5/				@Minecrell @minlexx
+device/*/*-samsung-a51/				@manoedinata
 device/*/*-samsung-e7/				@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-espresso10/			@MightyM17
 device/*/*-samsung-espresso7/			@MightyM17 @antoni.aloytorrens
+device/*/*-samsung-fortuna/			@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-fortunaltezt/		@bolilingmeng89006
 device/*/*-samsung-grandmax/			@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-gt510/			@TravMurav
@ -53,6 +56,7 @@ device/*/*-videostrong-kii-pro/			@funderscore
 device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
 device/*/*-xiaomi-beryllium/			@joelselvaraj
 device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
+device/*/*-xiaomi-elish/			@jianhua
 device/*/*-xiaomi-markw/			@vipaoL
 device/*/*-xiaomi-mido/				@barni2000
 device/*/*-xiaomi-scorpio/			@Tooniis
@ -115,6 +119,7 @@ device/*/linux-postmarketos-marvell-dove/	@longnoserob
 device/*/linux-postmarketos-mediatek-mt8173/	@jenneron @adamthiede
 device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
 device/*/linux-postmarketos-omap/		@MightyM17 @Sicelo
+device/*/linux-postmarketos-qcom-laptop/	@craftyguy @calebccff
 device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
 device/*/linux-postmarketos-qcom-msm8953/	@M0Rf30 @Ultra-azu @barni2000
 device/*/linux-postmarketos-qcom-msm8996/	@Tooniis
--- a/channels.cfg
+++ b/channels.cfg
@ -11,8 +11,7 @@ mirrordir_alpine=edge
 [v24.12]
 description=Upcoming stable release (DO NOT USE)
 branch_pmaports=v24.12
-# FIXME: branch_aports=3.21-stable is not available yet
-branch_aports=master
+branch_aports=3.21-stable
 mirrordir_alpine=v3.21

 [v24.06]
--- a/cross/musl-aarch64/APKBUILD
+++ b/cross/musl-aarch64/APKBUILD
@ -8,7 +8,7 @@ fi

 pkgname=musl-aarch64
 pkgver=1.2.5
-pkgrel=7
+pkgrel=8
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

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

 sha512sums="
-27dc4642eb9473b3654efb31b1dab92c72774a6fbe2f45d58772becf5bb64f0eb566c656a78bb589fcae5d8ed573b1405bc2d0fb8009d57abf1ecfbc2f39f27b  musl-1.2.5-r7-aarch64-edge.apk
-42406d25d542e10b23a428a42ffbf76952899b9c840b31939d21bda32a866ceb2921d77619be5a26d31a2100d2fdf8df945b3c14dcba6d8c58f615646d4937d3  musl-dev-1.2.5-r7-aarch64-edge.apk
+9cdb30e50d99d377ef8ef3bc41fc6ecd0ae7bc744c6c29ba97afd1ff072271d78c9a36947cebdf944e907b5181bacf165345824234380511d4cc3b535c730673  musl-1.2.5-r8-aarch64-edge.apk
+5638f321b0e76bdb68d3e641ab5bcf4b0f66365aedfbec52b09fc9eafcaf210797c2cbd8166254c3633e3d597d8118838443d32e0af45d689467a237e1cf479e  musl-dev-1.2.5-r8-aarch64-edge.apk
 "
--- a/cross/musl-armhf/APKBUILD
+++ b/cross/musl-armhf/APKBUILD
@ -8,7 +8,7 @@ fi

 pkgname=musl-armhf
 pkgver=1.2.5
-pkgrel=7
+pkgrel=8
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

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

 sha512sums="
-bff3534bc0b2b715561878b686d47640f6442fc65ea7133321426effe446af292d872fa6aa35490fa9c0f5fce10266f7f1813544866a8da1a9e86b73e3cd91d5  musl-1.2.5-r7-armhf-edge.apk
-de43f7db88de107a99d750a2366d223fc53149adf6b7bc5a1532ad1484b33fa149171773c7d5077a84aac6336045abf59148461cc21fdd78ee0553c10ed9a326  musl-dev-1.2.5-r7-armhf-edge.apk
+18a970c5ef74e306ffa6031ae5f75a9cc3c52a9cd4c4706c94631696cf52d5af5024548d658176546c559c99dfad321e0ce87eddcc92a4aff40293e61313f921  musl-1.2.5-r8-armhf-edge.apk
+c8bcb213d113fde24ed72f67d46e19cc842fbae223aaa02b635d53ba4c7ea39869243b24dada8a248e8c93e1e9c8b35424be39bcfd25136d3b18250cab820638  musl-dev-1.2.5-r8-armhf-edge.apk
 "
--- a/cross/musl-armv7/APKBUILD
+++ b/cross/musl-armv7/APKBUILD
@ -8,7 +8,7 @@ fi

 pkgname=musl-armv7
 pkgver=1.2.5
-pkgrel=7
+pkgrel=8
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

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

 sha512sums="
-e0f140c339f2963f7522a9d3c7bf45089c47cc7ef6b4cbe31c7db60012f8e66141cfecfe824706ad88a85e1169fea3c29e4db869cae768da7b885eb5b49097f7  musl-1.2.5-r7-armv7-edge.apk
-783fb95ba265720757d1a9e9c5dbb5871f71cac2ad66651292a96c53c09b0c380ee37f9476f72296617f596a2f0db9ab3099c14ec4b2714690af6c8b3f90733a  musl-dev-1.2.5-r7-armv7-edge.apk
+4aad1e994572ae8b364e926c9213dbc2f6759fb9308290837cbcba31c4005a9dfc16fb2600953dd23e3f49b9a549865bc818e875d8dd8ef8f9075a114a7dca2d  musl-1.2.5-r8-armv7-edge.apk
+69359b6d47b94560657c7c97709ea2bcc3b31e4454bb247721d39d20daa1520178cca789f68126d4235f1e10ed1a7a7ce598b199323898d0c6b714342608ab0d  musl-dev-1.2.5-r8-armv7-edge.apk
 "
--- a/cross/musl-riscv64/APKBUILD
+++ b/cross/musl-riscv64/APKBUILD
@ -8,7 +8,7 @@ fi

 pkgname=musl-riscv64
 pkgver=1.2.5
-pkgrel=7
+pkgrel=8
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

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

 sha512sums="
-5d0c646a7a6ecc410f4aea70e860078d12f695c88e57cb95fe3858ad23ae5b1d2abad314e78bd25c213fc3c152dc4ea9a7c34fdfac29be0b67396a3c318f334c  musl-1.2.5-r7-riscv64-edge.apk
-813a6e2b981e8a6633db2a850c8cc11fa21c5349ccbbc4cafe618b85670ff142db1d82a9d4dcf73dd35f95871bbfa9e1f5319b9c78486f9b2f8fec35e721de2d  musl-dev-1.2.5-r7-riscv64-edge.apk
+41e2ab47c4ee0cd3fde7867be24eaff3f0346ae66b0e4a268b2638e243ba3e55db6782f9633d6ee08018eb608134908439c498e4c8a6cc43b6f607ed2af0f41b  musl-1.2.5-r8-riscv64-edge.apk
+f9f31edbd65a2c920c4936be66c6e822081ac13a1b08bf7fda7205105bb77fcd18484a73f42857ab947e88310b093c02cedc1b097490b4ba610ff9a78c60ab15  musl-dev-1.2.5-r8-riscv64-edge.apk
 "
--- a/cross/musl-x86/APKBUILD
+++ b/cross/musl-x86/APKBUILD
@ -8,7 +8,7 @@ fi

 pkgname=musl-x86
 pkgver=1.2.5
-pkgrel=7
+pkgrel=8
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"

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

 sha512sums="
-60e0d2c8b524f980375ce1e5f74a48afc1f54257ba5e1aa58fe520c3f936e2c01c565418fa50154d5d9a30a435c47e8e42bdf77f104f2013dc089c127b4318e2  musl-1.2.5-r7-x86-edge.apk
-3470cc5a28a8f83e3ddc92593710c3e179bd84b044cf954e9c860d218464b3e24ce59bbdb3c900a024c337361d2fd0c536766b8018c75f07c043438300b3d1de  musl-dev-1.2.5-r7-x86-edge.apk
+57242b717ccfa0dd5dae74f6b440b1258fc4900c30b569b7fa46930e38cc1ca1c28cbb9c24239c67909fd26644a82c87ef19a41ce3c5a47e0f4c2e749d24eb32  musl-1.2.5-r8-x86-edge.apk
+d3df9a8bb1a5b61cc84f805e0e1926dd52fae77929b5839ffe37c694a7a494728166aff52a37b3ce4fe24065c6886098bff91ddf9f365e636b3fd1dc0e0332ac  musl-dev-1.2.5-r8-x86-edge.apk
 "
--- a/cross/musl-x86_64/APKBUILD
+++ b/cross/musl-x86_64/APKBUILD
@ -8,7 +8,7 @@ fi

 pkgname=musl-x86_64
 pkgver=1.2.5
-pkgrel=7
+pkgrel=8
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"

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

 sha512sums="
-a7d515ef1b359228afc362de4dbc43ab75a5e7e4d1a11832d15abf202020d56dbb5ae18d84c13e78940bddc866a8199895aabac38afe0f7313cb88ae369e46f2  musl-1.2.5-r7-x86_64-edge.apk
-03f29dca8b17cedd74468e365c8dbbed3ac0fe17f6f032371c45c2c821b1e2e0a63254a82617a43a67dbc23e0f795a68e3ed1de3c9f716aaa3d0b7f0946fd276  musl-dev-1.2.5-r7-x86_64-edge.apk
+fa2d127eaf56c9bcd93e40ab8c2499123d534f65319232b76f12ffdd0798ed2f0218802cae0373f9255996fdfa194f04bb92d1e05c9b0a659fae4b7a533094eb  musl-1.2.5-r8-x86_64-edge.apk
+4fcd12befeaa57c3961e4291d37ed9a57043879af6de32f65db3b860616d0c1b76a545099c03350603fddebd8360beae552655ea6df9046712bda290c51d3e05  musl-dev-1.2.5-r8-x86_64-edge.apk
 "
--- a/device/.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch
+++ b/device/.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch
@ -0,0 +1,51 @@
+From 4cbffcd4f146ccceafccd9fa9d522640d1f0f519 Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Tue, 10 Dec 2024 08:33:54 +0100
+Subject: [PATCH] libfdt.i_shipped: use SWIG_AppendOutput
+
+Fix this build error with modern SWIG:
+
+  scripts/dtc/pylibfdt/libfdt_wrap.c: In function '_wrap_fdt_next_node':
+  scripts/dtc/pylibfdt/libfdt_wrap.c:5578:17: error: too few arguments to function 'SWIG_Python_AppendOutput'
+   5578 |     resultobj = SWIG_Python_AppendOutput(resultobj, val);
+
+Patch is based on:
+https://github.com/dgibson/dtc/pull/154
+---
+ scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
+index 27c29ea260..3bbbfb3c9f 100644
+--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
+@@ -1033,7 +1033,7 @@ typedef uint32_t fdt32_t;
+ 			fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
+ 		buff = PyByteArray_FromStringAndSize(
+ 			(const char *)($1 + 1), fdt32_to_cpu($1->len));
+-		resultobj = SWIG_Python_AppendOutput(resultobj, buff);
+		resultobj = SWIG_AppendOutput(resultobj, buff);
+ 	}
+ }
+ 
+@@ -1072,7 +1072,7 @@ typedef uint32_t fdt32_t;
+ 
+ %typemap(argout) int *depth {
+         PyObject *val = Py_BuildValue("i", *arg$argnum);
+-        resultobj = SWIG_Python_AppendOutput(resultobj, val);
+        resultobj = SWIG_AppendOutput(resultobj, val);
+ }
+ 
+ %apply int *depth { int *depth };
+@@ -1088,7 +1088,7 @@ typedef uint32_t fdt32_t;
+            if (PyTuple_GET_SIZE(resultobj) == 0)
+               resultobj = val;
+            else
+-              resultobj = SWIG_Python_AppendOutput(resultobj, val);
+              resultobj = SWIG_AppendOutput(resultobj, val);
+         }
+ }
+ 
+-- 
+2.47.1
+
--- a/device/community/device-lenovo-21bx/APKBUILD
+++ b/device/community/device-lenovo-21bx/APKBUILD
@ -5,7 +5,7 @@
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
 pkgver=12
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@ -18,7 +18,7 @@ depends="
 	linux-firmware-ath11k
 	linux-firmware-qca
 	linux-firmware-qcom
-	linux-lenovo-21bx
+	linux-postmarketos-qcom-laptop
 	postmarketos-base
 	qmi-utils
 	systemd-boot
--- a/device/community/device-nokia-n900/APKBUILD
+++ b/device/community/device-nokia-n900/APKBUILD
@ -2,8 +2,8 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=30
-pkgrel=1
+pkgver=35
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@ -28,7 +28,6 @@ subpackages="
 	$pkgname-xkeyboard-config:xkeyboard_config
 	$pkgname-i3wm
 	$pkgname-upower
-	$pkgname-sxmo
 	$pkgname-openrc
 "
 source="
@ -39,6 +38,8 @@ source="
 	asound.state.headset
 	asound.state.speakers
 	backlight-enable.sh
+	bq27k-options.conf
+	bq27k-monitor.sh
 	device-nokia-n900.start
 	deviceinfo
 	modules-initfs
@ -61,10 +62,9 @@ source="
 	modules.blocklist
 	pointercal
 	proxishot.sh
-	sxmo/deviceprofile.sh
-	sxmo/start_hook.sh
 	uboot-script.cmd
 	udev/10-nokia-modem.rules
+	udev/15-bq27k.rules
 	udev/80-feedbackd-twl4030.rules
 	udev/90-touchscreen-dev.rules
 	upower.conf
@ -104,12 +104,16 @@ package() {
 		"$pkgdir"/usr/share/mkinitfs/hooks/10-initfs-keymap.sh
 	install -Dm755 "$srcdir"/$pkgname.start \
 		"$pkgdir"/etc/local.d/$pkgname.start
+	install -Dm755 "$srcdir"/bq27k-monitor.sh \
+		"$pkgdir"/usr/bin/bq27k-monitor

 	# Udev rules
 	install -D -m644 "$srcdir"/90-touchscreen-dev.rules \
 		"$pkgdir"/etc/udev/rules.d/90-touchscreen-dev.rules
 	install -D -m644 "$srcdir"/10-nokia-modem.rules \
 		"$pkgdir"/etc/udev/rules.d/10-nokia-modem.rules
+	install -D -m644 "$srcdir"/15-bq27k.rules \
+		"$pkgdir"/usr/lib/udev/rules.d/15-bq27xxx-battery.rules
 	install -Dm644 "$srcdir"/80-feedbackd-twl4030.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/80-feedbackd-twl4030.rules

@ -136,6 +140,8 @@ package() {
 		"$pkgdir"/etc/modprobe.d/nokia-modem.conf
 	install -D -m644 "$srcdir"/modules.blocklist \
 		"$pkgdir"/etc/modprobe.d/n900-module-blocklist.conf
+	install -D -m644 "$srcdir"/bq27k-options.conf \
+		"$pkgdir"/etc/modprobe.d/bq27xxx-battery.conf

 	postmarketos-mvcfg-package "$pkgdir" "$pkgname"
 }
@ -186,20 +192,6 @@ i3wm() {
 		"$subpkgdir"/etc/skel/.Xdefaults
 }

-sxmo() {
-	install_if="$pkgname=$pkgver-r$pkgrel sxmo-utils"
-	replaces="sxmo-utils"
-	# Set !tracedeps, so abuild doesn't extend provides with e.g.:
-	# "cmd:sxmo_deviceprofile_nokia,omap3-n900.sh=1.16.3-r0"
-	# Otherwise this cannot be installed together with sxmo-utils:
-	# conflicts: sxmo-utils-1.16.3-r0[cmd:sxmo_deviceprofile_nokia,omap3-n900.sh=25-r0]
-	options="!tracedeps"
-	install -Dm755 "$srcdir"/deviceprofile.sh \
-		"$subpkgdir"/usr/bin/sxmo_deviceprofile_nokia,omap3-n900.sh
-	install -Dm755 "$srcdir"/start_hook.sh \
-		"$subpkgdir"/usr/share/sxmo/default_hooks/sxmo_hook_start.sh
-}
-
 upower() {
 	install_if="$pkgname=$pkgver-r$pkgrel upower"
 	replaces="upower"
@ -222,6 +214,8 @@ ff51909873160c2d4c6f0c0119b6d4a02751df29f571b8596b4bc8b04ce2541913c11a583b0e5dab
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
+344ec50cee2a4d864debad12810a83070ab8257f9f07dcfa9be3eea1d8b26f3ab4fbe322fe05a384152b40fc5e1481df51d191624c7062186dd70f95a0784ea8  bq27k-options.conf
+c5b8e03ca9f720a794f2593a3e938640cbd91ac44dd761079bbf4614a0d288a9d7b72de8ed2493c062dc9f37be580bea529f454d2335f55b7a9f4d14024b42a9  bq27k-monitor.sh
 e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef  device-nokia-n900.start
 40aaeb44941a988ab8ec58d331bc6cd42c4a23c6b6e8fc302f9216a38b46baab38d0a0137606a5b7959a51326983c03d684615c5ba9c58b0e36314ec8c49cfbb  deviceinfo
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
@ -244,14 +238,13 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
 862ebc7cd2d7a1b3d41b10701b8418308c89eb0732eb99c42ec1091d48e08db9421727f67a3272b7309549798d59afb1b8d7d2fa48d1447b208fcb2329472d4d  modules.blocklist
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
 134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
-fc21e3b7e045055c080a7f7ffb0cd4140b63a02690e92c8370dbccbef506fe271ee9584ac9f14725b8bc9fd6e74e7fafde589d2360f44491c614837472d8ad53  deviceprofile.sh
-5dab895c34599bf233635463271ea8308d434c97789efe931eec24870c3b4688fe48ca3b7cdc66e5c1a705940d042b9f18f26420b60f22e1cfad1854e97f8687  start_hook.sh
 42f916d87dd305111028992a1107bf6fe108bebbd782ae8edd065e76505db2b3a75e57515970c3e40cb0d1b7e83097a1bba92785be13df7c3fd80959a8d9c5c1  uboot-script.cmd
-9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
+465b9a0d2b46d0981c64b47cb1f656c2456a90b91b1751a2efad10af38a96030dd99108b1fd76ce31bf1ea0f236d55bed38b114d6bd712f09f8968de034c946c  10-nokia-modem.rules
+1acc441b9f83dc91fd65fa3f89b8205bfd72a465286bc181b4e7e92dd4b8c0bc5c20a18dab46ff3ee8ae70940efd7d767b3dfb920edb4c74377bd418b838693d  15-bq27k.rules
 03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
-d46adf47194c02b434cb46751003e67ee008d60978458e69b1f59dc709a7135a70f542918c29e359ba8308bdeda58a21e8efa446d06625511af05403db90e455  upower.conf
+9b99feee42dd6bdd122769994c786d3127c41e0aa3321f19c82a9d3845cf07b522908621a31cbddd9599fe18c5c37127d9b4be4255cd7fa8e0e8983bf73eb41b  upower.conf
 c7837e6688f09c7d650ac7479b8881d4bad709480a71a1dea8b5bba4f4215d6b48a3aebd3f58923bbd48813559478d4ef137dcc9838d321722e141f0aa6a6085  x11-keymap
-19694204f2f370a4132762ac1888eaf5736939bba2f12ec2bccd18dde0645cdb621dda3a0772d2ef6d26a65d14e39a628e0d23321fe3064777ad2b76ce45ed2d  xdefaults
+183dfdd545ba05e216209b1abe45e4af4e0ee16b2e73cff0e7ea7b9524ee35a1cf85213a77f32a1a94287aee6546885dbd71c6de1f4f1a1e2961e638ff27cdf6  xdefaults
 a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef29f636f99c8f8da8b992f746eab6424aac04260c16158bcc2  xorg.conf
 "
--- a/device/community/device-nokia-n900/bq27k-monitor.sh
+++ b/device/community/device-nokia-n900/bq27k-monitor.sh
@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+echo "Capacity: $POWER_SUPPLY_CAPACITY; Voltage: $POWER_SUPPLY_VOLTAGE_NOW; Level: $POWER_SUPPLY_CAPACITY_LEVEL" >> /tmp/bq27k.log
+if [ "$POWER_SUPPLY_CAPACITY_LEVEL" = "Low" ] || [ "$POWER_SUPPLY_CAPACITY_LEVEL" = "Critical" ]; then
+	if [ "$POWER_SUPPLY_STATUS" != "Charging" ]; then
+		/sbin/poweroff
+	fi
+fi
+# Adjust polling rate based on reported voltage. As voltage drops to near
+# critical levels, poll more frequently, in order to catch status changes
+# early
+if [ "$POWER_SUPPLY_VOLTAGE_NOW" -le 3350000 ]; then
+	echo 5 > /sys/module/bq27xxx_battery/parameters/poll_interval
+elif [ "$POWER_SUPPLY_VOLTAGE_NOW" -ge 3500000 ]; then
+	echo 45 > /sys/module/bq27xxx_battery/parameters/poll_interval
+fi
--- a/device/community/device-nokia-n900/bq27k-options.conf
+++ b/device/community/device-nokia-n900/bq27k-options.conf
@ -0,0 +1 @@
+options bq27xxx-battery poll_interval=30
--- a/device/community/device-nokia-n900/sxmo/deviceprofile.sh
+++ b/device/community/device-nokia-n900/sxmo/deviceprofile.sh
@ -1,20 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: AGPL-3.0-only
-# Copyright 2022 Sxmo Contributors
-
-export WLR_RENDERER=pixman
-export SXMO_LYSTI_LEDS=1
-export SXMO_POWER_BUTTON="0:0:twl_pwrbutton"
-export SXMO_TOUCHSCREEN_ID="TSC2005 touchscreen"
-export SXMO_SWAY_SCALE="1.5"
-#on N900 these two are swaped
-export SXMO_BEMENU_LANDSCAPE_LINES="10"
-export SXMO_BEMENU_PORTRAIT_LINES="8"
-export SXMO_DMENU_LANDSCAPE_LINES="10"
-export SXMO_DMENU_PORTRAIT_LINES="6"
-export SXMO_ROTATE_DIRECTION="left"
-export SXMO_KEYBOARD_SLIDER_EVENT_DEVICE="/dev/input/by-path/platform-gpio_keys-event"
-export SXMO_KEYBOARD_SLIDER_CLOSE_EVENT="*code 10 (SW_KEYPAD_SLIDE), value 0*"
-export SXMO_KEYBOARD_SLIDER_OPEN_EVENT="*code 10 (SW_KEYPAD_SLIDE), value 1*"
-# modem is only supported via ofono, not modemmanager
-export SXMO_NO_MODEM=1
--- a/device/community/device-nokia-n900/sxmo/start_hook.sh
+++ b/device/community/device-nokia-n900/sxmo/start_hook.sh
@ -1,130 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: AGPL-3.0-only
-# Copyright 2022 Sxmo Contributors
-
-# include common definitions
-# shellcheck source=scripts/core/sxmo_common.sh
-. sxmo_common.sh
-
-# Create xdg user directories, such as ~/Pictures
-xdg-user-dirs-update
-
-sxmo_jobs.sh start daemon_manager superd
-
-# let time to superd to start correctly
-while ! superctl status > /dev/null 2>&1; do
-	sleep 0.5
-done
-
-# Not dangerous if "locker" isn't an available state
-sxmo_state.sh set locker
-
-if [ -n "$SXMO_ROTATE_START" ]; then
-	sxmo_rotate.sh
-fi
-
-# Load our sound daemons
-
-if [ -z "$SXMO_NO_AUDIO" ]; then
-	if [ "$(command -v pulseaudio)" ]; then
-		superctl start pulseaudio
-	elif [ "$(command -v pipewire)" ]; then
-		# pipewire-pulse will start pipewire
-		superctl start pipewire-pulse
-		superctl start wireplumber
-	fi
-
-	# monitor for headphone for statusbar
-	superctl start sxmo_soundmonitor
-fi
-
-# Periodically update some status bar components
-sxmo_hook_statusbar.sh all
-sxmo_jobs.sh start statusbar_periodics sxmo_run_aligned.sh 60 \
-	sxmo_hook_statusbar.sh periodics
-
-# mako/dunst are required for warnings.
-# load some other little things here too.
-case "$SXMO_WM" in
-	sway)
-		superctl start mako
-		superctl start sxmo_wob
-		superctl start sxmo_menumode_toggler
-		superctl start bonsaid
-		swaymsg output '*' bg "$SXMO_BG_IMG" fill
-		;;
-	dwm)
-		superctl start dunst
-		superctl start sxmo_xob
-
-		# Auto hide cursor with touchscreen, Show it with a mouse
-		if command -v "unclutter-xfixes" > /dev/null; then
-			set -- unclutter-xfixes
-		else
-			set -- unclutter
-		fi
-		superctl start "$1"
-
-		superctl start autocutsel
-		superctl start autocutsel-primary
-		superctl start sxmo-x11-status
-		superctl start bonsaid
-		[ -n "$SXMO_MONITOR" ] && xrandr --output "$SXMO_MONITOR" --primary
-		feh --bg-fill "$SXMO_BG_IMG"
-		;;
-esac
-
-# Turn on auto-suspend
-if sxmo_wakelock.sh isenabled; then
-	sxmo_wakelock.sh lock sxmo_not_suspendable infinite
-	superctl start sxmo_autosuspend
-fi
-
-# To setup initial unlock state
-sxmo_state.sh set unlock
-
-# Turn on lisgd
-if [ ! -e "$XDG_CACHE_HOME"/sxmo/sxmo.nogesture ]; then
-	superctl start sxmo_hook_lisgd
-fi
-
-if [ -z "$SXMO_NO_MODEM" ] && command -v ModemManager > /dev/null; then
-	# Turn on the dbus-monitors for modem-related tasks
-	superctl start sxmo_modemmonitor
-
-	# place a wakelock for 120s to allow the modem to fully warm up (eg25 +
-	# elogind/systemd would do this for us, but we don't use those.)
-	sxmo_wakelock.sh lock sxmo_modem_warming_up 120s
-fi
-
-# Monitor the battery
-superctl start sxmo_battery_monitor
-
-# It watch network changes and update the status bar icon by example
-superctl start sxmo_networkmonitor
-
-# The daemon that display notifications popup messages
-superctl start sxmo_notificationmonitor
-
-# Play a funky startup tune if you want (disabled by default)
-#mpv --quiet --no-video ~/welcome.ogg &
-
-# mmsd and vvmd
-if [ -z "$SXMO_NO_MODEM" ]; then
-	if [ -f "${SXMO_MMS_BASE_DIR:-"$HOME"/.mms/modemmanager}/mms" ]; then
-		superctl start mmsd-tng
-	fi
-
-	if [ -f "${SXMO_VVM_BASE_DIR:-"$HOME"/.vvm/modemmanager}/vvm" ]; then
-		superctl start vvmd
-	fi
-fi
-
-# add some warnings if things are not setup correctly
-if ! command -v "sxmo_deviceprofile_$SXMO_DEVICE_NAME.sh";  then
-	sxmo_notify_user.sh --urgency=critical \
-		"No deviceprofile found $SXMO_DEVICE_NAME. See: https://sxmo.org/deviceprofile"
-fi
-
-sxmo_migrate.sh state || sxmo_notify_user.sh --urgency=critical \
-	"Config needs migration" "$? file(s) in your sxmo configuration are out of date and disabled - using defaults until you migrate (run sxmo_migrate.sh)"
--- a/device/community/device-nokia-n900/udev/10-nokia-modem.rules
+++ b/device/community/device-nokia-n900/udev/10-nokia-modem.rules
@ -1,6 +1,2 @@
 # Export GPIOs for nokia-modem
 DRIVER=="nokia-modem", RUN+="/bin/ln -sf /sys/bus/hsi/devices/n900-modem /dev/cmt"
-
-# Tag modem device for ofono
-SUBSYSTEMS=="hsi", ENV{OFONO_DRIVER}="n900", ENV{OFONO_ISI_ADDRESS}="108"
-KERNEL=="phonet*", ENV{OFONO_DRIVER}="n900", ENV{OFONO_ISI_ADDRESS}="108"
--- a/device/community/device-nokia-n900/udev/15-bq27k.rules
+++ b/device/community/device-nokia-n900/udev/15-bq27k.rules
@ -0,0 +1 @@
+KERNEL=="bq27200-0", SUBSYSTEM=="power_supply", ACTION=="change", RUN+="/usr/bin/bq27k-monitor"
--- a/device/community/device-nokia-n900/upower.conf
+++ b/device/community/device-nokia-n900/upower.conf
@ -59,12 +59,12 @@ UsePercentageForPolicy=true
 # will be used.
 #
 # Defaults:
-# PercentageLow=20
-# PercentageCritical=5
-# PercentageAction=2
-PercentageLow=20
-PercentageCritical=10
-PercentageAction=2
+# PercentageLow=20.0
+# PercentageCritical=5.0
+# PercentageAction=2.0
+PercentageLow=20.0
+PercentageCritical=5.0
+PercentageAction=2.0

 # When UsePercentageForPolicy is false, the time remaining in seconds at
 # which UPower will consider the battery low, critical, or take action for
@ -81,6 +81,13 @@ TimeLow=1200
 TimeCritical=300
 TimeAction=120

+# Enable the risky CriticalPowerAction-Suspend
+# This option is not recommended, but it is here for users who
+# want to enable the riscky CriticalPowerAction, such as "Suspend"
+# to fulfil their needs.
+# Default is false
+AllowRiskyCriticalPowerAction=true
+
 # The action to take when "TimeAction" or "PercentageAction" above has been
 # reached for the batteries (UPS or laptop batteries) supplying the computer
 #
@ -88,7 +95,10 @@ TimeAction=120
 # PowerOff
 # Hibernate
 # HybridSleep
+# Suspend (AllowRiskyCriticalPowerAction should be true to use this option but risky)
+# Ignore (AllowRiskyCriticalPowerAction should be true to use this option but risky)
 #
+# If Suspend isn't available or AllowRiskyCriticalPowerAction=false, HybridSleep will be used
 # If HybridSleep isn't available, Hibernate will be used
 # If Hibernate isn't available, PowerOff will be used
-CriticalPowerAction=HybridSleep
+CriticalPowerAction=Ignore
--- a/device/community/device-nokia-n900/xdefaults
+++ b/device/community/device-nokia-n900/xdefaults
@ -1,4 +1,3 @@
 URxvt*foreground: White
 URxvt*background: Black
-URxvt*font: xft:DejaVu Sans Mono:style=Book:pixelsize=15:antialias=true:hinting=true
-URxvt*boldFont: xft:DejaVu Sans Mono:style=Bold:pixelsize=15:antialias=true:hinting=true
+URxvt*font: xft:Droid Sans Mono:style=Regular:pixelsize=15:antialias=true:hinting=true
--- a/device/community/device-samsung-m0/APKBUILD
+++ b/device/community/device-samsung-m0/APKBUILD
@ -3,7 +3,7 @@
 pkgname=device-samsung-m0
 pkgdesc="Samsung Galaxy S III"
 pkgver=8
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-exynos4
 	mkbootimg
 	postmarketos-base
+	soc-samsung-exynos4412-cameraflash
 	soc-samsung-exynos4412-haptics
 	"
 makedepends="devicepkg-dev"
--- a/device/community/device-xiaomi-elish/81-libssc-xiaomi-elish.rules
+++ b/device/community/device-xiaomi-elish/81-libssc-xiaomi-elish.rules
--- a/device/community/device-xiaomi-elish/APKBUILD
+++ b/device/community/device-xiaomi-elish/APKBUILD
--- a/device/community/device-xiaomi-elish/alsa-ucm-conf/HiFi.conf
+++ b/device/community/device-xiaomi-elish/alsa-ucm-conf/HiFi.conf
--- a/device/community/device-xiaomi-elish/alsa-ucm-conf/elish.conf
+++ b/device/community/device-xiaomi-elish/alsa-ucm-conf/elish.conf
--- a/device/community/device-xiaomi-elish/device-xiaomi-elish-openrc.post-install
+++ b/device/community/device-xiaomi-elish/device-xiaomi-elish-openrc.post-install
--- a/device/community/device-xiaomi-elish/device-xiaomi-elish-openrc.post-upgrade
+++ b/device/community/device-xiaomi-elish/device-xiaomi-elish-openrc.post-upgrade
--- a/device/community/device-xiaomi-elish/deviceinfo
+++ b/device/community/device-xiaomi-elish/deviceinfo
--- a/device/community/device-xiaomi-elish/hexagonrpcd.confd
+++ b/device/community/device-xiaomi-elish/hexagonrpcd.confd
--- a/device/community/device-xiaomi-elish/modules-initfs
+++ b/device/community/device-xiaomi-elish/modules-initfs
--- a/device/community/firmware-qcom-adreno/APKBUILD
+++ b/device/community/firmware-qcom-adreno/APKBUILD
@ -1,5 +1,5 @@
 pkgname=firmware-qcom-adreno
-pkgver=20220509
+pkgver=20241110
 pkgrel=0
 pkgdesc="Qualcomm Adreno GPU firmware from linux-firmware"
 url="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
@ -15,7 +15,7 @@ builddir="$srcdir/linux-firmware-$pkgver"
 replaces="linux-firmware-qcom"
 _fwdir="/lib/firmware/qcom"

-_gpus="a300 a330 a420 a530 a630 a650 a660"
+_gpus="a300 a330 a420 a530 a630 a650 a660 gen70500"
 for gpu in $_gpus; do
 	subpackages="$subpackages $pkgname-$gpu:_gpu"
 done
@ -37,5 +37,5 @@ _gpu() {
 }

 sha512sums="
-0591a35a14a6994ac60571a8e47c00ec013afbfedd4b3326cfe1971b9bd9a07ca7622b17177b3fb57a6c244d2caae12318fcbfac5da5f78a2c085285c9d85cf6  linux-firmware-20220509.tar.gz
+b4ae2abe6eecc5e8fdc796ae75394d936fee7f7b5ed7803c51eccdbfba1f883ac567a43adc9e7c3a4e4934bf1794e37cd93478468599b542ef1327a8221f648a  linux-firmware-20241110.tar.gz
 "
--- a/device/community/firmware-xiaomi-elish/30-dsp-firmware.files
+++ b/device/community/firmware-xiaomi-elish/30-dsp-firmware.files
--- a/device/community/firmware-xiaomi-elish/APKBUILD
+++ b/device/community/firmware-xiaomi-elish/APKBUILD
--- a/device/community/linux-lenovo-21bx/APKBUILD
+++ b/device/community/linux-lenovo-21bx/APKBUILD
@ -1,72 +0,0 @@
-# Maintainer: Clayton Craft <clayton@craftyguy.net>
-# Co-Maintainer: jane400 <jane400@postmarketos.org>
-# Contributor: Konrad Dybcio <konradybcio@kernel.org>
-pkgname=linux-lenovo-21bx
-pkgver=6.12
-pkgrel=0
-_commit="24dcd44a39079e920512fc280fa08907be2a6c31"
-pkgdesc="Lenovo ThinkPad X13s kernel fork"
-arch="aarch64"
-_carch="arm64"
-_flavor="lenovo-21bx"
-url="https://kernel.org"
-license="GPL-2.0-only"
-options="!strip
-	!check
-	!tracedeps
-	pmb:cross-native
-	pmb:kconfigcheck-community
-	pmb:kconfigcheck-containers
-	pmb:kconfigcheck-uefi
-	"
-makedepends="
-	bash
-	bison
-	findutils
-	flex
-	musl-dev
-	openssl-dev
-	perl
-	python3
-	postmarketos-installkernel
-"
-
-# Source
-_repository="linux"
-_config="config-$_flavor.$arch"
-source="
-	$pkgname-$_commit.tar.gz::https://github.com/jhovold/$_repository/archive/$_commit.tar.gz
-	$_config
-"
-builddir="$srcdir/linux-$_commit"
-_outdir="out"
-
-prepare() {
-	default_prepare
-	cp "$srcdir/config-$_flavor.$arch" .config
-}
-
-build() {
-	unset LDFLAGS
-	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor"
-}
-
-package() {
-	mkdir -p "$pkgdir"/boot
-	make zinstall modules_install dtbs_install \
-		ARCH="$_carch" \
-		INSTALL_PATH="$pkgdir"/boot \
-		INSTALL_MOD_PATH="$pkgdir" \
-		INSTALL_MOD_STRIP=1 \
-		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs
-	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
-
-	install -D "$builddir"/include/config/kernel.release \
-		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
-}
-
-sha512sums="
-ea7adff2697334d9d746e7185676ae68fe4444d8d35861040abea9e78a9308bc73fc6583f31bc961cef8ae11b994b79b8c722d75c6eb42072fb1118de71e511e  linux-lenovo-21bx-24dcd44a39079e920512fc280fa08907be2a6c31.tar.gz
-5a29d48fe839bb1b6c16e4a5679337682318f9ec1c9e292d729f618290a9e3f1ca3dec1af7e88c70e794e99cc76399bfb13fd0bd9c1e7e8f69b08c156db33079  config-lenovo-21bx.aarch64
-"
--- a/device/community/linux-lenovo-21bx/config-lenovo-21bx.aarch64
+++ b/device/community/linux-lenovo-21bx/config-lenovo-21bx.aarch64
--- a/device/community/linux-pine64-pinephonepro/APKBUILD
+++ b/device/community/linux-pine64-pinephonepro/APKBUILD
@ -1,9 +1,9 @@
 # Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=linux-pine64-pinephonepro
-pkgver=6.6.0
-_pkgver=6.6
-_tagdate=20231104-22589
-pkgrel=5
+pkgver=6.11.11
+_pkgver=6.11
+_tagdate=20241206-0145
+pkgrel=0
 pkgdesc="Mainline kernel for the pinephone pro"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@ -71,6 +71,6 @@ package() {


 sha512sums="
-d59c410ecc1a824b7b9a38f36b224693812003320220a3464a648084152023ed8be48d0448eb8054cd2b1d42befd5e8958d3ad243e50138e1c9d0269ac2917ea  linux-ppp-6.6-20231104-22589.tar.gz
-e3a80abf986226d753b64d57893781a12a2e04e0fa19d4de8d3b4732f709aadd1c317d0a9ecf33a828975f15e7c43fb8cae9f66136886699867bbee1a679ca4e  config-pine64-pinephonepro.aarch64
+065ceac6e0e6f3b7b939977084a1ac5aeabbff0273c61e50d0c2374825e0b1b41511592e54cb74a3d3d59a17fd5cc90018f6612062eb0f6b78dde29dd1aeade9  linux-ppp-6.11-20241206-0145.tar.gz
+e50a1db963c6b2de860a2cc3fed0dc5087a057aa5717058dd527d66f8277be3865fe7ea7d0dbed0d5e611546fcf80ac8af159c3bb95b07907625b4645d7b8f30  config-pine64-pinephonepro.aarch64
 "
--- a/device/community/linux-pine64-pinephonepro/config-pine64-pinephonepro.aarch64
+++ b/device/community/linux-pine64-pinephonepro/config-pine64-pinephonepro.aarch64
--- a/device/community/linux-postmarketos-exynos4/APKBUILD
+++ b/device/community/linux-postmarketos-exynos4/APKBUILD
@ -5,7 +5,7 @@

 pkgname=linux-postmarketos-exynos4
 pkgver=6.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices"
 arch="armv7"
 _carch="arm"
@ -70,5 +70,5 @@ package() {

 sha512sums="
 a320d0be4532f469be015e2a6706e507e89daaa55ad50d57a56451dca04b6bbea56f62d15877ef000027ce887ecd04257f9c71d7c9d80aab55607494205fa5c7  linux-postmarketos-exynos4-v6.10.0-exynos4.tar.bz2
-0a4ff7edb445bc20604e4e4d615a96ecac7d93174aa42d74b3d120b34890319262954e977748accc0c64302e79829b39216dc4f82d27a02ad672ddb775ea41ca  config-postmarketos-exynos4.armv7
+d7a909444d6f9d88700b2a16bf330a511716bba2cb5be4a8985ef4a5554dbdffdf0e16583b87cda163f26b06ede08956d63d40ff1a8c8b9447ea17ce5cef4a40  config-postmarketos-exynos4.armv7
 "
--- a/device/community/linux-postmarketos-exynos4/config-postmarketos-exynos4.armv7
+++ b/device/community/linux-postmarketos-exynos4/config-postmarketos-exynos4.armv7
@ -3156,7 +3156,7 @@ CONFIG_CEC_SAMSUNG_S5P=m
 # CONFIG_USB_RAINSHADOW_CEC is not set
 # end of CEC support

-CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_SUPPORT_FILTER=y
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

@ -3172,7 +3172,7 @@ CONFIG_MEDIA_PLATFORM_SUPPORT=y
 # CONFIG_MEDIA_TEST_SUPPORT is not set
 # end of Media device types

-CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DEV=y
 CONFIG_MEDIA_CONTROLLER=y

 #
@ -3182,10 +3182,10 @@ CONFIG_VIDEO_V4L2_I2C=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_MEM2MEM_DEV=y
 # CONFIG_V4L2_FLASH_LED_CLASS is not set
-CONFIG_V4L2_FWNODE=m
-CONFIG_V4L2_ASYNC=m
+CONFIG_V4L2_FWNODE=y
+CONFIG_V4L2_ASYNC=y
 # end of Video4Linux options

 #
@ -3349,15 +3349,16 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # Samsung media platform drivers
 #
 # CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
-CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
-CONFIG_VIDEO_EXYNOS4_IS_COMMON=m
-CONFIG_VIDEO_S5P_FIMC=m
-CONFIG_VIDEO_S5P_MIPI_CSIS=m
-# CONFIG_VIDEO_EXYNOS_FIMC_LITE is not set
-# CONFIG_VIDEO_EXYNOS4_FIMC_IS is not set
+CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=y
+CONFIG_VIDEO_EXYNOS4_IS_COMMON=y
+CONFIG_VIDEO_S5P_FIMC=y
+CONFIG_VIDEO_S5P_MIPI_CSIS=y
+CONFIG_VIDEO_EXYNOS_FIMC_LITE=y
+CONFIG_VIDEO_EXYNOS4_FIMC_IS=y
+# CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE is not set
 CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
-CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
-CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
+CONFIG_VIDEO_SAMSUNG_S5P_JPEG=y
+CONFIG_VIDEO_SAMSUNG_S5P_MFC=y

 #
 # STMicroelectronics media platform drivers
@ -3384,10 +3385,10 @@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 #
 # CONFIG_VIDEO_XILINX is not set
 CONFIG_UVC_COMMON=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_V4L2=y
+CONFIG_VIDEOBUF2_MEMOPS=y
+CONFIG_VIDEOBUF2_DMA_CONTIG=y
 CONFIG_VIDEOBUF2_VMALLOC=m
 # end of Media drivers

@ -4613,6 +4614,7 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set

 #
 # USB Peripheral Controller
@ -4633,9 +4635,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # end of USB Peripheral Controller

 CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_F_ACM=y
+CONFIG_USB_U_SERIAL=y
 CONFIG_USB_U_ETHER=y
 CONFIG_USB_F_NCM=y
 CONFIG_USB_F_RNDIS=y
+CONFIG_USB_F_MASS_STORAGE=y
 CONFIG_USB_CONFIGFS=y
 # CONFIG_USB_CONFIGFS_SERIAL is not set
 CONFIG_USB_CONFIGFS_ACM=y
--- a/device/community/linux-postmarketos-mediatek-mt8173/APKBUILD
+++ b/device/community/linux-postmarketos-mediatek-mt8173/APKBUILD
@ -1,7 +1,7 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.12
+pkgver=6.12.3
 pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
@ -66,7 +66,7 @@ package() {
 }

 sha512sums="
-a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548  linux-6.12.tar.xz
-efd69df1f1fabe08ec8aacd7366bb9527ac4cf40847e9d2a2a893c17c78786434f504cb8c11a1b914263eac91f5b2ecabb2677a202a30913e514521274258345  config-postmarketos-mediatek-mt8173.aarch64
+a87aadeec3d65d7e9aaa63affdd74e31bc94e84fb153e633a2e6bb2be62e0c6d5b195dc7a1db8666216308b640db577a75e05bb7aeb91db646f3fdfdec51f1aa  linux-6.12.3.tar.xz
+e01144ce2fbe721cc79b58936411324cdbfa2ba40f94fd525d592502897048adbb7dfb28cacaf688dd29ab1326494e80459d72a7d6b2a90f06d73a86e4a2ca07  config-postmarketos-mediatek-mt8173.aarch64
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 "
--- a/device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64
+++ b/device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.0 Kernel Configuration
+# Linux/arm64 6.12.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@ -988,6 +988,7 @@ CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
+CONFIG_VMAP_PFN=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
 CONFIG_ARCH_USES_PG_ARCH_2=y
@ -6784,10 +6785,8 @@ CONFIG_COMMON_CLK_MT8192=y
 # CONFIG_COMMON_CLK_MT8192_VENCSYS is not set
 CONFIG_COMMON_CLK_MT8195=y
 CONFIG_COMMON_CLK_MT8195_APUSYS=y
-CONFIG_COMMON_CLK_MT8195_AUDSYS=y
 CONFIG_COMMON_CLK_MT8195_IMP_IIC_WRAP=y
 CONFIG_COMMON_CLK_MT8195_MFGCFG=y
-CONFIG_COMMON_CLK_MT8195_MSDC=y
 CONFIG_COMMON_CLK_MT8195_SCP_ADSP=y
 CONFIG_COMMON_CLK_MT8195_VDOSYS=y
 CONFIG_COMMON_CLK_MT8195_VPPSYS=y
@ -6824,6 +6823,7 @@ CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
 CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_ARM64_ERRATUM_858921=y
+# CONFIG_ARM_TIMER_SP804 is not set
 CONFIG_MTK_TIMER=y
 CONFIG_MTK_CPUX_TIMER=y
 # end of Clock Source drivers
--- a/device/community/linux-postmarketos-qcom-laptop/APKBUILD
+++ b/device/community/linux-postmarketos-qcom-laptop/APKBUILD
@ -0,0 +1,87 @@
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
+pkgname=linux-postmarketos-qcom-laptop
+pkgver=6.12
+pkgrel=0
+# Commit from branch @ https://github.com/jhovold/linux/tree/wip/x1e80100-$pkgver
+_commit="93bd777d19aa0e8b58dee1eb837a16acf56035b0"
+pkgdesc="Generic kernel for Qualcomm laptops"
+arch="aarch64"
+_carch="arm64"
+_flavor="postmarketos-qcom-laptop"
+url="https://kernel.org"
+license="GPL-2.0-only"
+options="!strip
+	!check
+	!tracedeps
+	pmb:cross-native
+	pmb:kconfigcheck-community
+	pmb:kconfigcheck-containers
+	pmb:kconfigcheck-uefi
+"
+makedepends="
+	bash
+	bc
+	bison
+	devicepkg-dev
+	findutils
+	flex
+	git
+	openssl-dev
+	perl
+	python3
+	zstd
+"
+replaces="linux-lenovo-21bx"
+
+# Source
+_repository="linux"
+source="
+	$pkgname-$_commit.tar.gz::https://github.com/jhovold/$_repository/archive/$_commit.tar.gz
+	misc.config
+	pmos.config
+"
+builddir="$srcdir/linux-$_commit"
+_outdir="out"
+_defconfig="johan_defconfig"
+
+prepare() {
+	default_prepare
+	cp "$srcdir/pmos.config" "$builddir"/arch/"$_carch"/configs/
+	cp "$srcdir/misc.config" "$builddir"/arch/"$_carch"/configs/
+
+	# Generate .config
+	unset LDFLAGS
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor" \
+		"$_defconfig" pmos.config misc.config
+}
+
+build() {
+	unset LDFLAGS
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor"
+}
+
+package() {
+	install -Dm644 "$builddir/arch/$_carch/boot/vmlinuz.efi" \
+			"$pkgdir/boot/linux.efi"
+
+	make modules_install dtbs_install \
+		ARCH="$_carch" \
+		INSTALL_PATH="$pkgdir"/boot/ \
+		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_MOD_STRIP=1 \
+		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs
+
+	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
+
+	install -D "$builddir"/include/config/kernel.release \
+		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
+}
+
+sha512sums="
+af20b0d7e46e31de152a01e6c811c691f3866add856d4b8cc3e665fde2f10d0fa4ccb401cf3583e4975c0ccb281369fc019825ad274c4edad49f0e8069c154fc  linux-postmarketos-qcom-laptop-93bd777d19aa0e8b58dee1eb837a16acf56035b0.tar.gz
+c343baeb03f91a16994fd53e7cf1be0590be591c3a02e583d897f6b84ee9b33662cac513f84e1756fed58ab283c16471492bf227a1adb00f5bdd660ea4631ef1  misc.config
+e3238b32255fba51bf9364a0c9f70d35a95e07d51704dfcd999045fa84a08251707d4da95bb09d8b86502838b8d6d6187b968f33c54c8c7eea883a02096bc6a8  pmos.config
+"
--- a/device/community/linux-postmarketos-qcom-laptop/misc.config
+++ b/device/community/linux-postmarketos-qcom-laptop/misc.config
@ -0,0 +1,5 @@
+CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_USB_SERIAL_PL2303=m
--- a/device/community/linux-postmarketos-qcom-laptop/pmos.config
+++ b/device/community/linux-postmarketos-qcom-laptop/pmos.config
@ -0,0 +1,302 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+
+CONFIG_BLK_DEV_DM=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_CGROUPS=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_DEVTMPFS=y
+CONFIG_DM_CRYPT=m
+CONFIG_EXT4_FS=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_MD=y
+CONFIG_SYSVIPC=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_USER_NS=y
+CONFIG_VT=y
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+
+# Anbox / Waydroid
+CONFIG_ANDROID_BINDER_IPC=y
+# CONFIG_ANDROID_BINDERFS is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_CGROUP_BPF=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_FUSE_FS=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_PSI=y
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VLAN_8021Q=m
+
+# iwd
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CMAC=y
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_KEYS=y
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_RFKILL=y
+
+# nftables
+CONFIG_NETFILTER=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_CT=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+
+# /usr/share/docker/contrib/check-config.sh (from Gentoo)
+# Missing dependency?
+CONFIG_NET_SCHED=y
+
+# Generally Necessary:
+CONFIG_NAMESPACES=y
+CONFIG_NET_NS=y
+CONFIG_PID_NS=y
+CONFIG_IPC_NS=y
+CONFIG_UTS_NS=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_CPUSETS=y
+CONFIG_KEYS=y
+CONFIG_VETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_IP_NF_NAT=m
+CONFIG_NF_NAT=m
+CONFIG_POSIX_MQUEUE=y
+
+# Optional Features:
+CONFIG_USER_NS=y
+CONFIG_SECCOMP=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_BLK_CGROUP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_CGROUP_PERF=y
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_RR=m
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_VXLAN=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_IPVLAN=m
+CONFIG_MACVLAN=m
+CONFIG_DUMMY=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_OVERLAY_FS=m
+
+# lxc
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+
+# ZRAM
+CONFIG_CRYPTO_LZ4=y
+CONFIG_CRYPTO_ZSTD=y
+CONFIG_SWAP=y
+CONFIG_ZRAM=m
+CONFIG_ZRAM_BACKEND_LZ4=y
+CONFIG_ZRAM_BACKEND_ZSTD=y
+CONFIG_ZRAM_DEF_COMP_ZSTD=y
+
+# netboot
+CONFIG_BLK_DEV_NBD=m
+
+# WireGuard
+CONFIG_WIREGUARD=m
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_CT=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_CONNTRACK_MARK=y
+
+# File systems
+CONFIG_BTRFS_FS=m
+CONFIG_EXFAT_FS=m
+CONFIG_EXT4_FS=y
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_UDF_FS=m
+CONFIG_XFS_FS=m
+
+# Community
+CONFIG_BINFMT_MISC=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_CIFS=m
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_UCLAMP_TASK=y
+CONFIG_UCLAMP_TASK_GROUP=y
+CONFIG_DM_INTEGRITY=m
+
+# Input
+CONFIG_HIDRAW=y
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_UHID=m
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_HIDDEV=y
+CONFIG_USB_PRINTER=m
+
+# USB
+CONFIG_DRM_UDL=m
+CONFIG_SND_USB_AUDIO=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_STORAGE=y
+CONFIG_USB_RTL8152=m
+CONFIG_USB_USBNET=m
+
+# USB Gadget
+CONFIG_U_SERIAL_CONSOLE=y
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+
+# USB net
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_ACM=m
+CONFIG_USB_WDM=m
+
+# LED triggers
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_TTY=m
+
+# Bluetooth devices
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+# EFI
+CONFIG_EFI=y
+CONFIG_EFI_ZBOOT=y
+CONFIG_FB_EFI=y
+CONFIG_VFAT_FS=y
+CONFIG_NLS_ASCII=y
+CONFIG_PSTORE=y
+CONFIG_EFI_VARS_PSTORE=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+
+# libcamera
+CONFIG_DMABUF_HEAPS=y
+CONFIG_DMABUF_HEAPS_CMA=y
+CONFIG_DMABUF_HEAPS_SYSTEM=y
+CONFIG_UDMABUF=y
+
+# enable uvcvideo for basic USB webcam/HDMI-dongle support
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+
+# Debug
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+
+# Virtualization
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_KVM=y
+CONFIG_VIRTUALIZATION=y
--- a/device/community/linux-postmarketos-qcom-sdm670/APKBUILD
+++ b/device/community/linux-postmarketos-qcom-sdm670/APKBUILD
@ -4,8 +4,8 @@

 _flavor="postmarketos-qcom-sdm670"
 pkgname=linux-$_flavor
-pkgver=6.11.3
-pkgrel=1
+pkgver=6.12.3
+pkgrel=0
 pkgdesc="Mainline Kernel fork for SDM670 devices"
 arch="aarch64"
 _carch="arm64"
@ -66,6 +66,6 @@ package() {
 }

 sha512sums="
-c0503c5de978df3925143d2d27f973c9ce41612020fc5d7d21bf8137c9b6c7f8f0fab6dff7fd8f59606d0b80d51ccc8cb41f8617a4a39befc7cfd4aec5d2fa97  linux-sdm670-v6.11.3.tar.gz
-0aa0a1daa7a898dd6bc5bbdd79599ca6385c13424e0b5fc38f68b4b2d9ee05fcda27337704a21f0af2eba4469eea6381e2c2aad5fbc424d943838093c3181a4e  config-postmarketos-qcom-sdm670.aarch64
+6f9942e6b30d5bf745a53ed666b3b0e76448a42ffa1962fa31a75dd1a7198ead12f80958ac405877b8e8ef6046486a629fe7d362a1760c3dc496993344b4e1bd  linux-sdm670-v6.12.3.tar.gz
+9b568027d03e8d4ce6885786f862a31641b16b72876d14364ad0c8b29331231b3ce6efbbe2cd1a4a077fd8a47cb050380add65eeaafc31c7e8ebb6d5f6632b8e  config-postmarketos-qcom-sdm670.aarch64
 "
--- a/device/community/linux-postmarketos-qcom-sdm670/config-postmarketos-qcom-sdm670.aarch64
+++ b/device/community/linux-postmarketos-qcom-sdm670/config-postmarketos-qcom-sdm670.aarch64
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.3 Kernel Configuration
+# Linux/arm64 6.12.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 14.2.0"
 CONFIG_CC_IS_GCC=y
@ -11,6 +11,8 @@ CONFIG_AS_VERSION=24300
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24300
 CONFIG_LLD_VERSION=0
+CONFIG_RUSTC_VERSION=108300
+CONFIG_RUSTC_LLVM_VERSION=180108
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@ -183,6 +185,7 @@ CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_GROUP_SCHED_WEIGHT=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 # CONFIG_RT_GROUP_SCHED is not set
@ -193,6 +196,7 @@ CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
+# CONFIG_CPUSETS_V1 is not set
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
@ -284,6 +288,7 @@ CONFIG_CRASH_DUMP=y
 # end of General setup

 CONFIG_ARM64=y
+CONFIG_RUSTC_SUPPORTS_ARM64=y
 CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
@ -451,6 +456,7 @@ CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y
 CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y
 CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y
 CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
+CONFIG_ARCH_DEFAULT_CRASH_DUMP=y
 CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y
 CONFIG_TRANS_TABLE=y
 CONFIG_XEN_DOM0=y
@ -523,8 +529,14 @@ CONFIG_ARM64_MTE=y
 CONFIG_ARM64_EPAN=y
 # end of ARMv8.7 architectural features

+#
+# ARMv8.9 architectural features
+#
+CONFIG_ARM64_POE=y
+CONFIG_ARCH_PKEY_BITS=3
+# end of ARMv8.9 architectural features
+
 CONFIG_ARM64_SVE=y
-CONFIG_ARM64_SME=y
 # CONFIG_ARM64_PSEUDO_NMI is not set
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
@ -643,7 +655,9 @@ CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 # CONFIG_NVHE_EL2_DEBUG is not set
+# CONFIG_PTDUMP_STAGE2_DEBUGFS is not set
 CONFIG_CPU_MITIGATIONS=y
+CONFIG_ARCH_HAS_DMA_OPS=y

 #
 # General architecture-dependent options
@ -738,6 +752,7 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_ARCH_SUPPORTS_RT=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
@ -752,6 +767,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_RELR=y
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@ -788,11 +804,12 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS_NONE is not set
+CONFIG_MODULE_COMPRESS=y
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS_XZ is not set
 CONFIG_MODULE_COMPRESS_ZSTD=y
-CONFIG_MODULE_DECOMPRESS=y
+CONFIG_MODULE_COMPRESS_ALL=y
+# CONFIG_MODULE_DECOMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
@ -877,7 +894,6 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=m
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@ -909,8 +925,9 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_SPLIT_PMD_PTLOCKS=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
@ -936,6 +953,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_THP_SWAP=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
+CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP=y
+CONFIG_ARCH_SUPPORTS_PMD_PFNMAP=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@ -952,8 +971,11 @@ CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
+CONFIG_VMAP_PFN=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-CONFIG_ARCH_USES_PG_ARCH_X=y
+CONFIG_ARCH_HAS_PKEYS=y
+CONFIG_ARCH_USES_PG_ARCH_2=y
+CONFIG_ARCH_USES_PG_ARCH_3=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
@ -971,6 +993,8 @@ CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
 CONFIG_EXECMEM=y
+CONFIG_NUMA_MEMBLKS=y
+# CONFIG_NUMA_EMU is not set

 #
 # Data Access Monitoring
@ -984,6 +1008,7 @@ CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
 CONFIG_NET_XGRESS=y
 CONFIG_SKB_EXTENSIONS=y
+CONFIG_NET_DEVMEM=y

 #
 # Networking options
@ -1512,6 +1537,7 @@ CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_QCA=y
 # CONFIG_BT_HCIUART_AG6XX is not set
 # CONFIG_BT_HCIUART_MRVL is not set
+# CONFIG_BT_HCIUART_AML is not set
 # CONFIG_BT_HCIBCM203X is not set
 # CONFIG_BT_HCIBPA10X is not set
 # CONFIG_BT_HCIBFUSB is not set
@ -1688,14 +1714,28 @@ CONFIG_MHI_BUS=m
 #
 CONFIG_ARM_SCMI_PROTOCOL=y
 # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set
+# CONFIG_ARM_SCMI_DEBUG_COUNTERS is not set
+
+#
+# SCMI Transport Drivers
+#
 CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
 CONFIG_ARM_SCMI_HAVE_SHMEM=y
 CONFIG_ARM_SCMI_HAVE_MSG=y
 CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
-CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
 CONFIG_ARM_SCMI_TRANSPORT_SMC=y
 # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
+CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
+# end of SCMI Transport Drivers
+
+#
+# ARM SCMI NXP i.MX Vendor Protocols
+#
+CONFIG_IMX_SCMI_BBM_EXT=y
+CONFIG_IMX_SCMI_MISC_EXT=y
+# end of ARM SCMI NXP i.MX Vendor Protocols
+
 # CONFIG_ARM_SCMI_POWER_CONTROL is not set
 # end of ARM System Control and Management Interface Protocol

@ -1707,6 +1747,7 @@ CONFIG_GOOGLE_COREBOOT_TABLE=m
 # CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT is not set
 # CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
 # CONFIG_GOOGLE_VPD is not set
+CONFIG_IMX_SCMI_MISC_DRV=y
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set

@ -1717,7 +1758,6 @@ CONFIG_QCOM_SCM=y
 CONFIG_QCOM_TZMEM=y
 # CONFIG_QCOM_TZMEM_MODE_GENERIC is not set
 CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QCOM_QSEECOM=y
 # end of Qualcomm firmware drivers

@ -1752,10 +1792,15 @@ CONFIG_OF_NUMA=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 CONFIG_ZRAM=m
+# CONFIG_ZRAM_BACKEND_LZ4 is not set
+# CONFIG_ZRAM_BACKEND_LZ4HC is not set
+CONFIG_ZRAM_BACKEND_ZSTD=y
+# CONFIG_ZRAM_BACKEND_DEFLATE is not set
+# CONFIG_ZRAM_BACKEND_842 is not set
+CONFIG_ZRAM_BACKEND_LZO=y
 # CONFIG_ZRAM_DEF_COMP_LZORLE is not set
-CONFIG_ZRAM_DEF_COMP_ZSTD=y
-# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
+CONFIG_ZRAM_DEF_COMP_ZSTD=y
 CONFIG_ZRAM_DEF_COMP="zstd"
 # CONFIG_ZRAM_WRITEBACK is not set
 CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y
@ -1789,6 +1834,7 @@ CONFIG_VIRTIO_BLK=y
 #
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_DUMMY_IRQ is not set
+# CONFIG_RPMB is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_HI6421V600_IRQ is not set
@ -2006,6 +2052,7 @@ CONFIG_NET_VENDOR_MICREL=y
 CONFIG_NET_VENDOR_MICROCHIP=y
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCX24J600 is not set
+# CONFIG_LAN865X is not set
 # CONFIG_LAN966X_SWITCH is not set
 # CONFIG_VCAP is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
@ -2016,6 +2063,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_ETHOC is not set
+# CONFIG_OA_TC6 is not set
 CONFIG_NET_VENDOR_PENSANDO=y
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_SPI is not set
@ -2334,8 +2382,8 @@ CONFIG_KEYBOARD_GPIO_POLLED=m
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_LM8333 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
 # CONFIG_KEYBOARD_MPR121 is not set
+CONFIG_KEYBOARD_IMX_BBM_SCMI=y
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_PINEPHONE is not set
@ -2421,7 +2469,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_CY8CTMA140 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP5 is not set
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
@ -2447,7 +2494,6 @@ CONFIG_TOUCHSCREEN_ELAN=m
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 # CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MMS114 is not set
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
 # CONFIG_TOUCHSCREEN_MSG2638 is not set
@ -2666,7 +2712,6 @@ CONFIG_DEVPORT=y
 #
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y

@ -2696,6 +2741,8 @@ CONFIG_I2C_HELPER_AUTO=y
 #
 # CONFIG_I2C_CADENCE is not set
 # CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=y
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO is not set
@ -2941,6 +2988,7 @@ CONFIG_GPIO_WCD934X=m
 #
 # MFD GPIO expanders
 #
+CONFIG_GPIO_ADP5585=m
 # CONFIG_GPIO_CROS_EC is not set
 # CONFIG_GPIO_WM8994 is not set
 # end of MFD GPIO expanders
@ -3225,6 +3273,7 @@ CONFIG_THERMAL=y
 # CONFIG_THERMAL_NETLINK is not set
 # CONFIG_THERMAL_STATISTICS is not set
 # CONFIG_THERMAL_DEBUGFS is not set
+# CONFIG_THERMAL_CORE_TESTING is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
@ -3299,6 +3348,7 @@ CONFIG_BCMA_POSSIBLE=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+CONFIG_MFD_ADP5585=m
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_SMPRO is not set
@ -3479,7 +3529,7 @@ CONFIG_REGULATOR_MT6360=y
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 CONFIG_REGULATOR_PWM=y
-# CONFIG_REGULATOR_QCOM_REFGEN is not set
+CONFIG_REGULATOR_QCOM_REFGEN=m
 # CONFIG_REGULATOR_QCOM_RPM is not set
 CONFIG_REGULATOR_QCOM_RPMH=y
 CONFIG_REGULATOR_QCOM_SMD_RPM=y
@ -3558,6 +3608,7 @@ CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_CEC_CH7322 is not set
 # CONFIG_CEC_CROS_EC is not set
 # CONFIG_CEC_GPIO is not set
+# CONFIG_USB_EXTRON_DA_HD_4K_PLUS_CEC is not set
 # CONFIG_USB_PULSE8_CEC is not set
 # CONFIG_USB_RAINSHADOW_CEC is not set
 # end of CEC support
@ -3897,6 +3948,7 @@ CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
 CONFIG_DRM_KMS_HELPER=y
+# CONFIG_DRM_PANIC is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
@ -3965,6 +4017,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 # CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
+# CONFIG_DRM_PANEL_BOE_TV101WUM_LL2 is not set
 # CONFIG_DRM_PANEL_EBBG_FT8719 is not set
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
@ -4238,10 +4291,10 @@ CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
 CONFIG_SND_CTL_FAST_LOOKUP=y
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_CTL_INPUT_VALIDATION is not set
+# CONFIG_SND_UTIMER is not set
 # CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
@ -4567,6 +4620,7 @@ CONFIG_SND_SOC_WSA884X=m
 # CONFIG_SND_SOC_ZL38060 is not set
 # CONFIG_SND_SOC_MAX9759 is not set
 # CONFIG_SND_SOC_MT6351 is not set
+CONFIG_SND_SOC_MT6357=m
 CONFIG_SND_SOC_MT6358=m
 # CONFIG_SND_SOC_MT6660 is not set
 # CONFIG_SND_SOC_NAU8315 is not set
@ -4633,6 +4687,7 @@ CONFIG_HID_EZKEY=y
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_GLORIOUS is not set
 # CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_GOODIX_SPI is not set
 # CONFIG_HID_GOOGLE_HAMMER is not set
 # CONFIG_HID_GOOGLE_STADIA_FF is not set
 # CONFIG_HID_VIVALDI is not set
@ -4764,7 +4819,6 @@ CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
 # CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_DBGCAP is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
@ -4932,6 +4986,7 @@ CONFIG_USB_QCOM_EUD=m
 # CONFIG_USB_LINK_LAYER_TEST is not set
 # CONFIG_USB_CHAOSKEY is not set
 CONFIG_USB_ONBOARD_DEV=m
+# CONFIG_USB_ONBOARD_DEV_USB5744 is not set

 #
 # USB Physical Layer drivers
@ -5284,6 +5339,7 @@ CONFIG_RTC_DRV_TPS6594=m
 # CONFIG_RTC_DRV_RV3028 is not set
 # CONFIG_RTC_DRV_RV3032 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_SD2405AL is not set
 # CONFIG_RTC_DRV_SD3078 is not set

 #
@ -5340,6 +5396,7 @@ CONFIG_RTC_DRV_CROS_EC=y
 # CONFIG_RTC_DRV_CADENCE is not set
 # CONFIG_RTC_DRV_FTRTC010 is not set
 CONFIG_RTC_DRV_PM8XXX=m
+CONFIG_RTC_DRV_IMX_BBM_SCMI=y
 # CONFIG_RTC_DRV_R7301 is not set

 #
@ -5368,6 +5425,7 @@ CONFIG_DMA_OF=y
 # CONFIG_XILINX_XDMA is not set
 # CONFIG_XILINX_ZYNQMP_DMA is not set
 # CONFIG_XILINX_ZYNQMP_DPDMA is not set
+# CONFIG_AMD_QDMA is not set
 CONFIG_QCOM_BAM_DMA=y
 CONFIG_QCOM_GPI_DMA=m
 CONFIG_QCOM_HIDMA_MGMT=y
@ -5507,7 +5565,6 @@ CONFIG_VIDEO_MAX96712=m
 # CONFIG_STAGING_MEDIA_DEPRECATED is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_FB_TFT is not set
-# CONFIG_KS7010 is not set
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_GOLDFISH is not set
@ -5638,14 +5695,15 @@ CONFIG_SDM_VIDEOCC_845=y
 CONFIG_SDM_DISPCC_845=m
 CONFIG_SDM_LPASSCC_845=m
 # CONFIG_SDX_GCC_75 is not set
+# CONFIG_SM_CAMCC_4450 is not set
 # CONFIG_SM_CAMCC_6350 is not set
 # CONFIG_SM_CAMCC_7150 is not set
+# CONFIG_SM_CAMCC_8150 is not set
 # CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_CAMCC_8450 is not set
 # CONFIG_SM_CAMCC_8550 is not set
 # CONFIG_SM_CAMCC_8650 is not set
 # CONFIG_SM_DISPCC_8250 is not set
-# CONFIG_SM_DISPCC_8650 is not set
 # CONFIG_SM_GCC_4450 is not set
 # CONFIG_SM_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
@ -5658,6 +5716,7 @@ CONFIG_SM_GCC_8250=y
 # CONFIG_SM_GCC_8450 is not set
 # CONFIG_SM_GCC_8550 is not set
 # CONFIG_SM_GCC_8650 is not set
+# CONFIG_SM_GPUCC_4450 is not set
 # CONFIG_SM_GPUCC_6115 is not set
 # CONFIG_SM_GPUCC_6125 is not set
 # CONFIG_SM_GPUCC_6375 is not set
@ -5674,7 +5733,6 @@ CONFIG_SM_TCSRCC_8550=y
 # CONFIG_SM_VIDEOCC_8150 is not set
 CONFIG_SM_VIDEOCC_8250=y
 # CONFIG_SM_VIDEOCC_8350 is not set
-# CONFIG_SM_VIDEOCC_8550 is not set
 # CONFIG_SPMI_PMIC_CLKDIV is not set
 CONFIG_QCOM_HFPLL=y
 # CONFIG_KPSS_XCC is not set
@ -5690,12 +5748,14 @@ CONFIG_HWSPINLOCK_QCOM=y
 #
 CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
+CONFIG_CLKSRC_MMIO=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
 CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_ARM64_ERRATUM_858921=y
+CONFIG_ARM_TIMER_SP804=y
 # end of Clock Source drivers

 CONFIG_MAILBOX=y
@ -5916,6 +5976,7 @@ CONFIG_EXTCON=y
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_LC824206XA is not set
 # CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_PTN5150 is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
@ -5956,6 +6017,8 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_ADXL367_I2C is not set
 # CONFIG_ADXL372_SPI is not set
 # CONFIG_ADXL372_I2C is not set
+# CONFIG_ADXL380_SPI is not set
+# CONFIG_ADXL380_I2C is not set
 # CONFIG_BMA180 is not set
 # CONFIG_BMA220 is not set
 # CONFIG_BMA400 is not set
@ -5993,7 +6056,9 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 #
 # Analog to digital converters
 #
+# CONFIG_AD4000 is not set
 # CONFIG_AD4130 is not set
+# CONFIG_AD4695 is not set
 # CONFIG_AD7091R5 is not set
 # CONFIG_AD7091R8 is not set
 # CONFIG_AD7124 is not set
@ -6044,6 +6109,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_MCP3911 is not set
 # CONFIG_MEDIATEK_MT6360_ADC is not set
 # CONFIG_NAU7802 is not set
+# CONFIG_PAC1921 is not set
 # CONFIG_PAC1934 is not set
 CONFIG_QCOM_VADC_COMMON=y
 CONFIG_QCOM_SPMI_RRADC=m
@ -6182,6 +6248,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_DS4424 is not set
 # CONFIG_LTC1660 is not set
 # CONFIG_LTC2632 is not set
+# CONFIG_LTC2664 is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5522 is not set
@ -6267,6 +6334,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # CONFIG_AM2315 is not set
 # CONFIG_DHT11 is not set
+# CONFIG_ENS210 is not set
 # CONFIG_HDC100X is not set
 # CONFIG_HDC2010 is not set
 # CONFIG_HDC3020 is not set
@ -6313,6 +6381,7 @@ CONFIG_IIO_ST_LSM6DSX_SPI=m
 # CONFIG_APDS9306 is not set
 # CONFIG_APDS9960 is not set
 # CONFIG_AS73211 is not set
+# CONFIG_BH1745 is not set
 # CONFIG_BH1750 is not set
 # CONFIG_BH1780 is not set
 # CONFIG_CM32181 is not set
@ -6449,6 +6518,7 @@ CONFIG_IIO_CROS_EC_BARO=m
 # CONFIG_MPRLS0025PA is not set
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
+# CONFIG_SDP500 is not set
 # CONFIG_IIO_ST_PRESS is not set
 # CONFIG_T5403 is not set
 # CONFIG_HP206C is not set
@ -6465,6 +6535,7 @@ CONFIG_IIO_CROS_EC_BARO=m
 # Proximity and distance sensors
 #
 # CONFIG_CROS_EC_MKBP_PROXIMITY is not set
+# CONFIG_HX9023S is not set
 # CONFIG_IRSD200 is not set
 # CONFIG_ISL29501 is not set
 # CONFIG_LIDAR_LITE_V2 is not set
@ -6479,6 +6550,7 @@ CONFIG_IIO_CROS_EC_BARO=m
 # CONFIG_SRF08 is not set
 # CONFIG_VCNL3020 is not set
 # CONFIG_VL53L0X_I2C is not set
+# CONFIG_AW96103 is not set
 # end of Proximity and distance sensors

 #
@ -6510,6 +6582,7 @@ CONFIG_IIO_CROS_EC_BARO=m

 CONFIG_PWM=y
 # CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_ADP5585=m
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_CLK is not set
 CONFIG_PWM_CROS_EC=m
@ -6603,6 +6676,7 @@ CONFIG_ARM_CCI400_PMU=y
 CONFIG_ARM_CCI5xx_PMU=y
 CONFIG_ARM_CCN=m
 CONFIG_ARM_CMN=m
+# CONFIG_ARM_NI is not set
 CONFIG_ARM_PMU=y
 CONFIG_ARM_SMMU_V3_PMU=m
 CONFIG_ARM_PMUV3=y
@ -6636,6 +6710,7 @@ CONFIG_NVMEM_LAYOUTS=y
 #
 CONFIG_NVMEM_LAYOUT_SL28_VPD=m
 # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+# CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set
 # end of Layout Types

 CONFIG_NVMEM_QCOM_QFPROM=y
@ -6682,9 +6757,11 @@ CONFIG_INTERCONNECT_QCOM=y
 CONFIG_INTERCONNECT_QCOM_BCM_VOTER=y
 # CONFIG_INTERCONNECT_QCOM_MSM8909 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
+# CONFIG_INTERCONNECT_QCOM_MSM8937 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8939 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8953 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
+# CONFIG_INTERCONNECT_QCOM_MSM8976 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8996 is not set
 CONFIG_INTERCONNECT_QCOM_OSM_L3=y
 # CONFIG_INTERCONNECT_QCOM_QCM2290 is not set
@ -6856,6 +6933,7 @@ CONFIG_TMPFS_XATTR=y
 CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
+CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
 # end of Pseudo filesystems
@ -6950,6 +7028,7 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SWN_UPCALL is not set
 # CONFIG_CIFS_ROOT is not set
+# CONFIG_CIFS_COMPRESSION is not set
 # CONFIG_SMB_SERVER is not set
 CONFIG_SMBFS=y
 # CONFIG_CODA_FS is not set
@ -7039,13 +7118,14 @@ CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_SAFESETID is not set
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
 # CONFIG_SECURITY_LANDLOCK is not set
+# CONFIG_SECURITY_IPE is not set
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
 CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,bpf"
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,ipe,bpf"

 #
 # Kernel hardening options
@ -7406,7 +7486,9 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_ARM64=y
 CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_RISCV=y
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
@ -7427,7 +7509,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
+CONFIG_DMA_OPS_HELPERS=y
 CONFIG_NEED_SG_DMA_FLAGS=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
@ -7474,6 +7556,7 @@ CONFIG_OID_REGISTRY=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_VDSO_GETRANDOM=y
 CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@ -7792,6 +7875,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_MIN_HEAP is not set
 # CONFIG_TEST_DIV64 is not set
+# CONFIG_TEST_MULDIV64 is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_TEST_REF_TRACKER is not set
 # CONFIG_RBTREE_TEST is not set
--- a/device/community/linux-postmarketos-qcom-sm8250/APKBUILD
+++ b/device/community/linux-postmarketos-qcom-sm8250/APKBUILD
--- a/device/community/linux-postmarketos-qcom-sm8250/config-postmarketos-qcom-sm8250.aarch64
+++ b/device/community/linux-postmarketos-qcom-sm8250/config-postmarketos-qcom-sm8250.aarch64
--- a/device/community/soc-qcom-sdm845/APKBUILD
+++ b/device/community/soc-qcom-sdm845/APKBUILD
@ -2,7 +2,7 @@
 # Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=23
+pkgver=25
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@ -25,7 +25,7 @@ subpackages="
 	$pkgname-vulkan
 "

-_ucm_commit="45cb4c634e534ddfb255e85162fe705f94a23015"
+_ucm_commit="70d89261a7d30273fba9c6e67a072699f9f88151"
 source="
 	10-initramfs-sdm845.files
 	51-qcom-sdm845.conf
@ -153,7 +153,7 @@ sha512sums="
 28c14f47eaedec577d152001c51753537c98f267ac4a0acf78a304efebe5f6a1b4dc6d501497da9a0a925806a1d9c80b25e001cf9b1eb21efa22cd6a41ff753b  51-qcom-sdm845.conf
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
-af58c9dfcbeb9fe01e433c36e869bef1f2fe03e1087fb28fb6752008d5320b5ac19c32aa64bb88f7d3a619d8e20ab001ec36f11960957d806cc3b14eb30b377d  alsa-ucm-conf-45cb4c634e534ddfb255e85162fe705f94a23015.tar.gz
+f6d03f3b03f944b29b588464e2e26f4f4cc185368714f9e623c1211174ea172efb81a765980c9a289112f5bf8c5c4aafdfd87c0094890069fc3d7c73b29456bc  alsa-ucm-conf-70d89261a7d30273fba9c6e67a072699f9f88151.tar.gz
 6fb4c0bd8b7ed534d855a6732ccff783960e3cfa0e0cc7effcbb93afa00798dec15361a37a3200081bc114c8d266b7a0851cc4e819ad36eabdb47a50c72620d9  call_audio_idle_suspend_workaround.confd
 5a58475b6e2ee1d655f3f23d8dc19e1cb2f32f1dfff3b9a9337d9c5baad1ec24bfaec0fb9cc03f00e5a291bee27c6b8bffbc65157e2bee5d65ef6d1adcb0910b  call_audio_idle_suspend_workaround.initd
 6da0a9209f114354aa2aa1185ec3896a8e0bb1bfce0dc3fc4c0de339cf1389feaa2d724e733c251ff032a5e86d37d9549e94f8f7c7a5accfedbd8a4d6316bbfd  call_audio_idle_suspend_workaround.sh
--- a/device/community/soc-samsung-exynos4412/60-flashlight.rules
+++ b/device/community/soc-samsung-exynos4412/60-flashlight.rules
@ -0,0 +1 @@
+SUBSYSTEM=="leds", DEVPATH=="*/*:flash", RUN+="/bin/chmod g+w /sys%p/brightness /sys%p/flash_strobe", RUN+="/bin/chown :video /sys%p/brightness /sys%p/flash_strobe"
--- a/device/community/soc-samsung-exynos4412/APKBUILD
+++ b/device/community/soc-samsung-exynos4412/APKBUILD
@ -1,16 +1,18 @@
 # Maintainer: Newbyte <newbyte@disroot.org>
 pkgname=soc-samsung-exynos4412
 pkgdesc="Common package for Samsung Exynos 4412 devices"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="armv7"
 options="!check !archcheck !tracedeps"
 subpackages="
+	$pkgname-cameraflash
 	$pkgname-haptics
 "
 source="
+	60-flashlight.rules
 	90-feedbackd-max77693-haptic.rules
 "

@ -18,6 +20,12 @@ package() {
 	mkdir -p "$pkgdir"
 }

+cameraflash() {
+	# Rear camera flash udev rules
+	install -Dm644 "$srcdir"/60-flashlight.rules \
+		-t "$subpkgdir"/usr/lib/udev/rules.d
+}
+
 haptics() {
 	# feedbackd haptics udev rules
 	install -Dm644 "$srcdir"/90-feedbackd-max77693-haptic.rules \
@ -25,5 +33,6 @@ haptics() {
 }

 sha512sums="
+9170da7ac869254644f2fc8d914102f2c16e917dbeb53e33b96c76936711d0540f55fa5c2526d73d5fe244500bc2728bc9d629e2524cf52c573d11e833aee666  60-flashlight.rules
 083bd692bd52f6ea2dc80351b91c24d8856d3ecd68bb2823dd821073c31b0f2d4556a2b5d861bf4b709cb3b1a4dc4d28648834ee2dd09b795ebfa3b30182ae94  90-feedbackd-max77693-haptic.rules
 "
--- a/device/main/linux-purism-librem5/APKBUILD
+++ b/device/main/linux-purism-librem5/APKBUILD
@ -3,8 +3,8 @@
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=linux-purism-librem5
-pkgver=6.6.57
-pkgrel=1
+pkgver=6.6.63
+pkgrel=0
 # NOTE: Don't forget to rebase the config! See prepare() for instructions.
 _purismrel=1
 _pureosrel=cri1
@ -91,6 +91,6 @@ package() {
 }

 sha512sums="
-ffee8cf12018130a3699ca720d2ae5b81adf9ce2ffe4480a0b2e39e6524a0cae6de74e3ad8da9b3af7d0c2ac263ef528ff2d1bece7f5059f2b885585cdc5809e  linux-purism-librem5-6.6.57pureos1_cri1.tar.gz
-321984f53e5ab8b19b005d5378e2601dea8b494e26bf44d22b642b03cc5e4aac7ec0837439128e06bd21b655efbb7f5d0bfbc1bfd9080fb7ea8ff78edec20b56  config-purism-librem5.aarch64
+86c63d7bb8a40b7134d7b683d9dd94284c6594c4e1905c3063499cadc5ab5e71234ce810948916a1038b7ac124f6ebb37dbc882a9d7ab4444d93493442bc8435  linux-purism-librem5-6.6.63pureos1_cri1.tar.gz
+c30bea97f445a9166d959db5398c08c1009e3de91d5a6a2df105e4a12ea1e678919459551655058ba83460db85cd0cbce897f6260f3db9885f9ec55290c09721  config-purism-librem5.aarch64
 "
--- a/device/main/linux-purism-librem5/config-purism-librem5.aarch64
+++ b/device/main/linux-purism-librem5/config-purism-librem5.aarch64
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.57 Kernel Configuration
+# Linux/arm64 6.6.63 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@ -1984,6 +1984,7 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
 CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
 # CONFIG_ZRAM_DEF_COMP_LZ4 is not set
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
--- a/device/main/u-boot-librem5/0003-libfdt.i_shipped-use-SWIG_AppendOutput.patch
+++ b/device/main/u-boot-librem5/0003-libfdt.i_shipped-use-SWIG_AppendOutput.patch
@ -0,0 +1 @@
+../../.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch
--- a/device/main/u-boot-librem5/APKBUILD
+++ b/device/main/u-boot-librem5/APKBUILD
@ -4,7 +4,7 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=u-boot-librem5
 pkgver=2022.10
-pkgrel=2
+pkgrel=3
 # 'upstream/librem5' branch in uboot repo
 _commit="c4960dade272da9d6a7f53f6956d4d6747d573e9"
 # 'librem5' branch in atf repo
@ -35,6 +35,7 @@ source="
 	update-u-boot
 	0001-librem5-enable-console-on-UART4.patch
 	0002-libfdt-Fix-invalid-version-warning.patch
+	0003-libfdt.i_shipped-use-SWIG_AppendOutput.patch
 	"
 install="$pkgname.post-upgrade"
 install="$pkgname.post-upgrade $pkgname-devkit.post-upgrade"
@ -119,4 +120,5 @@ d35e46b94ebf50a7ffcedf824f19bca5195cbf0bbcee1dd6cea115f090a3a963975e6eaaa33eac62
 e46a863001872943301f9712e45797553ce52d8b0c3e63dba7beb1a54b857e8f3a715863b84cd7ab784f039f82d29a2b19b581891d11a84c342b1570e5ccfed3  update-u-boot
 f5c8a49bda189639386f2367418ab492f10e0e3c0c3f4ca078c461c0cf4427e113a90f49c37f01ef4db0a6e0f55d4f0a6346777e291918866821e659077e374a  0001-librem5-enable-console-on-UART4.patch
 895a6e7794257a2b13ecd4e10426d1539338b3ed2000df99ec94c7a319154895794a60aeae2946f4ca32d37095e4142ebbdb049bbccf70f257e77e977b1cedf8  0002-libfdt-Fix-invalid-version-warning.patch
+016ef30dbbb1021dad4f58eeda3f5a5e89ff3a76dbc69e8e4cf6a3fc3983aef998cfe1087abb4b21bb2f859bd5cffe26c1da42d13f1c3d2e3c053c399f38720b  0003-libfdt.i_shipped-use-SWIG_AppendOutput.patch
 "
--- a/device/main/u-boot-pinephone/0003-libfdt.i_shipped-use-SWIG_AppendOutput.patch
+++ b/device/main/u-boot-pinephone/0003-libfdt.i_shipped-use-SWIG_AppendOutput.patch
@ -0,0 +1 @@
+../../.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch
--- a/device/main/u-boot-pinephone/APKBUILD
+++ b/device/main/u-boot-pinephone/APKBUILD
@ -3,7 +3,7 @@
 # U-boot with patches to make the PinePhone boot faster and have control over the ddr clock speed
 pkgname=u-boot-pinephone
 pkgver=2023.01
-pkgrel=3
+pkgrel=4
 pkgdesc="U-Boot bootloader for the PINE64 PinePhone"
 url="https://source.denx.de/u-boot"
 arch="aarch64"
@ -27,6 +27,7 @@ source="https://source.denx.de/u-boot/u-boot/-/archive/v$pkgver/u-boot-v$pkgver.
 	update-u-boot
 	0001-common-expose-DRAM-clock-speed.patch
 	0002-disable-bootdelay.patch
+	0003-libfdt.i_shipped-use-SWIG_AppendOutput.patch
 	"
 builddir="$srcdir/u-boot-v$pkgver"
 _frequencies='528 552 624'
@ -65,4 +66,5 @@ c25aae1b0d2f677d295587c6d318f23d52bc3a79e968bed9093645943a9840c56b1f6f44e5649d23
 8dc0a8847ed26d91d3acc9b7b9dd300f95a68049207b09c3cfca1ec485f6f976aa65e0d101a4b46ecc4e85e943cbdec35e81ab0da07b1d5d0b68b4b10858b44b  update-u-boot
 0a05291f5d544854b6e27c7c3290878c55382c50e0374c880d457e7c21425eaec23fd67047fd7e629dba3fa060aa041dec5880e7edc9e52dea897fb93af5d2aa  0001-common-expose-DRAM-clock-speed.patch
 9b9a5bd2cb5c04715a5bb2d34bfc06e63817dba7ec40fa2b09000a0827590623e85ed5877d6b6bb39f2bb917e5e9d8e1379e3df9128e3304be06abc487c68df2  0002-disable-bootdelay.patch
+016ef30dbbb1021dad4f58eeda3f5a5e89ff3a76dbc69e8e4cf6a3fc3983aef998cfe1087abb4b21bb2f859bd5cffe26c1da42d13f1c3d2e3c053c399f38720b  0003-libfdt.i_shipped-use-SWIG_AppendOutput.patch
 "
--- a/device/testing/device-amediatech-x96-mini/APKBUILD
+++ b/device/testing/device-amediatech-x96-mini/APKBUILD
@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=device-amediatech-x96-mini
-pkgver=2
+pkgver=3
 pkgrel=0
 pkgdesc="Amediatech X96 mini"
 url="https://postmarketos.org"
@ -32,6 +32,6 @@ nonfree_firmware() {

 sha512sums="
 981ef458837524b2b1922e7bc5abd4936d629e3f83e92062b46597cef985b65fdb90900de1ef93a7d741b9b0ac4b41cef9c3c2625181ff0e10effc22cb2fa3a3  asound.state
-c7d9003f62a5622b2bf70a2a6a9affbc803b71d687db5775ff608b69eb2eab2c8d52fe6cda93d27a0f01e2c04c9d19952ac382014319080491afc0af3ae37162  deviceinfo
+aa23fb720f9fa5ed82b809fdc1aea6500f9747ddbb553907bc4292633bd7611e6ec07310ea72ce3fd3be6ee5e8a80ddb84d51901ce29d25a7725f423f66c6b7a  deviceinfo
 b9f3e1902c17909de928c99868265a257ba5873f6ea6aa1097ad10721f59d68342d50ee51992472ecd23722f7664a13dd15f4e26071a40595c7c3e5161e533d7  modules-initfs
 "
--- a/device/testing/device-amediatech-x96-mini/deviceinfo
+++ b/device/testing/device-amediatech-x96-mini/deviceinfo
@ -8,6 +8,7 @@ deviceinfo_dtb="amlogic/meson-gxl-s905w-x96-mini"
 deviceinfo_year="2017"
 deviceinfo_arch="aarch64"
 deviceinfo_disable_dhcpd="true"
+deviceinfo_partition_type="msdos"

 # Device related
 deviceinfo_gpu_accelerated="true"
--- a/device/testing/device-amlogic-tvbox/APKBUILD
+++ b/device/testing/device-amlogic-tvbox/APKBUILD
@ -2,7 +2,7 @@
 # Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-amlogic-tvbox
 pkgdesc="Amlogic TV box"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@ -58,6 +58,6 @@ kernel_xiaomi_once() {
 }

 sha512sums="
-f676256f02dba6e0dcdf3ef763cb96e4a0e6b44ba5cddfb0e675a808d5dd37267abb9086d9fa401d7cb39cf99f7fe63866baacb0d9959b7357cc8824236e3789  deviceinfo
+f0051118ea2948821b11bf754c55e926fd3e35be1b1682310e45cf80e174c69ea3e7f13f294deef741a6198407e9b12b366202009269f80207ca45d7130bb786  deviceinfo
 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs
 "
--- a/device/testing/device-amlogic-tvbox/deviceinfo
+++ b/device/testing/device-amlogic-tvbox/deviceinfo
@ -12,6 +12,7 @@ deviceinfo_dtb_p212="amlogic/meson-gxl-p212"
 deviceinfo_dtb_videostrong_kii_pro="amlogic/meson-gxbb-kii-pro"
 deviceinfo_dtb_xiaomi_once="amlogic/meson-gxl-s905x-xiaomi-once"
 deviceinfo_arch="aarch64"
+deviceinfo_partition_type="msdos"

 # Device related
 deviceinfo_chassis="desktop"
--- a/device/testing/device-beelink-gt1/APKBUILD
+++ b/device/testing/device-beelink-gt1/APKBUILD
@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer:
 pkgname=device-beelink-gt1
-pkgver=1
-pkgrel=6
+pkgver=2
+pkgrel=0
 pkgdesc="Beelink gt1 (Ultimate)"
 url="https://postmarketos.org"
 license="MIT"
@ -50,7 +50,7 @@ nonfree_firmware() {

 sha512sums="
 a38e33d5bce26549c73f9aad2988ef8d7e7a3bbb28ac37348545fe7edb935be1b51dbdf8a857fb9d49be7e6eab7d40ac2f11fdcd618487747b809f7236ccf57b  asound.state
-7e772410cde1110e6b91a08fffdc6d8bc123497857f44ed2a9842deb6d63c107033659dafb25c075198be01ad2f83935e17eded06634680ddfe84776153834e5  deviceinfo
+b6099ab1d0f1f0f7d00c65275d0f5366793adf8755296408e0494decf4f6740e425ed1013c9940bdb869e66283b890b3e7446fbf171f3da692b1b67c9381c23f  deviceinfo
 b9f3e1902c17909de928c99868265a257ba5873f6ea6aa1097ad10721f59d68342d50ee51992472ecd23722f7664a13dd15f4e26071a40595c7c3e5161e533d7  modules-initfs.alpine
 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs.amlogic
 "
--- a/device/testing/device-beelink-gt1/deviceinfo
+++ b/device/testing/device-beelink-gt1/deviceinfo
@ -8,6 +8,7 @@ deviceinfo_codename="beelink-gt1"
 deviceinfo_dtb="amlogic/meson-gxm-gt1-ultimate"
 deviceinfo_year="2016"
 deviceinfo_arch="aarch64"
+deviceinfo_partition_type="msdos"

 # Device related
 deviceinfo_gpu_accelerated="true"
--- a/device/testing/device-librecomputer-lafrite/APKBUILD
+++ b/device/testing/device-librecomputer-lafrite/APKBUILD
@ -2,7 +2,7 @@
 # Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-librecomputer-lafrite
 pkgdesc="Libre Computer AML-S805X-AC-V1.0"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@ -12,7 +12,6 @@ depends="
 	linux-postmarketos-amlogic
 	postmarketos-base
 	soc-amlogic-s905
-	u-boot-librecomputer-lafrite
 "
 makedepends="devicepkg-dev"
 source="
@ -36,6 +35,6 @@ nonfree_firmware() {
 }

 sha512sums="
-604613ffd6b9cabafacc868fb13e4a70849070df534ed646d517af721ffc9b7cbb73638b4934924b366cc9f7bdb05d10a664e3c88855ee52ba78c01895e11069  deviceinfo
+84a0ac6e3f0ab540cb274aa5557e30f2a500e367bfcddcc192a2bf809db079910ba73619469287399a1243d69291710af76f6507fc9122d8f6ff1533c54450bd  deviceinfo
 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs
 "
--- a/device/testing/device-librecomputer-lafrite/deviceinfo
+++ b/device/testing/device-librecomputer-lafrite/deviceinfo
@ -22,7 +22,4 @@ deviceinfo_screen_height="600"
 deviceinfo_flash_method="none"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_generate_extlinux_config="true"
-deviceinfo_sd_embed_firmware_step_size="512"
-deviceinfo_sd_embed_firmware="u-boot/librecomputer-lafrite/u-boot.bin.sd-stripped.bin:1"
-deviceinfo_boot_part_start="4096"
 deviceinfo_kernel_cmdline="quiet loglevel=2"
--- a/device/testing/device-librecomputer-lepotato/APKBUILD
+++ b/device/testing/device-librecomputer-lepotato/APKBUILD
@ -2,7 +2,7 @@
 # Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-librecomputer-lepotato
 pkgdesc="Libre Computer AML-S905X-CC-V1.0"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@ -36,6 +36,6 @@ nonfree_firmware() {
 }

 sha512sums="
-b5005b9546c95275c9370a0ec808fbb80b0c46adfc5e3819c364df662ee88d8483b3ec150fb0b2a5a20fb13500f8c34ad19e5b68dd662eeac9d3f421feb5529f  deviceinfo
+79a809f6b2397b1e9d7a6a3d23811fe74eeb28f9039fef1f52329da9399a234d21161f92ffd1350efe5907195f8a8a6cb11e75c7264b4cb826afc942e903fc11  deviceinfo
 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs
 "
--- a/device/testing/device-librecomputer-lepotato/deviceinfo
+++ b/device/testing/device-librecomputer-lepotato/deviceinfo
@ -9,6 +9,7 @@ deviceinfo_codename="librecomputer-lepotato"
 deviceinfo_year="2019"
 deviceinfo_dtb="amlogic/meson-gxl-s905x-libretech-cc"
 deviceinfo_arch="aarch64"
+deviceinfo_partition_type="msdos"

 # Device related
 deviceinfo_chassis="embedded"
--- a/device/testing/device-radxa-zero/APKBUILD
+++ b/device/testing/device-radxa-zero/APKBUILD
@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=device-radxa-zero
-pkgver=1
-pkgrel=4
+pkgver=2
+pkgrel=0
 pkgdesc="Radxa Zero"
 url="https://postmarketos.org"
 license="MIT"
@ -37,6 +37,6 @@ nonfree_firmware() {


 sha512sums="
-ebd96850655228d7a063312f71058e90306622914443453378e0079cfd235357b62c80abf8fadd9ca2b266cc8df0a6624920eb34467f606b661a4bd97b23030b  deviceinfo
+7626cb1d74af15ff89f70b9c7578daa71aeec5c5237db50ca188ce820dfab7a26f921f7c1c8c37a3ea4f57bed1797ff0ca7da4c0e065e68b509c191f15867c64  deviceinfo
 b9f3e1902c17909de928c99868265a257ba5873f6ea6aa1097ad10721f59d68342d50ee51992472ecd23722f7664a13dd15f4e26071a40595c7c3e5161e533d7  modules-initfs
 "
--- a/device/testing/device-radxa-zero/deviceinfo
+++ b/device/testing/device-radxa-zero/deviceinfo
@ -8,6 +8,7 @@ deviceinfo_codename="radxa-zero"
 deviceinfo_dtb="amlogic/meson-g12a-radxa-zero"
 deviceinfo_year="2021"
 deviceinfo_arch="aarch64"
+deviceinfo_partition_type="msdos"

 # Device related
 deviceinfo_gpu_accelerated="true"
--- a/device/testing/device-samsung-a51/APKBUILD
+++ b/device/testing/device-samsung-a51/APKBUILD
@ -0,0 +1,46 @@
+# Maintainer: Hendra Manudinata <hendra@manoedinata.com>
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-samsung-a51
+pkgdesc="Samsung Galaxy A51"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	linux-samsung-a51
+	mkbootimg
+	postmarketos-base
+	postmarketos-base-downstream
+	make-dynpart-mappings
+	msm-fb-refresher
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	NetworkManager-conf.d-swlan0-p2p0-unmanaged.conf
+"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	# Disable swlan0 (additionally x0wlan0) & p2p0 management
+	install -Dm644 NetworkManager-conf.d-swlan0-p2p0-unmanaged.conf "$pkgdir"/usr/lib/NetworkManager/conf.d/swlan0-p2p0-unmanaged.conf
+}
+
+nonfree_firmware() {
+	pkgdesc="Non-free firmware for Samsung Galaxy A51 (a51)"
+	depends="firmware-samsung-a51"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+d593b87411e15546609646daae6d9192368046dde5ee5f1e15833ce2062bd310b6305943e52f1a0804d8276088df9342bf4f026dc418cbf44db630389954f54f  deviceinfo
+10dc120045062a47b11ab4762dcb4425b2a521b2bcede4e4d3b691f9f2cf2ced77bdff059992ff55cd11af59663802ecb8e750ca02ee70cfa8950b9a090b5dfb  NetworkManager-conf.d-swlan0-p2p0-unmanaged.conf
+"
--- a/device/testing/device-samsung-a51/NetworkManager-conf.d-swlan0-p2p0-unmanaged.conf
+++ b/device/testing/device-samsung-a51/NetworkManager-conf.d-swlan0-p2p0-unmanaged.conf
@ -0,0 +1,5 @@
+[main]
+plugins=keyfile
+
+[keyfile]
+unmanaged-devices=interface-name:swlan0;interface-name:x0wlan0;interface-name:p2p0
--- a/device/testing/device-samsung-a51/deviceinfo
+++ b/device/testing/device-samsung-a51/deviceinfo
@ -0,0 +1,41 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Samsung Galaxy A51"
+deviceinfo_manufacturer="Samsung"
+deviceinfo_codename="samsung-a51"
+deviceinfo_year="2019"
+deviceinfo_dtb="exynos9610"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2400"
+
+# Bootloader related
+deviceinfo_flash_method="heimdall-bootimg"
+deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.selinux=permissive loop.max_part=7"
+deviceinfo_generate_bootimg="true"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_header_version="2"
+deviceinfo_append_dtb="false"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_flash_offset_dtb="0x00000000"
+deviceinfo_flash_offset_base="0x10000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0xf0000000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_heimdall_partition_kernel="boot"
+deviceinfo_flash_heimdall_partition_rootfs="super"
+
+# Dynamic partition (super)
+deviceinfo_super_partitions="/dev/sda25 /dev/sda25"
+
+# USB
+deviceinfo_usb_idProduct="0x685d"
+deviceinfo_usb_idVendor="0x04e8"
--- a/device/testing/device-samsung-fortuna/APKBUILD
+++ b/device/testing/device-samsung-fortuna/APKBUILD
@ -0,0 +1,135 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
+pkgname=device-samsung-fortuna
+pkgdesc="Samsung Galaxy Grand Prime"
+pkgver=5
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8916
+	soc-qcom-msm8916-rproc
+"
+makedepends="devicepkg-dev"
+source="deviceinfo modules-initfs"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-kernel-fortuna3g:kernel_fortuna3g
+	$pkgname-kernel-gprimeltecan:kernel_fortuna3g
+	$pkgname-kernel-grandprimelte:kernel_grandprimelte
+"
+_variants="
+	fortuna3g
+	gprimeltecan
+	grandprimelte
+"
+
+for _variant in $_variants; do
+	subpackages="
+		$subpackages
+		${pkgname%-fortuna}-$_variant-nonfree-firmware:nonfree_firmware_$_variant
+	"
+done
+
+_pmb_select="soc-qcom-msm8916-rproc"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+kernel_fortuna3g() {
+	pkgdesc="$pkgdesc (SM-G530H)"
+	depends="$pkgname=$pkgver-r$pkgrel linux-postmarketos-qcom-msm8916"
+
+	# Backwards compatibility for old device package name
+	local _old_pkgname="device-samsung-fortuna3g"
+	replaces="$_old_pkgname"
+	provides="$_old_pkgname=$pkgver-r$pkgrel"
+
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_gprimeltecan() {
+	pkgdesc="$pkgdesc (SM-G530W)"
+	depends="$pkgname=$pkgver-r$pkgrel linux-postmarketos-qcom-msm8916"
+
+	# Backwards compatibility for old device package name
+	local _old_pkgname="device-samsung-gprimeltecan"
+	replaces="$_old_pkgname"
+	provides="$_old_pkgname=$pkgver-r$pkgrel"
+
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_grandprimelte() {
+	pkgdesc="$pkgdesc (SM-G530FZ)"
+	depends="$pkgname=$pkgver-r$pkgrel linux-postmarketos-qcom-msm8916"
+
+	# Backwards compatibility for old device package name
+	local _old_pkgname="device-samsung-gprimeltexx"
+	replaces="$_old_pkgname"
+	provides="$_old_pkgname=$pkgver-r$pkgrel"
+
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader"
+
+	mkdir "$subpkgdir"
+}
+
+nonfree_firmware_fortuna3g() {
+	local _variant="fortuna3g"
+	pkgdesc="WiFi/BT firmware configuration (SM-G530H)"
+	depends="firmware-samsung-$_variant-wcnss-nv"
+	install_if="
+		$pkgname-kernel-$_variant=$pkgver-r$pkgrel
+		$pkgname-nonfree-firmware=$pkgver-r$pkgrel
+	"
+
+	mkdir "$subpkgdir"
+}
+
+nonfree_firmware_gprimeltecan() {
+	local _variant="gprimeltecan"
+	pkgdesc="WiFi/BT firmware configuration (SM-G530W)"
+	depends="firmware-samsung-$_variant-wcnss-nv"
+	install_if="
+		$pkgname-kernel-$_variant=$pkgver-r$pkgrel
+		$pkgname-nonfree-firmware=$pkgver-r$pkgrel
+	"
+
+	mkdir "$subpkgdir"
+}
+
+nonfree_firmware_grandprimelte() {
+	local _variant="grandprimelte"
+	pkgdesc="WiFi/BT firmware configuration (SM-G530FZ)"
+	depends="firmware-samsung-$_variant-wcnss-nv"
+	install_if="
+		$pkgname-kernel-$_variant=$pkgver-r$pkgrel
+		$pkgname-nonfree-firmware=$pkgver-r$pkgrel
+	"
+
+	# Backwards compatibility for old device package name
+	local _old_pkgname="device-samsung-gprimeltexx-nonfree-firmware"
+	replaces="$_old_pkgname"
+	provides="$_old_pkgname=$pkgver-r$pkgrel"
+
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+c95156cbaee8dca8600ffbc1143575fe4b5c9eaf09545f265d1950f0f36e91175deff2789176629f5171309477c63ae4a62de3ff185f131abe226202f0c756ba  deviceinfo
+02b6d383149ba2ec3a31b206767be7ead31d9f0e7ee5cab11047000c53ccad387a118cbddb06093bca5cae3e82f884c02194de47b8e7a9c76102ac46506bb111  modules-initfs
+"
--- a/device/testing/device-samsung-gprimeltexx/deviceinfo
+++ b/device/testing/device-samsung-gprimeltexx/deviceinfo
@ -2,11 +2,13 @@
 # Please use double quotes only. You can source this file in shell scripts.

 deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy Grand Prime (G530FZ)"
+deviceinfo_name="Samsung Galaxy Grand Prime"
 deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-gprimeltexx"
+deviceinfo_codename="samsung-fortuna"
 deviceinfo_year="2014"
-deviceinfo_dtb="qcom/msm8916-samsung-gprimeltecan"
+deviceinfo_dtb_fortuna3g="qcom/msm8916-samsung-fortuna3g"
+deviceinfo_dtb_gprimeltecan="qcom/msm8916-samsung-gprimeltecan"
+deviceinfo_dtb_grandprimelte="qcom/msm8916-samsung-grandprimelte"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"

--- a/device/testing/device-samsung-fortuna3g/modules-initfs
+++ b/device/testing/device-samsung-fortuna3g/modules-initfs
--- a/device/testing/device-samsung-fortuna3g/APKBUILD
+++ b/device/testing/device-samsung-fortuna3g/APKBUILD
@ -1,34 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-fortuna3g
-pkgdesc="Samsung Galaxy Grand Prime 3G (G530H)"
-pkgver=4
-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"
-makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-_pmb_select="soc-qcom-msm8916-rproc"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
-	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-fortuna3g-wcnss-nv"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-82dac2964a2fa415257c3bbc226a850ba59339af728dc13369f1a92c1b2214e0116d32a82cecaae02d80439d8032a38bbdd7877c320b5d2c5756724c593096fb  deviceinfo
-02b6d383149ba2ec3a31b206767be7ead31d9f0e7ee5cab11047000c53ccad387a118cbddb06093bca5cae3e82f884c02194de47b8e7a9c76102ac46506bb111  modules-initfs
-"
--- a/device/testing/device-samsung-fortuna3g/deviceinfo
+++ b/device/testing/device-samsung-fortuna3g/deviceinfo
@ -1,41 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy Grand Prime 3G (G530H)"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-fortuna3g"
-deviceinfo_year="2014"
-deviceinfo_dtb="qcom/msm8916-samsung-fortuna3g"
-deviceinfo_append_dtb="true"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="540"
-deviceinfo_screen_height="960"
-deviceinfo_getty="ttyMSM0;115200"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
-deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
-deviceinfo_flash_offset_base="0x80000000"
-deviceinfo_flash_offset_kernel="0x00080000"
-deviceinfo_flash_offset_ramdisk="0x02000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x01e00000"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_sparse="true"
-
-# Samsung Electronics Co., Ltd
-deviceinfo_usb_idVendor="0x04e8"
-# Galaxy (MTP)
-deviceinfo_usb_idProduct="0x6860"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
--- a/device/testing/device-samsung-gprimeltecan/APKBUILD
+++ b/device/testing/device-samsung-gprimeltecan/APKBUILD
@ -1,34 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-gprimeltecan
-pkgdesc="Samsung Galaxy Grand Prime CAN (G530W)"
-pkgver=4
-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"
-makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-_pmb_select="soc-qcom-msm8916-rproc"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
-	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-gprimeltecan-wcnss-nv"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-ba287d22a5839624881c39cde5c6f0640fea461e5579d43bb5678340e2a067b8af5d06150844698c73768c5a72b03cdf8e789f9a16663391b5729eb330ba57fe  deviceinfo
-02b6d383149ba2ec3a31b206767be7ead31d9f0e7ee5cab11047000c53ccad387a118cbddb06093bca5cae3e82f884c02194de47b8e7a9c76102ac46506bb111  modules-initfs
-"
--- a/device/testing/device-samsung-gprimeltecan/deviceinfo
+++ b/device/testing/device-samsung-gprimeltecan/deviceinfo
@ -1,41 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy Grand Prime CAN (G530W)"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-gprimeltecan"
-deviceinfo_year="2014"
-deviceinfo_dtb="qcom/msm8916-samsung-gprimeltecan"
-deviceinfo_append_dtb="true"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="540"
-deviceinfo_screen_height="960"
-deviceinfo_getty="ttyMSM0;115200"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
-deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
-deviceinfo_flash_offset_base="0x80000000"
-deviceinfo_flash_offset_kernel="0x00080000"
-deviceinfo_flash_offset_ramdisk="0x02000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x01e00000"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_sparse="true"
-
-# Samsung Electronics Co., Ltd
-deviceinfo_usb_idVendor="0x04e8"
-# Galaxy (MTP)
-deviceinfo_usb_idProduct="0x6860"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
--- a/device/testing/device-samsung-gprimeltecan/modules-initfs
+++ b/device/testing/device-samsung-gprimeltecan/modules-initfs
@ -1,6 +0,0 @@
-panel-samsung-hx8389c-gh9607501a
-panel-samsung-s6d78a0-gh9607501a
-msm
-zinitix
-rt5033
-rt5033-charger
--- a/device/testing/device-samsung-gprimeltexx/APKBUILD
+++ b/device/testing/device-samsung-gprimeltexx/APKBUILD
@ -1,38 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-gprimeltexx
-pkgdesc="Samsung Galaxy Grand Prime (G530FZ)"
-pkgver=4
-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"
-makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-initfs
-"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-_pmb_select="soc-qcom-msm8916-rproc"
-
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
-	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-gprimeltexx-wcnss-nv"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-5571f8291ca4d75c6465607326d58df9220f7cf433ba338d4a36dd2082b6554d1b665c061dc07f3026d42d0dcf69069b5a420927bd7c342ca73ef44e3f3153c3  deviceinfo
-02b6d383149ba2ec3a31b206767be7ead31d9f0e7ee5cab11047000c53ccad387a118cbddb06093bca5cae3e82f884c02194de47b8e7a9c76102ac46506bb111  modules-initfs
-"
--- a/device/testing/device-samsung-gprimeltexx/modules-initfs
+++ b/device/testing/device-samsung-gprimeltexx/modules-initfs
@ -1,6 +0,0 @@
-panel-samsung-hx8389c-gh9607501a
-panel-samsung-s6d78a0-gh9607501a
-msm
-zinitix
-rt5033
-rt5033-charger
--- a/device/testing/device-samsung-kminilte/APKBUILD
+++ b/device/testing/device-samsung-kminilte/APKBUILD
@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-kminilte
 pkgdesc="Samsung Galaxy S5 Mini"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@ -36,6 +36,6 @@ nonfree_firmware() {
 }

 sha512sums="
-c9289a138d334048d30dafa37db395b7bb79462fc79b77b4ce4faba55ff8d1668b64b8ac85a53d32867f765f3edfea7983fcdf121a46c59957f7bd2d7d1f112e  deviceinfo
+2f35116ed45597260a60caa80f96b4bc69525d1b0546c4e62665951e02ad7010345d4233b456926fa9af7266cb2954414a35ce4f8fc2b23c053e1f8a7531c9d3  deviceinfo
 245efec73f85ef715c877d6c24eb4b7b677d250bd38167dc19b1b0ed84c3ea91049576adbbf21dd48940c08e40f0294a1a01b0ab3e56efd794109a7e7ebc1104  fb.modes
 "
--- a/device/testing/device-samsung-kminilte/deviceinfo
+++ b/device/testing/device-samsung-kminilte/deviceinfo
@ -20,6 +20,8 @@ deviceinfo_dev_touchscreen="/dev/input/event2"
 deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_create_initfs_extra="true"
+deviceinfo_flash_sparse="true"
 deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
--- a/device/testing/device-samsung-m3/APKBUILD
+++ b/device/testing/device-samsung-m3/APKBUILD
@ -3,7 +3,7 @@
 pkgname=device-samsung-m3
 pkgdesc="Samsung Galaxy S III LTE"
 pkgver=8
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-exynos4
 	mkbootimg
 	postmarketos-base
+	soc-samsung-exynos4412-cameraflash
 	soc-samsung-exynos4412-haptics
 	"
 makedepends="devicepkg-dev"
--- a/device/testing/device-samsung-t03g/APKBUILD
+++ b/device/testing/device-samsung-t03g/APKBUILD
@ -2,7 +2,7 @@
 pkgname=device-samsung-t03g
 pkgdesc="Samsung Galaxy Note II (GSM)"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@ -11,6 +11,7 @@ depends="
 	alsa-ucm-conf
 	mkbootimg
 	postmarketos-base
+	soc-samsung-exynos4412-cameraflash
 	soc-samsung-exynos4412-haptics
 "
 makedepends="devicepkg-dev"
--- a/device/testing/device-samsung-t0lte/APKBUILD
+++ b/device/testing/device-samsung-t0lte/APKBUILD
@ -2,7 +2,7 @@
 pkgname=device-samsung-t0lte
 pkgdesc="Samsung Galaxy Note II LTE"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@ -11,6 +11,7 @@ depends="
 	alsa-ucm-conf
 	mkbootimg
 	postmarketos-base
+	soc-samsung-exynos4412-cameraflash
 	soc-samsung-exynos4412-haptics
 "
 makedepends="devicepkg-dev"
--- a/device/testing/device-zte-b860hv5/APKBUILD
+++ b/device/testing/device-zte-b860hv5/APKBUILD
@ -2,8 +2,8 @@
 # Maintainer: Doni Halim <donihaalim@gmail.com>
 pkgname=device-zte-b860hv5
 pkgdesc="ZTE ZXV10 B860HV5"
-pkgver=0.1
-pkgrel=1
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@ -28,6 +28,6 @@ package() {
 }

 sha512sums="
-c1d8a2047649cb745cb12226f1ce19cfeb6926a06d9f257446cd84600a1fbdb1fec3acb100502119cf95e0c0bf37a41756a41149406bf42fb76ef4b510da5ae0  deviceinfo
+bc718817e2b07c8720c5cfb7390c6c4d73e13b6dd81cd9c5bcfa1b4c9ed4edc83ca563e9127e367e26d03133cc2316cdc88318001bfa8e53125920eff599e327  deviceinfo
 cbd7012fcb2db0f11f694ffa621e4c47447f6b36690366da35a16918b20e58a0324cfd07eb3ed7165887e099100286098d19ae131bd62ac8b3a088780f59a1d8  modules-initfs
 "
--- a/device/testing/device-zte-b860hv5/deviceinfo
+++ b/device/testing/device-zte-b860hv5/deviceinfo
@ -9,6 +9,7 @@ deviceinfo_codename="zte-b860hv5"
 deviceinfo_year="2019"
 deviceinfo_dtb="amlogic/meson-g12a-b860hv5"
 deviceinfo_arch="aarch64"
+deviceinfo_partition_type="msdos"

 # Device related
 deviceinfo_chassis="embedded"
--- a/device/testing/firmware-samsung-a51/APKBUILD
+++ b/device/testing/firmware-samsung-a51/APKBUILD
@ -0,0 +1,39 @@
+# Maintainer: Hendra Manudinata <hendra@manoedinata.com>
+pkgname=firmware-samsung-a51
+pkgver=1
+pkgrel=0
+pkgdesc="Proprietary firmware for Samsung Galaxy A51 (a51)"
+url="https://dumps.tadiphone.dev/dumps/samsung/a51"
+arch="aarch64"
+license="proprietary"
+options="!check !archcheck !tracedeps pmb:cross-native"
+
+_commit="4c72faa15ca0875510fde40a4b0686d4c161d0b4"
+_repo="$url/-/raw/$_commit"
+
+_files_wifi="
+mx
+mx140.bin
+mx140_wlan.hcf
+mx140_wlan_sw.hcf
+"
+
+for _file in $_files_wifi; do
+	source="$source $pkgname-$_commit-$_file::$_repo/vendor/etc/wifi/$_file"
+done
+
+package() {
+	a51_dir="$pkgdir/lib/firmware/postmarketos/samsung-a51"
+	local file
+	for file in $_files_wifi; do
+		install -Dm644 "$srcdir/$pkgname-$_commit-$file" \
+			"$a51_dir/mx140/$file"
+	done
+}
+
+sha512sums="
+cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e  firmware-samsung-a51-4c72faa15ca0875510fde40a4b0686d4c161d0b4-mx
+2a94883cab2b623eee67a0cf6f38d6a35264d01b03b69efc2292bf18dfa6d1280370e486c2021fb6ba3ddfd5e79dce8fd0febe754e8b1d39d30b412ec4fd4a3f  firmware-samsung-a51-4c72faa15ca0875510fde40a4b0686d4c161d0b4-mx140.bin
+31d2097a5b3acf88f63cb3d99cb10ac6329ee7d2ef32ca8312777dbcf452d709eb82f22737024a5cd7f3849a3498b73e377d1f0683d0b49e4d01da9c9b59bb0b  firmware-samsung-a51-4c72faa15ca0875510fde40a4b0686d4c161d0b4-mx140_wlan.hcf
+58a2ea8e2834f4115c704503b18851c18389f11f8b1f657804689b8c09b20b7b8c1f4c4cc677eaa21a4013cdd667715a358df4b4d0bb7ce2b13010845e4deb05  firmware-samsung-a51-4c72faa15ca0875510fde40a4b0686d4c161d0b4-mx140_wlan_sw.hcf
+"
--- a/device/testing/firmware-samsung-fortuna/APKBUILD
+++ b/device/testing/firmware-samsung-fortuna/APKBUILD
@ -0,0 +1,86 @@
+pkgname=firmware-samsung-fortuna
+pkgver=2
+pkgrel=0
+_name="Samsung Galaxy Grand Prime"
+pkgdesc="Firmware for $_name"
+url="https://postmarketos.org"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+
+_subpkgname="${pkgname%-fortuna}"
+_variants="
+	fortuna3g
+	gprimeltecan
+	grandprimelte
+"
+
+for _variant in $_variants; do
+	subpackages="$subpackages $_subpkgname-$_variant-wcnss-nv:wcnss_nv_$_variant"
+done
+
+# armv7 only variant(s)
+_variants_armv7="fortunaltezt"
+
+for _variant in $_variants_armv7; do
+	subpackages="$subpackages $_subpkgname-$_variant-wcnss-nv:wcnss_nv_$_variant:armv7"
+done
+
+_wcnss_nv_bin="WCNSS_qcom_wlan_nv.bin"
+source="
+	$_subpkgname-fortuna3g-$_wcnss_nv_bin.base64::https://pastebin.com/raw/Y8DvfvRf
+	$_subpkgname-fortunaltezt-$_wcnss_nv_bin.base64::https://pastebin.com/raw/s25mBaen
+	$_subpkgname-gprimeltecan-$_wcnss_nv_bin.base64::https://pastebin.com/raw/BxjvzZhd
+	$_subpkgname-grandprimelte-$_wcnss_nv_bin.base64::https://pastebin.com/raw/6rPpqqEE
+"
+
+_fwdir="/lib/firmware/postmarketos"
+
+build() {
+	for _variant in $_variants $_variants_armv7; do
+		base64 -d $_subpkgname-$_variant-$_wcnss_nv_bin.base64 \
+			> $_variant-$_wcnss_nv_bin
+	done
+}
+
+package() {
+	# parent package is empty
+	mkdir -p "$pkgdir"
+}
+
+wcnss_nv_fortuna3g() {
+	pkgdesc="$_name (SM-G530H) WiFi/BT firmware configuration"
+	install -Dm644 "$srcdir"/fortuna3g-$_wcnss_nv_bin -t \
+		"$subpkgdir/$_fwdir"/wlan/prima
+}
+
+wcnss_nv_fortunaltezt() {
+	pkgdesc="$_name (SM-G530Y) WiFi/BT firmware configuration"
+	install -Dm644 "$srcdir"/fortunaltezt-$_wcnss_nv_bin -t \
+		"$subpkgdir/$_fwdir"/wlan/prima
+}
+
+wcnss_nv_gprimeltecan() {
+	pkgdesc="$_name (SM-G530W) WiFi/BT firmware configuration"
+	install -Dm644 "$srcdir"/gprimeltecan-$_wcnss_nv_bin -t \
+		"$subpkgdir/$_fwdir"/wlan/prima
+}
+
+wcnss_nv_grandprimelte() {
+	pkgdesc="$_name (SM-G530FZ) WiFi/BT firmware configuration"
+
+	# Backwards compatibility for old device package name
+	local _old_pkgname="firmware-samsung-gprimeltexx"
+	replaces="$_old_pkgname-wcnss-nv"
+	provides="$_old_pkgname-wcnss-nv=$pkgver-r$pkgrel"
+
+	install -Dm644 "$srcdir"/grandprimelte-$_wcnss_nv_bin -t \
+		"$subpkgdir/$_fwdir"/wlan/prima
+}
+
+sha512sums="
+8f46dae0009391871764e3e5cfcb39f565116444ae0882ef3b93cf43418a997a8fb260948d2bb1315ffb33faa82565ec352b1bbee573421363e86325b2bf5a9e  firmware-samsung-fortuna3g-WCNSS_qcom_wlan_nv.bin.base64
+0a34532a0c5bbf69bb6a81ec850951b47c9e059a3ea2ab269dac1dfe19de49a51f98d018d899db2517e95f0ac737f82ff0c46df9bfd3e990b44b7b03062cba2e  firmware-samsung-fortunaltezt-WCNSS_qcom_wlan_nv.bin.base64
+7129e4a5ed999d203d5b097abebd434c4293cb65e4eb387e517e52e91ff6e5939a0d8f25eb45efcee986d856689ba0a3e0887087425ce8d0883688891b25fa55  firmware-samsung-gprimeltecan-WCNSS_qcom_wlan_nv.bin.base64
+2c012fdf0abe58c4864f79d6f084ce3857f8f09a9c5d85dd36b1dd3377dcc4745646047a5929e2e70ab755aca3f1506018b7f389fef4ff00d7f396eecd4f908f  firmware-samsung-grandprimelte-WCNSS_qcom_wlan_nv.bin.base64
+"
--- a/device/testing/firmware-samsung-fortuna3g/APKBUILD
+++ b/device/testing/firmware-samsung-fortuna3g/APKBUILD
@ -1,31 +0,0 @@
-pkgname=firmware-samsung-fortuna3g
-pkgver=1
-pkgrel=1
-_name="Samsung Galaxy Grand Prime 3G (G530H)"
-pkgdesc="Firmware for $_name"
-url="https://postmarketos.org"
-subpackages="$pkgname-wcnss-nv:wcnss_nv"
-arch="aarch64"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/Y8DvfvRf"
-
-_fwdir="/lib/firmware/postmarketos"
-
-build() {
-	base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin
-}
-
-package() {
-	# parent package is empty
-	mkdir -p "$pkgdir"
-}
-
-wcnss_nv() {
-	pkgdesc="$_name WiFi/BT firmware configuration"
-	install -Dm644 "$srcdir"/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir"/wlan/prima
-}
-
-sha512sums="
-8f46dae0009391871764e3e5cfcb39f565116444ae0882ef3b93cf43418a997a8fb260948d2bb1315ffb33faa82565ec352b1bbee573421363e86325b2bf5a9e  firmware-samsung-fortuna3g-WCNSS_qcom_wlan_nv.bin.base64
-"
--- a/device/testing/firmware-samsung-fortunaltezt/APKBUILD
+++ b/device/testing/firmware-samsung-fortunaltezt/APKBUILD
@ -1,31 +0,0 @@
-pkgname=firmware-samsung-fortunaltezt
-pkgver=1
-pkgrel=1
-_name="Samsung Galaxy Grand Prime (SM-G530Y)"
-pkgdesc="Firmware for $_name"
-url="https://postmarketos.org"
-subpackages="$pkgname-wcnss-nv:wcnss_nv"
-arch="armv7"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/s25mBaen"
-
-_fwdir="/lib/firmware/postmarketos"
-
-build() {
-	base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin
-}
-
-package() {
-	# parent package is empty
-	mkdir -p "$pkgdir"
-}
-
-wcnss_nv() {
-	pkgdesc="$_name WiFi/BT firmware configuration"
-	install -Dm644 "$srcdir"/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir"/wlan/prima
-}
-
-sha512sums="
-0a34532a0c5bbf69bb6a81ec850951b47c9e059a3ea2ab269dac1dfe19de49a51f98d018d899db2517e95f0ac737f82ff0c46df9bfd3e990b44b7b03062cba2e  firmware-samsung-fortunaltezt-WCNSS_qcom_wlan_nv.bin.base64
-"
--- a/device/testing/firmware-samsung-gprimeltecan/APKBUILD
+++ b/device/testing/firmware-samsung-gprimeltecan/APKBUILD
@ -1,31 +0,0 @@
-pkgname=firmware-samsung-gprimeltecan
-pkgver=1
-pkgrel=1
-_name="Samsung Galaxy Grand Prime CAN (G530W)"
-pkgdesc="Firmware for $_name"
-url="https://postmarketos.org"
-subpackages="$pkgname-wcnss-nv:wcnss_nv"
-arch="aarch64"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/BxjvzZhd"
-
-_fwdir="/lib/firmware/postmarketos"
-
-build() {
-	base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin
-}
-
-package() {
-	# parent package is empty
-	mkdir -p "$pkgdir"
-}
-
-wcnss_nv() {
-	pkgdesc="$_name WiFi/BT firmware configuration"
-	install -Dm644 "$srcdir"/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir"/wlan/prima
-}
-
-sha512sums="
-7129e4a5ed999d203d5b097abebd434c4293cb65e4eb387e517e52e91ff6e5939a0d8f25eb45efcee986d856689ba0a3e0887087425ce8d0883688891b25fa55  firmware-samsung-gprimeltecan-WCNSS_qcom_wlan_nv.bin.base64
-"
--- a/device/testing/firmware-samsung-gprimeltexx/APKBUILD
+++ b/device/testing/firmware-samsung-gprimeltexx/APKBUILD
@ -1,31 +0,0 @@
-pkgname=firmware-samsung-gprimeltexx
-pkgver=1
-pkgrel=1
-_name="Samsung Galaxy Grand Prime (G530FZ)"
-pkgdesc="Firmware for $_name"
-url="https://postmarketos.org"
-subpackages="$pkgname-wcnss-nv:wcnss_nv"
-arch="aarch64"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/6rPpqqEE"
-
-_fwdir="/lib/firmware/postmarketos"
-
-build() {
-	base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin
-}
-
-package() {
-	# parent package is empty
-	mkdir -p "$pkgdir"
-}
-
-wcnss_nv() {
-	pkgdesc="$_name WiFi/BT firmware configuration"
-	install -Dm644 "$srcdir"/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir"/wlan/prima
-}
-
-sha512sums="
-2c012fdf0abe58c4864f79d6f084ce3857f8f09a9c5d85dd36b1dd3377dcc4745646047a5929e2e70ab755aca3f1506018b7f389fef4ff00d7f396eecd4f908f  firmware-samsung-gprimeltexx-WCNSS_qcom_wlan_nv.bin.base64
-"
--- a/device/testing/linux-next/APKBUILD
+++ b/device/testing/linux-next/APKBUILD
@ -2,7 +2,7 @@
 # Kernel config based on: arch/arm64/configs/defconfig

 pkgname=linux-next
-pkgver=6.12_git20241128
+pkgver=6.13_git20241213
 pkgrel=3
 _nextver="${pkgver#*_git}"
 pkgdesc="Linux next kernel"
@ -69,7 +69,7 @@ package() {
 }

 sha512sums="
-72df1a4bc9d5beaca2e91f6e3814b72bf7994657872d392322a9f4b6acac511a8b1d136a306f55d91603376b134eb37c7ea16b6ac19d4181e944a683b679dc66  linux-next-next-20241128.tar.gz
+43986ad2e15a5aa09ae9cff4c8d2ba7775e08915d29a95470fa2a87e802f0052d936e4cbfae9e44f731f7a0fd16eccbc23332e807c6440711392ae3c80d4dc48  linux-next-next-20241213.tar.gz
 8de0a3791ea671528a9fc753071683dfea68ea4f4c22060fc0ca8a4b1b3d76eaa2a3fd40bb013173f0e55da15dde91cf285902779beb35781b6c90f39244ce11  devices.config
 a30df186f06519e2f519bfe622bbd46caec6c2473a1fd3df370320a661d53882b49cfb2b3be7edd92fabdb4a8e6e3419194e8d43cca3cf4ab1615275dab4fee4  pmos.config
 "
--- a/device/testing/linux-samsung-a51/0001-SQUASH-HACK-DECON-framebuffer-fixes-for-Linux.patch
+++ b/device/testing/linux-samsung-a51/0001-SQUASH-HACK-DECON-framebuffer-fixes-for-Linux.patch
@ -0,0 +1,370 @@
+From c3d6d0c97001f907bbdefb71b9dca6d9cd903998 Mon Sep 17 00:00:00 2001
+From: map220v <map220v300@gmail.com>
+Date: Sat, 16 Jan 2021 14:56:07 +0300
+Subject: [PATCH] [SQUASH] [HACK] DECON & framebuffer fixes for Linux
+
+This commit contains (a little bit hacky) patches to fix framebuffer
+behaving weird in native Linux system.
+
+The said patches are:
+  * A hacky way to force DECON refresh. Now we don't need msm-fb-refresher
+[1] anymore. [2]
+  * Fix fbcon and mismatched color [3]
+  * Keep `fb0` enabled [4]
+  * `decon_pan_display` downgrade to fix Samsung's DECON [5]
+
+[1] https://pkgs.postmarketos.org/package/master/postmarketos/aarch64/msm-fb-refresher
+[2] https://github.com/map220v/kernel_samsung_a51-linux/commit/8f88827bf29b4508ed2ea67110de93776a044e74
+[3] https://github.com/map220v/kernel_samsung_a51-linux/commit/83656dabd2b5db98c04c5b02a2eca7b78152bc18
+[4] https://github.com/map220v/kernel_samsung_a51-linux/commit/974f3e70d07021a9d7b42f08720b0b425003745f
+[5] https://github.com/map220v/kernel_samsung_a51-linux/commit/ebfe69da8c0e0c4fcf8fc22970f9e38280d5224f
+
+Signed-off-by: Hendra Manudinata <manoedinata@gmail.com>
+---
+ drivers/video/fbdev/exynos/dpu20/decon_core.c | 57 ++++++++----
+ drivers/video/fbdev/exynos/dpu20/decon_dsi.c  | 88 ++++++++-----------
+ 2 files changed, 81 insertions(+), 64 deletions(-)
+
+diff --git a/drivers/video/fbdev/exynos/dpu20/decon_core.c b/drivers/video/fbdev/exynos/dpu20/decon_core.c
+index 20a52c044d..e77c9e7018 100644
+--- a/drivers/video/fbdev/exynos/dpu20/decon_core.c
+++ b/drivers/video/fbdev/exynos/dpu20/decon_core.c
+@@ -47,6 +47,9 @@
+ #if defined(CONFIG_SOC_EXYNOS9610)
+ #include <dt-bindings/clock/exynos9610.h>
+ #endif
+#ifdef CONFIG_STATE_NOTIFIER
+#include <linux/state_notifier.h>
+#endif
+ 
+ #include "decon.h"
+ #include "dsim.h"
+@@ -58,13 +61,13 @@
+ #include "displayport.h"
+ #endif
+ 
+-int decon_log_level = 6;
+int decon_log_level = 0;
+ module_param(decon_log_level, int, 0644);
+-int dpu_bts_log_level = 6;
+int dpu_bts_log_level = 0;
+ module_param(dpu_bts_log_level, int, 0644);
+-int win_update_log_level = 6;
+int win_update_log_level = 0;
+ module_param(win_update_log_level, int, 0644);
+-int dpu_mres_log_level = 6;
+int dpu_mres_log_level = 0;
+ module_param(dpu_mres_log_level, int, 0644);
+ int decon_systrace_enable;
+ void decon_wait_for_vstatus(struct decon_device *decon, u32 timeout);
+@@ -1004,11 +1007,15 @@ err:
+ 	return ret;
+ }
+ 
+int decon_set_vsync_int(struct fb_info *info, bool active);
+extern int needs_pan;
+
+ static int decon_blank(int blank_mode, struct fb_info *info)
+ {
+ 	struct decon_win *win = info->par;
+ 	struct decon_device *decon = win->decon;
+ 	int ret = 0;
+	struct fb_info *fb_info;
+ 
+ 	decon_info("%s + blank_mode: %d, decon-%d %s mode: %d type (0: DSI, 1: eDP, 2:DP, 3: WB)\n",
+ 			__func__, blank_mode, decon->id,
+@@ -1034,6 +1041,9 @@ static int decon_blank(int blank_mode, struct fb_info *info)
+ 			goto blank_exit;
+ 		}
+ 		atomic_set(&decon->ffu_flag, 2);
+		#ifdef CONFIG_STATE_NOTIFIER
+			state_suspend();
+		#endif
+ 		break;
+ 	case FB_BLANK_UNBLANK:
+ 		DPU_EVENT_LOG(DPU_EVT_UNBLANK, &decon->sd, ktime_set(0, 0));
+@@ -1043,10 +1053,16 @@ static int decon_blank(int blank_mode, struct fb_info *info)
+ 			goto blank_exit;
+ 		}
+ 		atomic_set(&decon->ffu_flag, 2);
+		#ifdef CONFIG_STATE_NOTIFIER
+			state_suspend();
+		#endif
+ #if defined(CONFIG_EXYNOS_READ_ESD_SOLUTION)
+ 		if (decon->esd.thread)
+ 			wake_up_process(decon->esd.thread);
+ #endif
+		needs_pan = true;
+		fb_info = decon->win[decon->dt.dft_win]->fbinfo;
+		decon_set_vsync_int(fb_info, true);
+ 		break;
+ 	case FB_BLANK_VSYNC_SUSPEND:
+ 	case FB_BLANK_HSYNC_SUSPEND:
+@@ -3146,7 +3162,7 @@ static int decon_ioctl(struct fb_info *info, unsigned int cmd,
+ 	return ret;
+ }
+ 
+-static ssize_t decon_fb_read(struct fb_info *info, char __user *buf,
+/*static ssize_t decon_fb_read(struct fb_info *info, char __user *buf,
+ 		size_t count, loff_t *ppos)
+ {
+ 	return 0;
+@@ -3156,7 +3172,7 @@ static ssize_t decon_fb_write(struct fb_info *info, const char __user *buf,
+ 		size_t count, loff_t *ppos)
+ {
+ 	return 0;
+-}
+}*/
+ 
+ int decon_release(struct fb_info *info, int user)
+ {
+@@ -3164,6 +3180,7 @@ int decon_release(struct fb_info *info, int user)
+ 	struct decon_device *decon = win->decon;
+ 	int fb_count = atomic_read(&info->count);
+ 
+      return 0;
+ 	decon_info("%s + : %d\n", __func__, decon->id);
+ 
+ 	if (decon->id && decon->dt.out_type == DECON_OUT_DSI) {
+@@ -3216,12 +3233,14 @@ static struct fb_ops decon_fb_ops = {
+ 	.fb_blank	= decon_blank,
+ 	.fb_setcolreg	= decon_setcolreg,
+ 	.fb_fillrect    = cfb_fillrect,
+	.fb_copyarea    = cfb_copyarea,
+	.fb_imageblit   = cfb_imageblit,
+ #ifdef CONFIG_COMPAT
+ 	.fb_compat_ioctl = decon_compat_ioctl,
+ #endif
+ 	.fb_ioctl	= decon_ioctl,
+-	.fb_read	= decon_fb_read,
+-	.fb_write	= decon_fb_write,
+//	.fb_read	= decon_fb_read,
+//	.fb_write	= decon_fb_write,
+ 	.fb_pan_display	= decon_pan_display,
+ 	.fb_mmap	= decon_mmap,
+ 	.fb_release	= decon_release,
+@@ -3456,15 +3475,15 @@ static int decon_fb_alloc_memory(struct decon_device *decon, struct decon_win *w
+ 	}
+ #endif
+ 
+-	memset(vaddr, 0x00, size);
+	//memset(vaddr, 0x00, size);
+ 
+ 	fbi->screen_base = vaddr;
+ 
+ #if !defined(CONFIG_SUPPORT_LEGACY_ION)
+-	dma_buf_vunmap(buf, vaddr);
+	//dma_buf_vunmap(buf, vaddr);
+ #endif
+ 
+-	fbi->screen_base = NULL;
+	//fbi->screen_base = NULL;
+ 
+ 	win->dma_buf_data[1].fence = NULL;
+ 	win->dma_buf_data[2].fence = NULL;
+@@ -3637,6 +3656,7 @@ static int decon_acquire_window(struct decon_device *decon, int idx)
+ 	}
+ 
+ 	fbinfo->fix.type	= FB_TYPE_PACKED_PIXELS;
+	fbinfo->fix.visual	= FB_VISUAL_TRUECOLOR,
+ 	fbinfo->fix.accel	= FB_ACCEL_NONE;
+ 	fbinfo->var.activate	= FB_ACTIVATE_NOW;
+ 	fbinfo->var.vmode	= FB_VMODE_NONINTERLACED;
+@@ -3964,8 +3984,8 @@ static int decon_initial_display(struct decon_device *decon, bool is_colormap)
+ 	}
+ 
+ 	decon_to_init_param(decon, &p);
+-	if (decon_reg_init(decon->id, decon->dt.out_idx[0], &p) < 0)
+-		goto decon_init_done;
+	//if (decon_reg_init(decon->id, decon->dt.out_idx[0], &p) < 0)
+	//	goto decon_init_done;
+ 
+ 	memset(&win_regs, 0, sizeof(struct decon_window_regs));
+ 	win_regs.wincon = wincon(0x8, 0xFF, 0xFF, 0xFF, DECON_BLENDING_NONE,
+@@ -3991,7 +4011,7 @@ static int decon_initial_display(struct decon_device *decon, bool is_colormap)
+ 	set_bit(dpp_id, &decon->prev_used_dpp);
+ 	memset(&config, 0, sizeof(struct decon_win_config));
+ 	config.dpp_parm.addr[0] = fbinfo->fix.smem_start;
+-	config.format = DECON_PIXEL_FORMAT_BGRA_8888;
+	config.format = DECON_PIXEL_FORMAT_ARGB_8888;
+ 	config.src.w = fbinfo->var.xres;
+ 	config.src.h = fbinfo->var.yres;
+ 	config.src.f_w = fbinfo->var.xres;
+@@ -4030,14 +4050,21 @@ static int decon_initial_display(struct decon_device *decon, bool is_colormap)
+ 	decon_reg_set_int(decon->id, &psr, 1);
+ 	call_panel_ops(dsim, displayon, dsim);
+ 	decon_wait_for_vsync(decon, VSYNC_TIMEOUT_MSEC);
+	decon_set_vsync_int(fbinfo, true);
+ 	if (decon_reg_wait_update_done_and_mask(decon->id, &psr,
+ 				SHADOW_UPDATE_TIMEOUT) < 0)
+ 		decon_err("%s: wait_for_update_timeout\n", __func__);
+ 
+-decon_init_done:
+//decon_init_done:
+ 
+ 	decon->state = DECON_STATE_INIT;
+ 
+    // Try to unblank decon0
+    if(decon->id == 0)
+    {
+        decon_blank(FB_BLANK_UNBLANK, fbinfo);
+    }
+    
+ 	return 0;
+ }
+ 
+diff --git a/drivers/video/fbdev/exynos/dpu20/decon_dsi.c b/drivers/video/fbdev/exynos/dpu20/decon_dsi.c
+index 0b0b0a96e1..1189735567 100644
+--- a/drivers/video/fbdev/exynos/dpu20/decon_dsi.c
+++ b/drivers/video/fbdev/exynos/dpu20/decon_dsi.c
+@@ -322,6 +322,8 @@ static ssize_t decon_show_vsync(struct device *dev,
+ }
+ static DEVICE_ATTR(vsync, S_IRUGO, decon_show_vsync, NULL);
+ 
+int needs_pan = false;
+
+ static int decon_vsync_thread(void *data)
+ {
+ 	struct decon_device *decon = data;
+@@ -336,6 +338,19 @@ static int decon_vsync_thread(void *data)
+ 		int ret = wait_event_interruptible(decon->vsync.wait,
+ 			(timestamp != decon->vsync.timestamp) &&
+ 			decon->vsync.active);
+			
+		struct decon_mode_info psr;		
+		if (needs_pan) {
+			// TODO: This is dirty hack.
+			// Implement a better solution
+			struct fb_info *fb_info = decon->win[decon->dt.dft_win]->fbinfo;
+			struct fb_var_screeninfo *var = &fb_info->var;
+			usleep_range(200000, 201000);
+			decon_pan_display(var, fb_info);
+			needs_pan = false;
+		}
+		decon_to_psr_info(decon, &psr);
+		decon_reg_start(decon->id, &psr);
+ #endif
+ 		if (!ret)
+ 			sysfs_notify(&decon->dev->kobj, NULL, "vsync");
+@@ -835,87 +850,61 @@ int decon_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
+ 	struct v4l2_subdev *sd = NULL;
+ 	struct decon_win_config config;
+ 	int ret = 0;
+	int shift = 0;
+ 	struct decon_mode_info psr;
+-	int dpp_id = DPU_DMA2CH(decon->dt.dft_idma);
+-
+-	if (decon->dt.out_type != DECON_OUT_DSI) {
+-		decon_warn("%s: decon%d unspported on out_type(%d)\n",
+-				__func__, decon->id, decon->dt.out_type);
+-		return 0;
+-	}
+ 
+-	if ((!IS_DECON_HIBER_STATE(decon) && IS_DECON_OFF_STATE(decon)) ||
+-			decon->state == DECON_STATE_INIT) {
+	if ((decon->dt.out_type == DECON_OUT_DSI &&
+			decon->state == DECON_STATE_INIT) ||
+			decon->state == DECON_STATE_OFF) {
+ 		decon_warn("%s: decon%d state(%d), UNBLANK missed\n",
+ 				__func__, decon->id, decon->state);
+ 		return 0;
+ 	}
+ 
+-	decon_info("%s: [%d %d %d %d %d %d]\n", __func__,
+-			var->xoffset, var->yoffset,
+-			var->xres, var->yres,
+-			var->xres_virtual, var->yres_virtual);
+	decon_set_par(info);
+
+	decon_hiber_block_exit(decon);
+ 
+	set_bit(decon->dt.dft_idma, &decon->cur_using_dpp);
+	set_bit(decon->dt.dft_idma, &decon->prev_used_dpp);
+ 	memset(&config, 0, sizeof(struct decon_win_config));
+ 	switch (var->bits_per_pixel) {
+ 	case 16:
+ 		config.format = DECON_PIXEL_FORMAT_RGB_565;
+		shift = 2;
+ 		break;
+ 	case 24:
+ 	case 32:
+-		config.format = DECON_PIXEL_FORMAT_ABGR_8888; /* DECON_PIXEL_FORMAT_BGRA_8888; */
+		config.format = DECON_PIXEL_FORMAT_ARGB_8888;
+		shift = 4;
+ 		break;
+ 	default:
+-		decon_err("%s: Not supported bpp %d\n", __func__,
+-				var->bits_per_pixel);
+-		return -EINVAL;
+		decon_err("%s: bits_per_pixel %d\n", __func__, var->bits_per_pixel);
+ 	}
+ 
+ 	config.dpp_parm.addr[0] = info->fix.smem_start;
+-	config.src.x =  var->xoffset;
+	config.src.x =  var->xoffset >> shift;
+ 	config.src.y =  var->yoffset;
+ 	config.src.w = var->xres;
+ 	config.src.h = var->yres;
+-	config.src.f_w = var->xres_virtual;
+-	config.src.f_h = var->yres_virtual;
+	config.src.f_w = var->xres;
+	config.src.f_h = var->yres;
+ 	config.dst.w = config.src.w;
+ 	config.dst.h = config.src.h;
+-	config.dst.f_w = decon->lcd_info->xres;
+-	config.dst.f_h = decon->lcd_info->yres;
+-	if (decon_check_limitation(decon, decon->dt.dft_win, &config) < 0)
+-		return -EINVAL;
+-
+-	decon_hiber_block_exit(decon);
+-
+-	decon_to_psr_info(decon, &psr);
+-
+-	/*
+-	 * info->var is old parameters and var is new requested parameters.
+-	 * var must be copied to info->var before decon_set_par function
+-	 * is called.
+-	 *
+-	 * If not, old parameters are set to window configuration
+-	 * and new parameters are set to DMA and DPP configuration.
+-	 */
+-	memcpy(&info->var, var, sizeof(struct fb_var_screeninfo));
+	config.dst.f_w = config.src.f_w;
+	config.dst.f_h = config.src.f_h;
+	sd = decon->dpp_sd[decon->dt.dft_idma];
+ 
+-	set_bit(dpp_id, &decon->cur_using_dpp);
+-	set_bit(dpp_id, &decon->prev_used_dpp);
+-	sd = decon->dpp_sd[dpp_id];
+ 	if (v4l2_subdev_call(sd, core, ioctl, DPP_WIN_CONFIG, &config)) {
+ 		decon_err("%s: Failed to config DPP-%d\n", __func__, win->dpp_id);
+-		decon_reg_win_enable_and_update(decon->id, decon->dt.dft_win, false);
+-		clear_bit(dpp_id, &decon->cur_using_dpp);
+-		set_bit(dpp_id, &decon->dpp_err_stat);
+-		goto err;
+		clear_bit(win->dpp_id, &decon->cur_using_dpp);
+		set_bit(win->dpp_id, &decon->dpp_err_stat);
+ 	}
+ 
+ 	decon_reg_update_req_window(decon->id, win->idx);
+-#if 0
+-	decon_set_par(info);
+-#endif
+
+	decon_to_psr_info(decon, &psr);
+ 	decon_reg_start(decon->id, &psr);
+-err:
+ 	decon_wait_for_vsync(decon, VSYNC_TIMEOUT_MSEC);
+ 
+ 	if (decon_reg_wait_update_done_and_mask(decon->id, &psr, SHADOW_UPDATE_TIMEOUT)
+@@ -923,6 +912,7 @@ err:
+ 		decon_err("%s: wait_for_update_timeout\n", __func__);
+ 
+ 	decon_hiber_unblock(decon);
+
+ 	return ret;
+ }
+ EXPORT_SYMBOL(decon_pan_display);
+-- 
+2.34.1
+
--- a/device/testing/linux-samsung-a51/0001-drivers-soc-cal-if-Prevent-optimization-of-structs-o.patch
+++ b/device/testing/linux-samsung-a51/0001-drivers-soc-cal-if-Prevent-optimization-of-structs-o.patch
@ -0,0 +1,89 @@
+From ddf630c03f250c23478afe638a62777a564f674c Mon Sep 17 00:00:00 2001
+From: John Vincent Corcega <kamusta@tenseventyseven.xyz>
+Date: Mon, 2 Dec 2024 17:46:42 +0000
+Subject: [PATCH] drivers: soc: cal-if: Prevent optimization of structs on
+ fvmap_copy_from_sram
+
+Newer versions of Clang tend to apply heavier optimizations than GCC, especially if -mcpu is set. Because we are applying optimizations to the LITTLE core (see b92e1e70898f515646142736df8d72c43e97e251) kernel panics during boot, citing inability to access memory regions on fvmap_init.
+
+<6>[    0.664609]  [0:      swapper/0:    1] fvmap_init:fvmap initialize 0000000000000000
+<0>[    0.664625]  [0:      swapper/0:    1] Unable to handle kernel paging request at virtual address ffffff800b2f2402
+<2>[    0.664640]  [0:      swapper/0:    1] sec_debug_set_extra_info_fault = KERN / 0xffffff800b2f2402
+<6>[    0.664657]  [0:      swapper/0:    1] search_item_by_key: (FTYPE) extra_info is not ready
+<2>[    0.664666]  [0:      swapper/0:    1] set_item_val: fail to find FTYPE
+<6>[    0.664680]  [0:      swapper/0:    1] search_item_by_key: (FAULT) extra_info is not ready
+<2>[    0.664688]  [0:      swapper/0:    1] set_item_val: fail to find FAULT
+<6>[    0.664702]  [0:      swapper/0:    1] search_item_by_key: (PC) extra_info is not ready
+<2>[    0.664710]  [0:      swapper/0:    1] set_item_val: fail to find PC
+<6>[    0.664724]  [0:      swapper/0:    1] search_item_by_key: (LR) extra_info is not ready
+<2>[    0.664732]  [0:      swapper/0:    1] set_item_val: fail to find LR
+<1>[    0.664746]  [0:      swapper/0:    1] Mem abort info:
+<1>[    0.664760]  [0:      swapper/0:    1]   Exception class = DABT (current EL), IL = 32 bits
+<1>[    0.664774]  [0:      swapper/0:    1]   SET = 0, FnV = 0
+<1>[    0.664787]  [0:      swapper/0:    1]   EA = 0, S1PTW = 0
+<1>[    0.664799]  [0:      swapper/0:    1] Data abort info:
+<1>[    0.664814]  [0:      swapper/0:    1]   ISV = 0, ISS = 0x00000021
+<1>[    0.664828]  [0:      swapper/0:    1]   CM = 0, WnR = 0
+<1>[    0.664842]  [0:      swapper/0:    1] swapper pgtable: 4k pages, 39-bit VAs, pgd = ffffff800a739000
+<1>[    0.664856]  [0:      swapper/0:    1] [ffffff800b2f2402] *pgd=000000097cdfe003, *pud=000000097cdfe003, *pmd=00000009742a9003, *pte=00e800000204b707
+<0>[    0.664884]  [0:      swapper/0:    1] Internal error: Oops: 96000021 [#1] PREEMPT SMP
+<4>[    0.664899]  [0:      swapper/0:    1] Modules linked in:
+<0>[    0.664916]  [0:      swapper/0:    1] Process swapper/0 (pid: 1, stack limit = 0xffffff80081a8000)
+<0>[    0.664936]  [0:      swapper/0:    1] debug-snapshot: core register saved(CPU:0)
+<0>[    0.664950]  [0:      swapper/0:    1] L2ECTLR_EL1: 0000000000000007
+<0>[    0.664959]  [0:      swapper/0:    1] L2ECTLR_EL1 valid_bit(30) is NOT set (0x0)
+<0>[    0.664978]  [0:      swapper/0:    1] CPUMERRSR: 0000000008000001, L2MERRSR: 0000000010200c00
+<0>[    0.664992]  [0:      swapper/0:    1] CPUMERRSR valid_bit(31) is NOT set (0x0)
+<0>[    0.665006]  [0:      swapper/0:    1] L2MERRSR valid_bit(31) is NOT set (0x0)
+<0>[    0.665020]  [0:      swapper/0:    1] debug-snapshot: context saved(CPU:0)
+<6>[    0.665088]  [0:      swapper/0:    1] debug-snapshot: item - log_kevents is disabled
+<6>[    0.665112]  [0:      swapper/0:    1] TIF_FOREIGN_FPSTATE: 0, FP/SIMD depth 0, cpu: 0
+<4>[    0.665130]  [0:      swapper/0:    1] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.14.113 - Fresh Core-user #1
+<4>[    0.665144]  [0:      swapper/0:    1] Hardware name: Samsung A50 LTN OPEN rev04 board based on Exynos9610 (DT)
+<4>[    0.665160]  [0:      swapper/0:    1] task: ffffffc8f4ce8000 task.stack: ffffff80081a8000
+<4>[    0.665180]  [0:      swapper/0:    1] PC is at fvmap_init+0xac/0x2c8
+<4>[    0.665195]  [0:      swapper/0:    1] LR is at fvmap_init+0x70/0x2c8
+<4>[    0.665211]  [0:      swapper/0:    1] pc : [<ffffff80085e12b8>] lr : [<ffffff80085e127c>] pstate: 20400145
+<4>[    0.665225]  [0:      swapper/0:    1] sp : ffffff80081abb80
+<4>[    0.665238]  [0:      swapper/0:    1] x29: ffffff80081abbb0 x28: 0000000000000000
+<4>[    0.665256]  [0:      swapper/0:    1] x27: ffffff8009efc000 x26: 0000000000000000
+<4>[    0.665273]  [0:      swapper/0:    1] x25: ffffff800b2e5970 x24: ffffff8008fa7222
+<4>[    0.665291]  [0:      swapper/0:    1] x23: ffffff800b2e5a60 x22: ffffff8009efb000
+<4>[    0.665307]  [0:      swapper/0:    1] x21: ffffffc8f3480000 x20: ffffff800b2e0000
+<4>[    0.665324]  [0:      swapper/0:    1] x19: ffffff800b2f2400 x18: 0000000000000000
+<4>[    0.665341]  [0:      swapper/0:    1] x17: ffffff8009bff23c x16: 0000000000000000
+<4>[    0.665358]  [0:      swapper/0:    1] x15: 00000000000000c6 x14: 0000000000000054
+<4>[    0.665375]  [0:      swapper/0:    1] x13: 000000000000d7b8 x12: 0000000000000000
+<4>[    0.665392]  [0:      swapper/0:    1] x11: 0000000000000000 x10: ffffffc8f3480000
+<4>[    0.665409]  [0:      swapper/0:    1] x9 : ffffff800b2f2400 x8 : 0000000000000000
+<4>[    0.665426]  [0:      swapper/0:    1] x7 : 5b20205d39303634 x6 : ffffffc0117d09b7
+<4>[    0.665443]  [0:      swapper/0:    1] x5 : 0000000000000001 x4 : 000000000000000c
+<4>[    0.665459]  [0:      swapper/0:    1] x3 : 0000000000000a30 x2 : ffffffffffffffce
+<4>[    0.665476]  [0:      swapper/0:    1] x1 : 000000000b040000 x0 : 000000000000000a
+
+Since we need these optimizations for performance reasons, the only way to resolve this is to solve the issue. Samsung already did something similar to cal-if before.
+
+We only needed to make fvmap_header/header volatile and has been tested to work.
+
+Signed-off-by: John Vincent <git@tensevntysevn.cf>
+Change-Id: Ic419135d4a80cbe15f0fa71dc59cc6efa73d6141
+---
+ drivers/soc/samsung/cal-if/fvmap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/soc/samsung/cal-if/fvmap.c b/drivers/soc/samsung/cal-if/fvmap.c
+index a7bedd15eb..770d500e84 100644
+--- a/drivers/soc/samsung/cal-if/fvmap.c
+++ b/drivers/soc/samsung/cal-if/fvmap.c
+@@ -268,7 +268,7 @@ static void check_percent_margin(struct rate_volt_header *head, unsigned int num
+ 
+ static void fvmap_copy_from_sram(void __iomem *map_base, void __iomem *sram_base)
+ {
+-	struct fvmap_header *fvmap_header, *header;
+	volatile struct fvmap_header *fvmap_header, *header;
+ 	struct rate_volt_header *old, *new;
+ 	struct clocks *clks;
+ 	struct pll_header *plls;
+-- 
+2.34.1
+
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`KERNEL=="bq27200-0", SUBSYSTEM=="power_supply", ACTION=="change", RUN+="/usr/bin/bq27k-monitor"`
				`@ -0,0 +1 @@`
				`SUBSYSTEM=="leds", DEVPATH=="/:flash", RUN+="/bin/chmod g+w /sys%p/brightness /sys%p/flash_strobe", RUN+="/bin/chown :video /sys%p/brightness /sys%p/flash_strobe"`
				`@ -0,0 +1 @@`
				`../../.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch`