DO NOT MERGE: skip CI version check

[ci:skip-vercheck]: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6056#note_463981
systemd/gdm: drop install scripts for systemd presets
2025-01-27 13:25:52 -08:00 · 2025-01-27 13:25:52 -08:00 · 2025-01-27 13:25:51 -08:00 · 2025-01-27 13:25:50 -08:00 · 2025-01-27 13:22:16 -08:00 · 2025-01-27 12:33:42 -08:00
237 changed files with 13147 additions and 7416 deletions
@@ -71,6 +71,7 @@ update_linux_next() {

 	echo "Updating linux-next from $pkgver to $new_pkgver..."
 	sed -i -e "s/pkgver=$pkgver/pkgver=$new_pkgver/" device/testing/linux-next/APKBUILD
+	sed -i -e "s/^pkgrel=.*/pkgrel=0/" device/testing/linux-next/APKBUILD

 	# Update the checksums
 	pmbootstrap checksum linux-next
@@ -110,6 +110,10 @@ if __name__ == "__main__":
    # FIXME: this should probably be more generic, if other repos are added later?
    if systemd_pkgs:
        common.run_pmbootstrap(["config", "systemd", "always"])
+        # To fix the ERROR: Chroot 'native' is for the 'edge' channel, but you are on the
+        # 'systemd-edge' channel. Run 'pmbootstrap zap' to delete your chroots and try again.
+        # To do this automatically, run 'pmbootstrap config auto_zap_misconfigured_chroots yes'.
+        common.run_pmbootstrap(["config", "auto_zap_misconfigured_chroots", "yes"])

        verify_only = common.commit_message_has_string("[ci:skip-build]")
        if verify_only:
@@ -1,14 +1,10 @@
 {
    "subject_format": {
        "pass": [
-            "^(([a-z]+\\/[a-z\\-0-9*{}]+),?)+: [A-Za-z\\/\\-0-9*{}\\(\\)\\.,_&:=' ]+( \\(MR \\d+\\)|)$",
-            "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
-            "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
-            "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
-        ],
-        "unknown": [
-            "^[a-z-0-9_.*{}\\/]+: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
+            "^(([a-z]+\\/\\)?\\([a-z\\-0-9*{}]+),?)+: [a-z][A-Za-z\\/\\-0-9*{}\\.,_&:=' ]+( \\(MR \\d+\\)|)$",
+            "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$",
+            "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$",
+            "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$"
        ]
    }
 }
-
@@ -0,0 +1 @@
+https://postmarketos.org/funding.json
@@ -15,7 +15,7 @@ branch_aports=3.21-stable
 mirrordir_alpine=v3.21

 [v24.06]
-description=Old release (supported until 2025-01-23)
+description=Old release (unsupported)
 branch_pmaports=v24.06
 branch_aports=3.20-stable
 mirrordir_alpine=v3.20
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.37.0
-pkgrel=10
+pkgrel=11

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

 sha512sums="
-b71a091d7ae6ee459dd0c51409793214a2285ee83c2621e289e198187ed642222d6f842f08661a8c72f96c9a0dc7271d5a47ab6794e2551f185d68f515bde598  busybox-static-1.37.0-r10-aarch64-edge.apk
+4b5bc587f42d06ec8dfb1b1b0dc9bcd5e7b35e6b0223c6e4d3db3ac3567a93eda4b595e7e46b9d4322607380909ebba7361a8ea3e8bfe3fcecb139261b22331d  busybox-static-1.37.0-r11-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.37.0
-pkgrel=10
+pkgrel=11

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

 sha512sums="
-88abaead7eace4910199e0cc76bc16bce762d61b2e10e1bc2a631d38e56458f5cb95f98f09d09f346229f9c6c982d3b0b3f907315f54e0e92b83dcc3b839d8bf  busybox-static-1.37.0-r10-armhf-edge.apk
+2acc65aa25b8d4a842e951ea357b7f5c9dbcb693c2d7bca7b5256e2a79211b90eb63c0b3b5e146501e679d6db89c9b499090b87e3039b5fce9ef68f039de0eb7  busybox-static-1.37.0-r11-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.37.0
-pkgrel=10
+pkgrel=11

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

 sha512sums="
-5bbeb8a0331f25569acc32d574290ec430f0a2a74190550b3913f3e7366082a76b9755c0d52bec57659a2bbd1af3f4fe5928ec988b283a2e731c902cd5e7aa85  busybox-static-1.37.0-r10-armv7-edge.apk
+016df6eaeda31a8c6236fde4a93a7bed005f61970d53f02d2ca7c91234a7e6587538c8a3fa3ac8cba6aa0cccbf7d0ad104c63c6967e2b6372fe1c5f56b0649ea  busybox-static-1.37.0-r11-armv7-edge.apk
 "
@@ -5,7 +5,7 @@

 pkgname=ccache-cross-symlinks
 pkgver=3
-pkgrel=0
+pkgrel=1
 pkgdesc="Enable ccache for cross-compilers with symlinks"
 url="https://ccache.samba.org/"
 arch="noarch"
@@ -15,7 +15,7 @@ options="!check"

 package() {
 	# Keep in sync with pmb.config.build_device_architectures
-	local _archs="armhf armv7 aarch64 x86_64 x86"
+	local _archs="armhf armv7 aarch64 x86_64 x86 riscv64"

 	local _bins="c++ cc cpp g++ gcc clang clang++"
 	mkdir -p "$pkgdir/usr/lib/ccache/bin"
@@ -20,7 +20,7 @@

 pkgname=crossdirect
 pkgver=5.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
 arch="all"
@@ -31,7 +31,7 @@ source="cargo.sh crossdirect.c rustc.sh rust-qemu-linker.sh"
 build() {
 	cd "$srcdir"
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64"
+	_archs="x86_64 armhf armv7 aarch64 riscv64"
 	for _arch in $_archs; do
 		[ "$_arch" == "$CARCH" ] && continue
 		_hostspec="$(arch_to_hostspec $_arch)"
@@ -48,7 +48,7 @@ build() {

 package() {
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64"
+	_archs="x86_64 armhf armv7 aarch64 riscv64"
 	_bins="c++ cc cpp g++ gcc clang clang++"

 	# Rust wrappers
@@ -3,7 +3,7 @@
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=8
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,14 +11,13 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-gru
 	depthcharge-tools
-	eudev-hwids>=3.2.12-r0
 	linux-postmarketos-rockchip
 	postmarketos-base
 	postmarketos-cros-common
 	soc-rockchip-rk3399
 "
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-openrc"
 source="deviceinfo modules-initfs"

 # provides and replaces to switch old installations to this package
@@ -51,6 +50,11 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

+openrc() {
+	install_if="$pkgname=$pkgvar-r$pkgrel openrc"
+	depends="eudev-hwids>=3.2.12-r0"
+	mkdir "$subpkgdir"
+}

 sha512sums="
 d0d5e47e7bc6f63f92669a315611c36972e2f06a32c1339ac551f23db023331fb6e1cdbbe4dc2022596aaf8083967951c43585a3aa32c4fddc8d8987bc20c092  deviceinfo
@@ -3,7 +3,7 @@
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
 pkgver=4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,6 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf
 	depthcharge-tools
-	eudev-hwids
 	linux-postmarketos-qcom-sc7180
 	postmarketos-base
 	postmarketos-cros-common
@@ -42,6 +41,11 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	depends="eudev-hwids"
+	mkdir "$subpkgdir"
+}

 sha512sums="
 f94dcb175e49cbaadce524586ed1c3e3b0182e414c84c495a5585b49ed40ca6f7fa9c73544d19cbad236333f9fd997f150f836452b47a271f99b7b059972c4bc  deviceinfo
@@ -4,7 +4,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
-pkgver=11
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -81,5 +81,5 @@ sha512sums="
 38c53d91a60d0402d4cc5428d65e1e8c26360c481c70b34593b1812c87241c32e91904a3bd31fbfe507f7fdb8b50c909eaad8c4c3a37ca962760567329f7f6ee  00-amdgpu-firmware.files
 c17f5c505e0e280a9e51ac1b4264e7703b744fd3831d75ce95f41be4755ae4ccd24b7ca09ba1e236df499a5e748c64a0d2054c9d55d8c8c713fa8c5646ed9a3c  00-i915-firmware.files
 514ff5c946633dccaa569fed51743c669ea9942af4dd891ad001ba08bba07fca92503e29304f3eb71c16bc2f2436e1879ff0bf56d99666e4dcf9635c8605da2e  deviceinfo
-1b3bbfcdc6642488304653aef996dddf7a354e7279f2c735ac7aec404e598948423630fcaa2cac87e2c0aef033ecfc57a7a91154f9dac9a85411db7bad62e677  modules-initfs
+a6e5a9de9fe010966523606f2fcab1c44004228b4e050f777dcb1160fb3e32cda8096925543522216c2eb354f8ce2f8d4e206d98b077fbd6fb840de94e84c706  modules-initfs
 "
@@ -16,3 +16,5 @@ xhci_pci
 ehci_pci
 sdhci_pci
 mmc_block
+nvme
+nvme_core
@@ -3,14 +3,13 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=16
-pkgrel=7
+pkgrel=8
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
 	alsa-ucm-conf>=1.2.7
-	eudev-hwids
 	linux-postmarketos-rockchip>=5.14
 	nvme-cli
 	postmarketos-base>=25-r1
@@ -58,6 +57,7 @@ nonfree_firmware() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="eudev-hwids"

 	mkdir -p "$subpkgdir"
 }
@@ -3,7 +3,7 @@
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
 pkgver=8
-pkgrel=0
+pkgrel=1
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -26,7 +26,6 @@ depends="
 	alsa-ucm-conf>=1.2.6.2
 	atinout
 	eg25-manager
-	eg25-manager-openrc
 	iw
 	linux-postmarketos-allwinner>=5.14
 	megapixels
@@ -174,8 +173,9 @@ nonfree_firmware() {
 }

 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel eg25-manager-openrc"
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="eg25-manager-openrc"
 	mkdir "$subpkgdir"
 }

@@ -1,12 +1,12 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=firmware-google-sargo
 pkgver=220505.008
-pkgrel=6
+pkgrel=7
 pkgdesc="Proprietary firmware blobs from the Google Pixel 3a factory image"
 url="https://github.com/TheMuppets/proprietary_vendor_google_sargo"
 arch="aarch64"
 license="proprietary"
-makedepends="pil-squasher sscregistrygen"
+makedepends="pil-squasher sscregistrygen zstd"
 _commit="c631f0f2aa24ea60cfb505d327cd4ae56ca27f16"
 _modemfw_commit="34bbe2c27f35537f13747c9eba67ece6ae141806"
 _device_android_commit="a1cd8bf2603569b8b3b450b9d7b5b595eb549df0"
@@ -17,6 +17,7 @@ source="
 "
 builddir="$srcdir/proprietary_vendor_google_sargo-$_commit"
 options="!check !archcheck !strip !tracedeps pmb:cross-native"
+_modemfw_dir="$srcdir/firmware-google-sargo-modem-$_modemfw_commit"

 build() {
 	pil-squasher a615_zap.mbn proprietary/vendor/firmware/a615_zap.mdt
@@ -25,33 +26,42 @@ build() {
 	# This is an OEM device. The SoC ID for SDM670 is 336.
 	mkdir sensors-registry
 	sscregistrygen -p OEM -s 336 proprietary/vendor/etc/sensors/config sensors-registry/
+
+	# Compress kernel-loaded firmware
+	zstd a615_zap.mbn
+	zstd ipa_fws.mbn
+
+	zstd proprietary/vendor/firmware/adsp.mbn
+	zstd proprietary/vendor/firmware/venus.mbn
+	zstd proprietary/vendor/firmware/wlanmdsp.mbn
+
+	zstd "$_modemfw_dir"/modemfw/mba.mbn
+	zstd "$_modemfw_dir"/modemfw/modem.mbn
 }

 package() {
-	_modemfw_dir="$srcdir"/firmware-google-sargo-modem-"$_modemfw_commit"
+	install -Dm644 "$builddir"/a615_zap.mbn.zst \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/a615_zap.mbn.zst
+	install -Dm644 "$builddir"/ipa_fws.mbn.zst \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/ipa_fws.mbn.zst

-	install -Dm644 "$builddir"/a615_zap.mbn \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/a615_zap.mbn
-	install -Dm644 "$builddir"/ipa_fws.mbn \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/ipa_fws.mbn
-
-	install -Dm644 "$builddir"/proprietary/vendor/firmware/adsp.mbn \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/adsp.mbn
+	install -Dm644 "$builddir"/proprietary/vendor/firmware/adsp.mbn.zst \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/adsp.mbn.zst
 	install -Dm644 "$builddir"/proprietary/vendor/firmware/adspr.jsn \
 		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/adspr.jsn
 	install -Dm644 "$builddir"/proprietary/vendor/firmware/adspua.jsn \
 		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/adspua.jsn
 	install -Dm644 "$builddir"/proprietary/vendor/firmware/modemuw.jsn \
 		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/modemuw.jsn
-	install -Dm644 "$builddir"/proprietary/vendor/firmware/venus.mbn \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/venus.mbn
-	install -Dm644 "$builddir"/proprietary/vendor/firmware/wlanmdsp.mbn \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/wlanmdsp.mbn
+	install -Dm644 "$builddir"/proprietary/vendor/firmware/venus.mbn.zst \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/venus.mbn.zst
+	install -Dm644 "$builddir"/proprietary/vendor/firmware/wlanmdsp.mbn.zst \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/wlanmdsp.mbn.zst

-	install -Dm644 "$_modemfw_dir"/modemfw/mba.mbn \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/mba.mbn
-	install -Dm644 "$_modemfw_dir"/modemfw/modem.mbn \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/modem.mbn
+	install -Dm644 "$_modemfw_dir"/modemfw/mba.mbn.zst \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/mba.mbn.zst
+	install -Dm644 "$_modemfw_dir"/modemfw/modem.mbn.zst \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/modem.mbn.zst
 	install -Dm644 "$_modemfw_dir"/modemfw/modemr.jsn \
 		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/modemr.jsn

@@ -1,6 +1,6 @@
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Maintainer: Barnabas Czeman <barnabas.czeman@postmarketos.org>
 pkgname=firmware-qcom-msm8953
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware files for Qualcomm MSM8953 devices"
 url="https://postmarketos.org"
@@ -11,6 +11,7 @@ options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 _asus_ze520kl_commit="f1439210719b2a1597f6390f34ae93cb1470ddf4"
 _fairphone_fp3_commit="ee529820bb874ab1b52873f0b144c3786f01ee4c"
 _huawei_milan_commit="f417e07a32310ee4002ca67a3d57f9ba0a960297"
+_lenovo_cd18781y_commit="337032e864fd6abe29375997fc3683398a4d27c4"
 _lenovo_kuntao_commit="009a366625c413aee2cc827ae94ed8ca75a3cebb"
 _motorola_ali_commit="153ba76124497fb7ce22d87a90149a15bcf67942"
 _motorola_ocean_commit="787dcae00d0866079c6f55dc3ddf6592279b0661"
@@ -28,6 +29,7 @@ source="
 	firmware-asus-ze520kl-$_asus_ze520kl_commit.tar.gz::https://gitlab.com/Smankusors/firmware-asus-zenfone3/-/archive/$_asus_ze520kl_commit/firmware-asus-zenfone3-$_asus_ze520kl_commit.tar.gz
 	firmware-fairphone-fp3-$_fairphone_fp3_commit.tar.gz::https://github.com/FairBlobs/FP3-firmware/archive/$_fairphone_fp3_commit/FP3-firmware-$_fairphone_fp3_commit.tar.gz
 	firmware-huawei-milan-$_huawei_milan_commit.tar.gz::https://github.com/bzy-080408/postmarketos-vendor-huawei-milan/archive/$_huawei_milan_commit.tar.gz
+	firmware-lenovo-cd18781y-$_lenovo_cd18781y_commit.tar.gz::https://gitlab.com/kaechele/postmarketos-vendor-lenovo-cd-18781y/-/archive/$_lenovo_cd18781y_commit/firmware-lenovo-cd18781y-$_lenovo_cd18781y_commit.tar.gz
 	firmware-lenovo-kuntao-$_lenovo_kuntao_commit.tar.gz::https://gitlab.com/raihan2000/firmware-lenovo-kuntao/-/archive/$_lenovo_kuntao_commit/firmware-lenovo-kuntao-$_lenovo_kuntao_commit.tar.gz
 	firmware-motorola-ali-$_motorola_ali_commit.tar.gz::https://github.com/moto-g6-mainlining/firmware-blobs/archive/$_motorola_ali_commit.tar.gz
 	firmware-motorola-ocean-$_motorola_ocean_commit.tar.gz::https://gitlab.com/Ultra-azu/firmware-motorola-ocean/-/archive/$_motorola_ocean_commit/firmware-motorola-ocean-$_motorola_ocean_commit.tar.gz
@@ -42,7 +44,8 @@ source="
 	firmware-xiaomi-ysl-$_xiaomi_ysl_commit.tar.gz::https://gitlab.com/barni2000/firmware-xiaomi-ysl/-/archive/$_xiaomi_ysl_commit/firmware-xiaomi-ysl-$_xiaomi_ysl_commit.tar.gz
 "

-_fwdir="/lib/firmware/qcom/msm8953"
+_basefwdir="/lib/firmware"
+_fwdir="$_basefwdir/qcom/msm8953"

 package() {
 	asus_ze520kl_dir="$srcdir/firmware-asus-zenfone3-$_asus_ze520kl_commit"
@@ -59,6 +62,15 @@ package() {
 	install -Dm644 "$huawei_milan_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/huawei/milan"
 	install -Dm644 "$huawei_milan_dir/a506_zap.mdt" -t "$pkgdir/$_fwdir/huawei/milan"

+	lenovo_cd18781y_dir="$srcdir/postmarketos-vendor-lenovo-cd-18781y-$_lenovo_cd18781y_commit"
+	install -Dm644 "$lenovo_cd18781y_dir/bt/nvm_00150100.bin" -t "$pkgdir/$_basefwdir/qca"
+	install -Dm644 "$lenovo_cd18781y_dir/bt/rampatch_00150100.bin" -t "$pkgdir/$_basefwdir/qca"
+	install -Dm644 "$lenovo_cd18781y_dir/gpu/a506_zap.b02" -t "$pkgdir/$_fwdir/lenovo/cd-18781y"
+	install -Dm644 "$lenovo_cd18781y_dir/gpu/a506_zap.mdt" -t "$pkgdir/$_fwdir/lenovo/cd-18781y"
+	install -Dm644 "$lenovo_cd18781y_dir/sound/tas5728m_dsp_lenovo_cd-18781y.bin" -t "$pkgdir/$_basefwdir"
+	install -Dm644 "$lenovo_cd18781y_dir/wifi/board-2.bin" -t "$pkgdir/$_basefwdir/ath10k/QCA9379/hw1.0"
+	install -Dm644 "$lenovo_cd18781y_dir/wifi/firmware-sdio-6.bin" -t "$pkgdir/$_basefwdir/ath10k/QCA9379/hw1.0"
+
 	lenovo_kuntao_dir="$srcdir/firmware-lenovo-kuntao-$_lenovo_kuntao_commit"
 	install -Dm644 "$lenovo_kuntao_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/lenovo/kuntao"
 	install -Dm644 "$lenovo_kuntao_dir/a506_zap.mdt" -t "$pkgdir/$_fwdir/lenovo/kuntao"
@@ -66,14 +78,17 @@ package() {
 	motorola_ali_dir="$srcdir/firmware-blobs-$_motorola_ali_commit"
 	install -Dm644 "$motorola_ali_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/motorola/ali"
 	install -Dm644 "$motorola_ali_dir/a506_zap.mdt" -t "$pkgdir/$_fwdir/motorola/ali"
+	install -Dm644 "$motorola_ali_dir/wlan/prima/WCNSS_qcom_wlan_nv.bin" -t "$pkgdir/$_fwdir/motorola/ali"

 	motorola_potter_dir="$srcdir/firmware-motorola-potter-$_motorola_potter_commit/lib/firmware/postmarketos"
 	install -Dm644 "$motorola_potter_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/motorola/potter"
 	install -Dm644 "$motorola_potter_dir/a506_zap.mdt" -t "$pkgdir/$_fwdir/motorola/potter"
+	install -Dm644 "$motorola_potter_dir/wlan/prima/WCNSS_qcom_wlan_nv.bin" -t "$pkgdir/$_fwdir/motorola/potter"

 	motorola_ocean_dir="$srcdir/firmware-motorola-ocean-$_motorola_ocean_commit/lib/firmware/postmarketos"
 	install -Dm644 "$motorola_ocean_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/motorola/ocean"
 	install -Dm644 "$motorola_ocean_dir/a506_zap.mdt" -t "$pkgdir/$_fwdir/motorola/ocean"
+	install -Dm644 "$motorola_ocean_dir/wlan/prima/WCNSS_qcom_wlan_nv.bin" -t "$pkgdir/$_fwdir/motorola/ocean"

 	xiaomi_daisy_dir="$srcdir/firmware-xiaomi-daisy-$_xiaomi_daisy_commit/gpu"
 	install -Dm644 "$xiaomi_daisy_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/xiaomi/daisy"
@@ -112,6 +127,7 @@ sha512sums="
 a9980ae2ab0868d7e8e2d054e72525c030fe75d66aec6eebd2e17619d5d24455de2a158ea7ed0eb0db2f7a2f4bc07701672de217f8c7274599cd92c00cb2d04e  firmware-asus-ze520kl-f1439210719b2a1597f6390f34ae93cb1470ddf4.tar.gz
 efa827787814ff4a59a0a61ca66410e46ce0add29b1451b4962b2d8af1d52b7035a0550b188fd442358702252964e4b64b16f836c5dcb1f748102cd0550aff7b  firmware-fairphone-fp3-ee529820bb874ab1b52873f0b144c3786f01ee4c.tar.gz
 f04a54bd81e389001e95357ffe301a10285c54782f70bb8ac9aed30173a6c9594b3568649d287234769b413cc3f93dbc982b3c596d287947d4630eaf98954451  firmware-huawei-milan-f417e07a32310ee4002ca67a3d57f9ba0a960297.tar.gz
+ed6ac4faa37312924de5498c4319338f842e69bd79f9ebfbf9c5dc9ce5d9cf7ca4d81e5ade31bc8ffc31f5489f7d752605d04a438e813966e0096d0d09c31e63  firmware-lenovo-cd18781y-337032e864fd6abe29375997fc3683398a4d27c4.tar.gz
 ebf5a43df59ec99ae63483cff1d0cfd25fa754e30910d8f9130bf43cc5c44278b5a23652585c44902fca943b022b858e3c6d55822aea45930a999dcce16285ee  firmware-lenovo-kuntao-009a366625c413aee2cc827ae94ed8ca75a3cebb.tar.gz
 269ac182806e9128557ac614142bfd6a2feab2cc3d2555268064df7ad1880de0d5e85b781a34ca57693d9c32ffe7d31da7fd34f9fd6364bc2b7cc2fdb90edc80  firmware-motorola-ali-153ba76124497fb7ce22d87a90149a15bcf67942.tar.gz
 fd0888bb6a0beeca961d9aabd0e60be64dfd841c3c89c7cdb8e7c1284347c4f56b2bad6a73aebc81e86625a4b548b5d2417ca31de6803ea5b3b58c7c1d97be51  firmware-motorola-ocean-787dcae00d0866079c6f55dc3ddf6592279b0661.tar.gz
@@ -12,6 +12,7 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps
 	pmb:cross-native
 	pmb:kconfigcheck-community
+	pmb:kconfigcheck-pinephonepro
 	"
 makedepends="
 	bash
@@ -3,9 +3,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=6.12.1_git20241127
-pkgrel=1
-_tag="orange-pi-6.12-20241127-2323"
+pkgver=6.12.8_git20250104
+pkgrel=0
+_tag="orange-pi-6.12-20250104-1626"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -79,9 +79,9 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
 }
 sha512sums="
-a4317f9b9c1ebe7692d4fd51f88e00f5f3c1f043cd2c5f0375d10e44a5f10dc69b60a61baf79a47477be403c4493a49b98361817b0d969ac6225853387c17f2f  linux-postmarketos-allwinner-orange-pi-6.12-20241127-2323.tar.gz
-49d64d85686c8cd5340961aa81dad1e6c779dd69b56d72a8151c365de59cff7ab1b2b049a6233b15e681d89abf89819895853ba1bb7e99c7b08b473584870cee  config-postmarketos-allwinner.aarch64
-532ab8977e0b80b4559930ed2ff412744ac052c53f02c9b029141d65c1d1592f55fc680506ecf63fc1549585e4dfc3899f309bf28fb1a827d04bbfe0f70d2ad1  config-postmarketos-allwinner.armv7
+d9cd2978adf7f759515091bb3d933fc7299ceac8cba2d811d9645ad7c1b873fdb2e3fd60c022083a6e5922cec344e5e8db1cf68ca904d4f193cf22017b3120eb  linux-postmarketos-allwinner-orange-pi-6.12-20250104-1626.tar.gz
+ced7bc9148e5bd99108ad21ef602a5827931b94c9bd2c7bc1d50540b8a01bbaa956b7035ae7329b472d10123c46e56ca1c0a61acc7b537fe9762bcbdecc13da3  config-postmarketos-allwinner.aarch64
+7ff1eeffbc47e3e23bdbacf28b79a9e51be3ef886dfc1eed587d1b4fdff6b703a52a7c45562b2920df93dcaee299a5ad25fb37fb047247d61632036a3886d925  config-postmarketos-allwinner.armv7
 3390171525fb75506ba54b4115df9b63b427799a80be55c9ddb457da4cbf389ef7ca581c2d92a820be7c198a4460b40c417e2585fc4eb8e58080cf81a6301ef9  0001-dts-add-dontbeevil-pinephone-devkit.patch
 4c8f53eca5d9569b594528c2d15d397b937049bace60457c6686762a5a6ed223945d8d37afa298ae158a62aeda373a79224ff93c951631c3c6ce999b3951577e  0002-dts-add-pinetab-dev-old-display-panel.patch
 a72ed92e86e736963a119c7509c2b8228e54ae6e4618e12b12a49a80484364d7613b17702654efcf42563947cb35d9ccb507a6a6bac8e33916899709a5d465b8  0003-dts-pinetab-add-missing-ohci1.patch
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.1 Kernel Configuration
+# Linux/arm64 6.12.8 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -405,6 +405,7 @@ CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CAVIUM_TX2_ERRATUM_219=y
 CONFIG_FUJITSU_ERRATUM_010001=y
 CONFIG_HISILICON_ERRATUM_161600802=y
+CONFIG_HISILICON_ERRATUM_162100801=y
 CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
@@ -931,6 +932,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
@@ -1672,6 +1674,7 @@ CONFIG_SUNXI_RSB=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 # CONFIG_ARM_FFA_TRANSPORT is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
+# CONFIG_IMX_SCMI_MISC_DRV is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set

@@ -3921,6 +3924,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYSMEM_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
+CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y
 CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS=y
@@ -5207,6 +5211,7 @@ CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
 # CONFIG_HISILICON_ERRATUM_161010101 is not set
 # CONFIG_ARM64_ERRATUM_858921 is not set
 CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
+# CONFIG_ARM_TIMER_SP804 is not set
 # end of Clock Source drivers

 CONFIG_MAILBOX=y
@@ -6820,8 +6825,6 @@ CONFIG_SCHED_INFO=y
 # CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging

-# CONFIG_DEBUG_TIMEKEEPING is not set
-
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.12.1 Kernel Configuration
+# Linux/arm 6.12.8 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1495,6 +1495,7 @@ CONFIG_SUNXI_RSB=y
 # CONFIG_FW_CFG_SYSFS is not set
 # CONFIG_TRUSTED_FOUNDATIONS is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
+# CONFIG_IMX_SCMI_MISC_DRV is not set
 CONFIG_ARM_PSCI_FW=y

 #
@@ -3778,6 +3779,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYSMEM_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
+CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y
 CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS=y
@@ -4999,6 +5001,7 @@ CONFIG_SUN4I_TIMER=y
 CONFIG_SUN5I_HSTIMER=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+# CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_MICROCHIP_PIT64B is not set
 # end of Clock Source drivers

@@ -6599,8 +6602,6 @@ CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
 # CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging

-# CONFIG_DEBUG_TIMEKEEPING is not set
-
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
@@ -1,7 +1,7 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.12.9
+pkgver=6.13
 pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
@@ -66,7 +66,7 @@ package() {
 }

 sha512sums="
-3538c19b22f1810849e01ad7005f39b0c4e1e2de99f3168bb6a35ad9d51d7ec7b22a8203890e7b073bff83951f930245d5857a86cef80454800136a53047ff37  linux-6.12.9.tar.xz
-d442faaff1a9352c36c81ccd01f6d5322a28a6df8f4e735b866611cd127576320e75a6aa3bb731a273f6d48933ad47e305602510b731158abc17dc98b89ac437  config-postmarketos-mediatek-mt8173.aarch64
+1137e6440132b0958f89165440e99208f82b204e7245ae69dc9c808df97d13ce8f58136db92407e0e93394fa7f6283ec7a34597c6e92a5b6d9025e0960357957  linux-6.13.tar.xz
+676c5f2eb654fb709bf455ba5ef27e19c2c9111b17c61e520e903d914fc84446e2782d0f04d56cd8b31abf0894d1df756beff908d0b50fe183531732f631da98  config-postmarketos-mediatek-mt8173.aarch64
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.9 Kernel Configuration
+# Linux/arm64 6.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -524,13 +524,21 @@ CONFIG_ARM64_MTE=y
 CONFIG_ARM64_EPAN=y
 # end of ARMv8.7 architectural features

+CONFIG_AS_HAS_MOPS=y
+
 #
 # ARMv8.9 architectural features
 #
 CONFIG_ARM64_POE=y
 CONFIG_ARCH_PKEY_BITS=3
+CONFIG_ARM64_HAFT=y
 # end of ARMv8.9 architectural features

+#
+# v9.4 architectural features
+#
+# end of v9.4 architectural features
+
 CONFIG_ARM64_SVE=y
 # CONFIG_ARM64_PSEUDO_NMI is not set
 CONFIG_RELOCATABLE=y
@@ -631,6 +639,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 # CPU frequency scaling drivers
 #
 CONFIG_CPUFREQ_DT=y
+# CONFIG_CPUFREQ_VIRT is not set
 CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_ARM_MEDIATEK_CPUFREQ=y
@@ -679,7 +688,6 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
-CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
 CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
 CONFIG_HAVE_NMI=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -774,6 +782,7 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_HAS_CC_PLATFORM=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -781,6 +790,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
 CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
+CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
 CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y

 #
@@ -1346,6 +1356,7 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_SECURITY is not set
+# CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_ARPFILTER is not set
 # end of IP: Netfilter Configuration

@@ -1388,6 +1399,7 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_NF_DEFRAG_IPV6=m
 # CONFIG_NF_TABLES_BRIDGE is not set
 # CONFIG_NF_CONNTRACK_BRIDGE is not set
+# CONFIG_BRIDGE_NF_EBTABLES_LEGACY is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
@@ -1619,10 +1631,8 @@ CONFIG_BT_MTKUART=m
 # CONFIG_MCTP is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
 CONFIG_WEXT_CORE=y
 CONFIG_WEXT_PROC=y
-CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -1726,12 +1736,14 @@ CONFIG_PCI_IOV=y
 # CONFIG_PCI_NPEM is not set
 # CONFIG_PCI_PRI is not set
 CONFIG_PCI_PASID=y
+# CONFIG_PCIE_TPH is not set
 CONFIG_PCI_LABEL=y
 # CONFIG_PCI_DYNAMIC_OF_NODES is not set
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_OCTEONEP is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set

 #
@@ -2124,6 +2136,7 @@ CONFIG_OF=y
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_KOBJ=y
+CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_RESERVED_MEM=y
@@ -2202,6 +2215,7 @@ CONFIG_PCI_ENDPOINT_TEST=m
 # CONFIG_OPEN_DICE is not set
 # CONFIG_VCPU_STALL_DETECTOR is not set
 # CONFIG_NSM is not set
+# CONFIG_MCHP_LAN966X_PCI is not set
 # CONFIG_C2PORT is not set

 #
@@ -2210,20 +2224,13 @@ CONFIG_PCI_ENDPOINT_TEST=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_AT25=m
 # CONFIG_EEPROM_MAX6875 is not set
-CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93CX6=y
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
 # CONFIG_EEPROM_EE1004 is not set
 # end of EEPROM support

 # CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
 # CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_ALTERA_STAPL is not set
@@ -3258,7 +3265,7 @@ CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
 # CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F3A is not set
+CONFIG_RMI4_F3A=y
 # CONFIG_RMI4_F54 is not set
 # CONFIG_RMI4_F55 is not set

@@ -3560,6 +3567,7 @@ CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
 CONFIG_SPMI=y
 # CONFIG_SPMI_HISI3670 is not set
 # CONFIG_SPMI_MTK_PMIF is not set
@@ -3623,6 +3631,7 @@ CONFIG_PINCTRL_MTK=y
 CONFIG_PINCTRL_MTK_V2=y
 CONFIG_PINCTRL_MTK_MOORE=y
 CONFIG_PINCTRL_MTK_PARIS=y
+# CONFIG_PINCTRL_AIROHA is not set
 CONFIG_PINCTRL_MT2712=y
 CONFIG_PINCTRL_MT6765=y
 CONFIG_PINCTRL_MT6779=y
@@ -3652,7 +3661,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
 CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_OF_GPIO_MM_GPIOCHIP=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
@@ -3674,6 +3682,7 @@ CONFIG_GPIO_DWAPB=y
 # CONFIG_GPIO_LOGICVC is not set
 CONFIG_GPIO_MB86S7X=y
 CONFIG_GPIO_PL061=y
+# CONFIG_GPIO_POLARFIRE_SOC is not set
 # CONFIG_GPIO_SIFIVE is not set
 # CONFIG_GPIO_SYSCON is not set
 CONFIG_GPIO_WCD934X=m
@@ -3730,6 +3739,7 @@ CONFIG_GPIO_MAX77620=y
 #
 # USB GPIO expanders
 #
+# CONFIG_GPIO_MPSSE is not set
 # end of USB GPIO expanders

 #
@@ -3869,6 +3879,7 @@ CONFIG_SENSORS_GPIO_FAN=m
 # CONFIG_SENSORS_IBMAEM is not set
 # CONFIG_SENSORS_IBMPEX is not set
 # CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_ISL28022 is not set
 # CONFIG_SENSORS_IT87 is not set
 CONFIG_SENSORS_JC42=m
 # CONFIG_SENSORS_POWERZ is not set
@@ -3931,6 +3942,7 @@ CONFIG_SENSORS_LM90=m
 # CONFIG_SENSORS_NCT6683 is not set
 # CONFIG_SENSORS_NCT6775 is not set
 # CONFIG_SENSORS_NCT6775_I2C is not set
+# CONFIG_SENSORS_NCT7363 is not set
 # CONFIG_SENSORS_NCT7802 is not set
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
@@ -4012,6 +4024,7 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CPU_FREQ_THERMAL=y
 # CONFIG_DEVFREQ_THERMAL is not set
+# CONFIG_PCIE_THERMAL is not set
 CONFIG_THERMAL_EMULATION=y
 # CONFIG_THERMAL_MMIO is not set
 # CONFIG_MAX77620_THERMAL is not set
@@ -4270,6 +4283,7 @@ CONFIG_REGULATOR_MT6359=y
 CONFIG_REGULATOR_MT6360=m
 CONFIG_REGULATOR_MT6380=y
 CONFIG_REGULATOR_MT6397=y
+# CONFIG_REGULATOR_MTK_DVFSRC is not set
 CONFIG_REGULATOR_PCA9450=y
 CONFIG_REGULATOR_PF8X00=y
 CONFIG_REGULATOR_PFUZE100=y
@@ -4546,6 +4560,7 @@ CONFIG_VIDEO_MEDIATEK_VPU=m
 #
 # Raspberry Pi media platform drivers
 #
+# CONFIG_VIDEO_RP1_CFE is not set

 #
 # Renesas media platform drivers
@@ -4813,8 +4828,18 @@ 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_CLIENT=y
+CONFIG_DRM_CLIENT_LIB=y
+CONFIG_DRM_CLIENT_SELECTION=y
+CONFIG_DRM_CLIENT_SETUP=y
+
+#
+# Supported DRM clients
+#
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
+# end of Supported DRM clients
+
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DISPLAY_DP_AUX_BUS=y
 CONFIG_DRM_DISPLAY_HELPER=y
@@ -4931,6 +4956,9 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_AMS581VF01 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_AMS639RQ08 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS427AP24 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
@@ -4940,6 +4968,7 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
 # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA8 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
@@ -4981,6 +5010,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_CROS_EC_ANX7688 is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=y
+# CONFIG_DRM_ITE_IT6263 is not set
 CONFIG_DRM_ITE_IT6505=y
 CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_LONTIUM_LT9211 is not set
@@ -5005,6 +5035,7 @@ CONFIG_DRM_THINE_THC63LVD1024=m
 # CONFIG_DRM_TOSHIBA_TC358768 is not set
 # CONFIG_DRM_TOSHIBA_TC358775 is not set
 # CONFIG_DRM_TI_DLPC3433 is not set
+# CONFIG_DRM_TI_TDP158 is not set
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI83 is not set
 CONFIG_DRM_TI_SN65DSI86=m
@@ -5039,6 +5070,7 @@ CONFIG_DRM_MEDIATEK_HDMI=y
 # CONFIG_TINYDRM_ILI9486 is not set
 # CONFIG_TINYDRM_MI0283QT is not set
 # CONFIG_TINYDRM_REPAPER is not set
+# CONFIG_TINYDRM_SHARP_MEMORY is not set
 # CONFIG_TINYDRM_ST7586 is not set
 # CONFIG_TINYDRM_ST7735R is not set
 CONFIG_DRM_PL111=m
@@ -5334,6 +5366,12 @@ CONFIG_SND_SOC_FSL_UTILS=m

 # CONFIG_SND_SOC_CHV3_I2S is not set
 # CONFIG_SND_I2S_HI6210_I2S is not set
+
+#
+# SoC Audio for Loongson CPUs
+#
+# end of SoC Audio for Loongson CPUs
+
 # CONFIG_SND_SOC_IMG is not set
 CONFIG_SND_SOC_MEDIATEK=m
 # CONFIG_SND_SOC_MT2701 is not set
@@ -5353,6 +5391,7 @@ CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
 # CONFIG_SND_SOC_MT8192 is not set
 # CONFIG_SND_SOC_MT8195 is not set
 # CONFIG_SND_SOC_MT8365 is not set
+CONFIG_SND_SOC_SDCA_OPTIONAL=y
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set

 #
@@ -5372,6 +5411,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AC97_CODEC is not set
 # CONFIG_SND_SOC_ADAU1372_I2C is not set
 # CONFIG_SND_SOC_ADAU1372_SPI is not set
+# CONFIG_SND_SOC_ADAU1373 is not set
 # CONFIG_SND_SOC_ADAU1701 is not set
 # CONFIG_SND_SOC_ADAU1761_I2C is not set
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
@@ -5393,6 +5433,7 @@ CONFIG_SND_SOC_AK4613=m
 # CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_AW88395 is not set
 # CONFIG_SND_SOC_AW88261 is not set
+# CONFIG_SND_SOC_AW88081 is not set
 # CONFIG_SND_SOC_AW87390 is not set
 # CONFIG_SND_SOC_AW88399 is not set
 # CONFIG_SND_SOC_BD28623 is not set
@@ -5418,6 +5459,7 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
 # CONFIG_SND_SOC_CS42L83 is not set
+# CONFIG_SND_SOC_CS42L84 is not set
 # CONFIG_SND_SOC_CS4234 is not set
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -5438,6 +5480,7 @@ CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES7241=m
 # CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
+# CONFIG_SND_SOC_ES8323 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_ES8328_SPI is not set
@@ -5499,6 +5542,7 @@ CONFIG_SND_SOC_RT5677_SPI=m
 # CONFIG_SND_SOC_RT711_SDCA_SDW is not set
 # CONFIG_SND_SOC_RT712_SDCA_SDW is not set
 # CONFIG_SND_SOC_RT712_SDCA_DMIC_SDW is not set
+# CONFIG_SND_SOC_RT721_SDCA_SDW is not set
 # CONFIG_SND_SOC_RT722_SDCA_SDW is not set
 # CONFIG_SND_SOC_RT715_SDW is not set
 # CONFIG_SND_SOC_RT715_SDCA_SDW is not set
@@ -5508,6 +5552,7 @@ CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SIMPLE_MUX=m
 # CONFIG_SND_SOC_SMA1303 is not set
+# CONFIG_SND_SOC_SMA1307 is not set
 # CONFIG_SND_SOC_SPDIF is not set
 # CONFIG_SND_SOC_SRC4XXX_I2C is not set
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -5547,6 +5592,7 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_TSCS42XX is not set
 # CONFIG_SND_SOC_TSCS454 is not set
 # CONFIG_SND_SOC_UDA1334 is not set
+# CONFIG_SND_SOC_UDA1342 is not set
 CONFIG_SND_SOC_WCD_CLASSH=m
 CONFIG_SND_SOC_WCD9335=m
 CONFIG_SND_SOC_WCD_MBHC=m
@@ -5597,6 +5643,8 @@ CONFIG_SND_SOC_MT6660=m
 # CONFIG_SND_SOC_NAU8821 is not set
 CONFIG_SND_SOC_NAU8822=m
 # CONFIG_SND_SOC_NAU8824 is not set
+# CONFIG_SND_SOC_NTP8918 is not set
+# CONFIG_SND_SOC_NTP8835 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SOC_LPASS_MACRO_COMMON=m
 CONFIG_SND_SOC_LPASS_WSA_MACRO=m
@@ -5666,6 +5714,7 @@ CONFIG_HID_VIVALDI=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
+# CONFIG_HID_KYSONA is not set
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_VIEWSONIC=m
@@ -6144,6 +6193,7 @@ CONFIG_TYPEC_HD3SS3220=m
 # CONFIG_TYPEC_MUX_IT5205 is not set
 # CONFIG_TYPEC_MUX_NB7VPQ904M is not set
 # CONFIG_TYPEC_MUX_PTN36502 is not set
+# CONFIG_TYPEC_MUX_TUSB1046 is not set
 # CONFIG_TYPEC_MUX_WCD939X_USBSS is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support

@@ -6195,7 +6245,7 @@ CONFIG_MMC_DW_K3=y
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
 CONFIG_MMC_CQHCI=y
-# CONFIG_MMC_HSQ is not set
+CONFIG_MMC_HSQ=y
 # CONFIG_MMC_TOSHIBA_PCI is not set
 CONFIG_MMC_MTK=y
 CONFIG_MMC_SDHCI_XENON=y
@@ -6512,6 +6562,7 @@ CONFIG_VFIO_PCI_CORE=y
 CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
 CONFIG_VFIO_PCI=y
+# CONFIG_VIRTIO_VFIO_PCI is not set
 # CONFIG_NVGRACE_GPU_VFIO_PCI is not set
 # end of VFIO support for PCI devices

@@ -6575,12 +6626,7 @@ CONFIG_XEN_AUTO_XLATE=y
 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 CONFIG_STAGING=y
-# CONFIG_RTLLIB is not set
 CONFIG_RTL8723BS=m
-CONFIG_R8712U=m
-# CONFIG_RTS5208 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set

 #
 # IIO staging drivers
@@ -6628,13 +6674,13 @@ CONFIG_VIDEO_MAX96712=m
 # StarFive media platform drivers
 #
 # CONFIG_STAGING_MEDIA_DEPRECATED is not set
-# CONFIG_LTE_GDM724X is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_XIL_AXIS_FIFO is not set
-# CONFIG_FIELDBUS_DEV is not set
 # CONFIG_VME_BUS is not set
+# CONFIG_GPIB is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_OF_HW_PROBER=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_RPMSG=y
@@ -6704,6 +6750,7 @@ CONFIG_COMMON_CLK_MT2712=y
 # CONFIG_COMMON_CLK_MT2712_MMSYS is not set
 # CONFIG_COMMON_CLK_MT2712_VDECSYS is not set
 # CONFIG_COMMON_CLK_MT2712_VENCSYS is not set
+# CONFIG_COMMON_CLK_MT6735 is not set
 CONFIG_COMMON_CLK_MT6765=y
 CONFIG_COMMON_CLK_MT6765_AUDIOSYS=y
 # CONFIG_COMMON_CLK_MT6765_CAMSYS is not set
@@ -6953,6 +7000,7 @@ CONFIG_FSL_RCPM=y
 #
 CONFIG_MTK_CMDQ=y
 CONFIG_MTK_DEVAPC=m
+CONFIG_MTK_DVFSRC=y
 CONFIG_MTK_INFRACFG=y
 CONFIG_MTK_PMIC_WRAP=y
 CONFIG_MTK_REGULATOR_COUPLER=y
@@ -7138,8 +7186,10 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_AD7476 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7625 is not set
 # CONFIG_AD7766 is not set
 # CONFIG_AD7768_1 is not set
+# CONFIG_AD7779 is not set
 # CONFIG_AD7780 is not set
 # CONFIG_AD7791 is not set
 # CONFIG_AD7793 is not set
@@ -7153,6 +7203,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_AXP288_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_GEHC_PMC_ADC is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
@@ -7289,6 +7340,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # Digital to analog converters
 #
+# CONFIG_AD3552R_HS is not set
 # CONFIG_AD3552R is not set
 # CONFIG_AD5064 is not set
 # CONFIG_AD5360 is not set
@@ -7313,6 +7365,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5791 is not set
 # CONFIG_AD7293 is not set
 # CONFIG_AD7303 is not set
+# CONFIG_AD8460 is not set
 # CONFIG_AD8801 is not set
 # CONFIG_DPOT_DAC is not set
 # CONFIG_DS4424 is not set
@@ -7425,6 +7478,8 @@ CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_ADIS16480 is not set
 # CONFIG_BMI160_I2C is not set
 # CONFIG_BMI160_SPI is not set
+# CONFIG_BMI270_I2C is not set
+# CONFIG_BMI270_SPI is not set
 # CONFIG_BMI323_I2C is not set
 # CONFIG_BMI323_SPI is not set
 # CONFIG_BOSCH_BNO055_SERIAL is not set
@@ -7436,6 +7491,7 @@ CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_INV_ICM42600_SPI is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_SMI240 is not set
 CONFIG_IIO_ST_LSM6DSX=m
 CONFIG_IIO_ST_LSM6DSX_I2C=m
 CONFIG_IIO_ST_LSM6DSX_SPI=m
@@ -7498,6 +7554,7 @@ CONFIG_HID_SENSOR_ALS=m
 # CONFIG_US5182D is not set
 CONFIG_VCNL4000=m
 # CONFIG_VCNL4035 is not set
+# CONFIG_VEML3235 is not set
 # CONFIG_VEML6030 is not set
 # CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
@@ -7513,6 +7570,7 @@ CONFIG_VCNL4000=m
 # CONFIG_AK8974 is not set
 # CONFIG_AK8975 is not set
 # CONFIG_AK09911 is not set
+# CONFIG_ALS31300 is not set
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
@@ -7704,6 +7762,7 @@ CONFIG_RESET_SCMI=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 # CONFIG_PHY_CAN_TRANSCEIVER is not set
+# CONFIG_PHY_NXP_PTN3222 is not set

 #
 # PHY drivers for Broadcom platforms
@@ -7863,7 +7922,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_XFS_FS=m
 CONFIG_XFS_SUPPORT_V4=y
@@ -7881,6 +7939,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_EXPERIMENTAL is not set
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_F2FS_FS=y
@@ -8574,6 +8633,7 @@ CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
+CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
 CONFIG_SWIOTLB=y
 # CONFIG_SWIOTLB_DYNAMIC is not set
 CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
@@ -8627,6 +8687,7 @@ CONFIG_SBITMAP=y

 CONFIG_GENERIC_IOREMAP=y
 CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_UNION_FIND=y

 #
 # Kernel hacking
@@ -8701,6 +8762,7 @@ CONFIG_HAVE_KCSAN_COMPILER=y
 # CONFIG_NET_DEV_REFCNT_TRACKER is not set
 # CONFIG_NET_NS_REFCNT_TRACKER is not set
 # CONFIG_DEBUG_NET is not set
+# CONFIG_DEBUG_NET_SMALL_RTNL is not set
 # end of Networking Debugging

 #
@@ -8848,6 +8910,7 @@ CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FUNCTION_GRAPH_RETVAL is not set
+# CONFIG_FUNCTION_GRAPH_RETADDR is not set
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
@@ -0,0 +1,26 @@
+From 04bb92f26f477cdc0cc26b91c504020c1426ed42 Mon Sep 17 00:00:00 2001
+From: Clayton Craft <clayton@craftyguy.net>
+Date: Wed, 8 Jan 2025 14:04:56 -0800
+Subject: [PATCH] partially revert arm64: dts: qcom: sc8280xp: enable GICv3 ITS
+ for PCIe
+
+---
+ arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+index 82fbdf395adc..ae5043df9de7 100644
+--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+@@ -1776,8 +1776,6 @@ pcie4: pcie@1c00000 {
+ 			linux,pci-domain = <6>;
+ 			num-lanes = <1>;
+ 
+-			msi-map = <0x0 &its 0xe0000 0x10000>;
+-
+ 			interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
+ 				     <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+ 				     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>,
+-- 
+2.47.1
+
@@ -1,10 +1,10 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 # Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
 pkgname=linux-postmarketos-qcom-laptop
-pkgver=6.12
-pkgrel=1
+pkgver=6.13
+pkgrel=0
 # Commit from branch @ https://github.com/jhovold/linux/tree/wip/x1e80100-$pkgver
-_commit="93bd777d19aa0e8b58dee1eb837a16acf56035b0"
+_commit="0df45c8ef99147234f541062be775907b28ad768"
 pkgdesc="Generic kernel for Qualcomm laptops"
 arch="aarch64"
 _carch="arm64"
@@ -16,8 +16,8 @@ options="!strip
 	!tracedeps
 	pmb:cross-native
 	pmb:kconfigcheck-community
-	pmb:kconfigcheck-containers
 	pmb:kconfigcheck-uefi
+	pmb:kconfigcheck-virt
 "
 makedepends="
 	bash
@@ -40,6 +40,7 @@ source="
 	$pkgname-$_commit.tar.gz::https://github.com/jhovold/$_repository/archive/$_commit.tar.gz
 	misc.config
 	pmos.config
+	0001-partially-revert-arm64-dts-qcom-sc8280xp-enable-GICv.patch
 "
 builddir="$srcdir/linux-$_commit"
 _outdir="out"
@@ -81,7 +82,8 @@ package() {
 }

 sha512sums="
-af20b0d7e46e31de152a01e6c811c691f3866add856d4b8cc3e665fde2f10d0fa4ccb401cf3583e4975c0ccb281369fc019825ad274c4edad49f0e8069c154fc  linux-postmarketos-qcom-laptop-93bd777d19aa0e8b58dee1eb837a16acf56035b0.tar.gz
-c343baeb03f91a16994fd53e7cf1be0590be591c3a02e583d897f6b84ee9b33662cac513f84e1756fed58ab283c16471492bf227a1adb00f5bdd660ea4631ef1  misc.config
-98c3d46a83f496ed3cdb0ae97f9a891ff2acb504205d91646bed23b2efc999d77f486ec905ceebdac08a9d25f51b82caec8857311434a4d9de214f064541df96  pmos.config
+b49abf68751eb34eb83a716f03695b118eb42beaac44dc2116349475a5783d759879fedc052fe0b9d845bc4549211b302b68598c86526a75867abf35e2437fe3  linux-postmarketos-qcom-laptop-0df45c8ef99147234f541062be775907b28ad768.tar.gz
+980eefd8aaee78897cd41d039eecc11e23b8d7cc87b41c869f1e2b83cd9b5dac9813d7bd1a0e7c466303c795f234871080686921b9672983604551903004cb68  misc.config
+c761143bbdb621a1698068b2369473786638dc4b1c34c9c92466b053a7d4a5ed4e69dbdf731b57b40a1eb99b0f92a6ceaed1cc7302ab6584ef9a779cb225538e  pmos.config
+8bd939e56b3bd6e9b268fe48f3cbaf9ea48eb41cf96edc5b6facb9e0c30553c336baba57efd2f549d7d6a56e8687a4fce211b59d2bc1cf16fd92780f38406d65  0001-partially-revert-arm64-dts-qcom-sc8280xp-enable-GICv.patch
 "
@@ -1,5 +1,6 @@
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_CONNECTOR=y
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_PROC_EVENTS=y
 CONFIG_USB_SERIAL_PL2303=m
@@ -206,11 +206,135 @@ CONFIG_DM_INTEGRITY=m

 # Input
 CONFIG_HIDRAW=y
-CONFIG_INPUT_UINPUT=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_BPF=y
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_EVISION=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_GOODIX_SPI=m
+CONFIG_HID_GOOGLE_STADIA_FF=m
+CONFIG_HID_GREENASIA=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LETSKETCH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_MCP2221=m
+CONFIG_HID_MEGAWORLD_FF=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_NINTENDO=m
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_NVIDIA_SHIELD=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PID=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_PXRC=m
+CONFIG_HID_RAZER=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_RMI=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_HID_SIGMAMICRO=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPRE=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_VIVALDI=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WINWING=m
+CONFIG_HID_XIAOMI=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_HID_ZYDACRON=m
 CONFIG_INPUT_JOYSTICK=y
+CONFIG_INPUT_UINPUT=m
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_UHID=m
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_HIDDEV=y
@@ -6,7 +6,7 @@
 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
 pkgver=6.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
 _carch="arm64"
@@ -27,7 +27,7 @@ makedepends="
 	python3
 "

-_tag="$pkgver-r0"
+_tag="$pkgver-r2"

 source="
 	$pkgname-v$_tag.tar.gz::$url/archive/v$_tag.tar.gz
@@ -61,6 +61,6 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
 sha512sums="
-542189a25e3cd1bb3f994e0cf5d35db133f9fd4ede5edcd2f350d9d551c2dd9e21b1ee16c6839bcd1cf377c12bae39c06e8e47cf54e61f8603f93a9479d47a15  linux-postmarketos-qcom-msm8953-v6.12.0-r0.tar.gz
-bd7235497b820c76207cb4878dd46e6180783c48b82767c0c181852e776ab8f09e429e1cc24814a7009ccb376dbd3c4471551cc5b5c1e46170dd5c4aee4f8918  config-postmarketos-qcom-msm8953.aarch64
+1c007bef794ff481e505fdeda9a97371526c71f410ce2de5b40437f717e2b6c6c8a131d90dcfde1b664bf1b6ca8145739c26aa4bb9a6183951e879d2183b4c83  linux-postmarketos-qcom-msm8953-v6.12.0-r2.tar.gz
+aa545d23657458e0405c052256183a5a32cd8f7d28b5ecb3b86a5f13845ea6c78d4056585e108988f119deef5cff54605567605132fc1457f538032a55e2d1e4  config-postmarketos-qcom-msm8953.aarch64
 "
@@ -2201,6 +2201,7 @@ CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_RTL8153_ECM=m
 CONFIG_WLAN=y
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
+CONFIG_ATH_COMMON=m
 CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
 # CONFIG_ATH9K is not set
@@ -2208,7 +2209,15 @@ CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_CARL9170 is not set
 # CONFIG_ATH6KL is not set
 # CONFIG_AR5523 is not set
-# CONFIG_ATH10K is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_USB is not set
+# CONFIG_ATH10K_SNOC is not set
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+CONFIG_ATH10K_LEDS=y
+# CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
 CONFIG_WCN36XX_DEBUGFS=y
 # CONFIG_ATH11K is not set
@@ -2471,11 +2480,12 @@ CONFIG_RMI4_CORE=m
 CONFIG_RMI4_I2C=m
 # CONFIG_RMI4_SPI is not set
 # CONFIG_RMI4_SMB is not set
-# CONFIG_RMI4_F03 is not set
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
 CONFIG_RMI4_2D_SENSOR=y
 CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
-# CONFIG_RMI4_F30 is not set
+CONFIG_RMI4_F30=y
 # CONFIG_RMI4_F34 is not set
 # CONFIG_RMI4_F3A is not set
 # CONFIG_RMI4_F54 is not set
@@ -2583,7 +2593,13 @@ CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_SSIF_IPMI_BMC is not set
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
-# CONFIG_HW_RANDOM is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_BA431 is not set
+# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_CCTRNG is not set
+# CONFIG_HW_RANDOM_XIPHERA is not set
+CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
 # CONFIG_TCG_TPM is not set
@@ -3920,7 +3936,19 @@ CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
 #
 # Backlight & LCD device support
 #
-# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LCD_PLATFORM is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+# CONFIG_LCD_OTM3225A is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_KTD253 is not set
 # CONFIG_BACKLIGHT_KTD2801 is not set
@@ -4316,130 +4344,151 @@ CONFIG_HID_GENERIC=y
 # Special HID drivers
 #
 CONFIG_HID_A4TECH=y
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=y
-# CONFIG_HID_APPLEIR is not set
+CONFIG_HID_APPLEIR=m
 # CONFIG_HID_ASUS is not set
-# CONFIG_HID_AUREAL is not set
+CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=y
-# CONFIG_HID_BETOP_FF is not set
-# CONFIG_HID_BIGBEN_FF is not set
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
 CONFIG_HID_CHERRY=y
 CONFIG_HID_CHICONY=y
-# CONFIG_HID_CORSAIR is not set
-# CONFIG_HID_COUGAR is not set
-# CONFIG_HID_MACALLY is not set
-# CONFIG_HID_PRODIKEYS is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
 CONFIG_HID_CYPRESS=y
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELAN is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EVISION is not set
+CONFIG_HID_DRAGONRISE=m
+# CONFIG_DRAGONRISE_FF is not set
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EVISION=m
 CONFIG_HID_EZKEY=y
-# CONFIG_HID_FT260 is not set
-# CONFIG_HID_GEMBIRD is not set
-# 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_STADIA_FF is not set
-# CONFIG_HID_VIVALDI is not set
-# CONFIG_HID_GT683R is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_VRC2 is not set
-# CONFIG_HID_XIAOMI is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_ICADE is not set
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+# CONFIG_HOLTEK_FF is not set
+CONFIG_HID_VIVALDI_COMMON=m
+CONFIG_HID_GOODIX_SPI=m
+CONFIG_HID_GOOGLE_STADIA_FF=m
+CONFIG_HID_VIVALDI=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_VRC2=m
+CONFIG_HID_XIAOMI=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=y
-# CONFIG_HID_JABRA is not set
-# CONFIG_HID_TWINHAN is not set
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=y
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LED is not set
-# CONFIG_HID_LENOVO is not set
-# CONFIG_HID_LETSKETCH is not set
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LETSKETCH=m
 CONFIG_HID_LOGITECH=y
-# CONFIG_HID_LOGITECH_DJ is not set
-# CONFIG_HID_LOGITECH_HIDPP is not set
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIWHEELS_FF is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_MEGAWORLD_FF is not set
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_MEGAWORLD_FF=m
 CONFIG_HID_REDRAGON=y
 CONFIG_HID_MICROSOFT=y
 CONFIG_HID_MONTEREY=y
 CONFIG_HID_MULTITOUCH=m
-# CONFIG_HID_NINTENDO is not set
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_NVIDIA_SHIELD is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PLAYSTATION is not set
-# CONFIG_HID_PXRC is not set
-# CONFIG_HID_RAZER is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_RETRODE is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SEMITEK is not set
-# CONFIG_HID_SIGMAMICRO is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEAM is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_RMI is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TOPRE is not set
-# CONFIG_HID_THINGM is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_WIIMOTE is not set
-# CONFIG_HID_WINWING is not set
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_ALPS is not set
-# CONFIG_HID_MCP2200 is not set
-# CONFIG_HID_MCP2221 is not set
+CONFIG_HID_NINTENDO=m
+# CONFIG_NINTENDO_FF is not set
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_NVIDIA_SHIELD=m
+# CONFIG_NVIDIA_SHIELD_FF is not set
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PXRC=m
+CONFIG_HID_RAZER=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SIGMAMICRO=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+# CONFIG_STEAM_FF is not set
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+# CONFIG_GREENASIA_FF is not set
+CONFIG_HID_SMARTJOYPLUS=m
+# CONFIG_SMARTJOYPLUS_FF is not set
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_TOPRE=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+# CONFIG_THRUSTMASTER_FF is not set
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WINWING=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+# CONFIG_ZEROPLUS_FF is not set
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2200=m
+CONFIG_HID_MCP2221=m
 # end of Special HID drivers

 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
+CONFIG_HID_BPF=y
 # end of HID-BPF support

 #
 # USB HID support
 #
 CONFIG_USB_HID=y
-# CONFIG_HID_PID is not set
+CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
 # end of USB HID support

@@ -4639,6 +4688,7 @@ CONFIG_USB_SERIAL_OPTION=m
 # CONFIG_USB_HSIC_USB3503 is not set
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
+# CONFIG_USB_CHAOSKEY is not set
 # CONFIG_USB_ONBOARD_DEV is not set

 #
@@ -5022,6 +5072,7 @@ CONFIG_RTC_DRV_PM8XXX=m
 #
 # HID Sensor RTC drivers
 #
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_GOLDFISH is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
@@ -5539,7 +5590,9 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_BMA180 is not set
 # CONFIG_BMA220 is not set
 # CONFIG_BMA400 is not set
-# CONFIG_BMC150_ACCEL is not set
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
 # CONFIG_BMI088_ACCEL is not set
 # CONFIG_DA280 is not set
 # CONFIG_DA311 is not set
@@ -5548,6 +5601,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_DMARD10 is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
+CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_KX022A_SPI is not set
 # CONFIG_IIO_KX022A_I2C is not set
@@ -5711,6 +5765,8 @@ CONFIG_QCOM_SPMI_ADC5=m
 #
 # Hid Sensor IIO Common
 #
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # end of Hid Sensor IIO Common

 #
@@ -5818,6 +5874,7 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
 # CONFIG_FXAS21002C is not set
+CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set
@@ -5846,6 +5903,7 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_HDC100X is not set
 # CONFIG_HDC2010 is not set
 # CONFIG_HDC3020 is not set
+CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
@@ -5904,6 +5962,8 @@ CONFIG_CM3323=m
 # CONFIG_SENSORS_ISL29028 is not set
 # CONFIG_ISL29125 is not set
 # CONFIG_ISL76682 is not set
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
 # CONFIG_JSA1212 is not set
 # CONFIG_ROHM_BU27008 is not set
 # CONFIG_ROHM_BU27034 is not set
@@ -5950,6 +6010,7 @@ CONFIG_AK09911=m
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 # CONFIG_MMC35240 is not set
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
@@ -5969,6 +6030,8 @@ CONFIG_YAMAHA_YAS530=m
 #
 # Inclinometer sensors
 #
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # end of Inclinometer sensors

 #
@@ -5981,6 +6044,7 @@ CONFIG_YAMAHA_YAS530=m
 #
 # Linear and angular position sensors
 #
+CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
 # end of Linear and angular position sensors

 #
@@ -6014,6 +6078,7 @@ CONFIG_YAMAHA_YAS530=m
 # CONFIG_BMP280 is not set
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
+CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_HP03 is not set
 # CONFIG_HSC030PA is not set
 # CONFIG_ICP10100 is not set
@@ -6070,6 +6135,7 @@ CONFIG_YAMAHA_YAS530=m
 #
 # CONFIG_LTC2983 is not set
 # CONFIG_MAXIM_THERMOCOUPLE is not set
+CONFIG_HID_SENSOR_TEMP=m
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLX90635 is not set
@@ -6825,6 +6891,7 @@ CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 # CONFIG_CRYPTO_DEV_CCP is not set
 # CONFIG_CRYPTO_DEV_QCE is not set
+# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_CCREE=m
@@ -1,46 +0,0 @@
-From 7e1ea84748d49b328213db529b524216600a9419 Mon Sep 17 00:00:00 2001
-From: Frank Oltmanns <frank@oltmanns.dev>
-Date: Mon, 30 Dec 2024 19:12:53 +0100
-Subject: [PATCH] HACK: remoteproc: qcom: disable in-kernel PD mapper
-
-Somehow enabling in-kernel PD mapper (introduced in 5b9f51b200dcb
-"remoteproc: qcom: enable in-kernel PD mapper"), breaks the bottom mic
-on xiaomi-beryllium (Poco F1) and distorts audio on OP6 (and possibly
-OP6T). Temporarily disable it and log the rprocs in use until we better
-understand what causes the issue.
-
-Link: pmaports#3353
-Link: pmaports#3320
-Link: pmaports#3245
-Link: pmaports#3253
-
-Signed-off-by: Frank Oltmanns <frank@oltmanns.dev>
---
- drivers/remoteproc/qcom_common.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
-index 8c8688f99f0ab..0b4e8eb7622d9 100644
--- a/drivers/remoteproc/qcom_common.c
-+++ b/drivers/remoteproc/qcom_common.c
-@@ -583,6 +583,8 @@ static void pdm_notify_unprepare(struct rproc_subdev *subdev)
-  */
- void qcom_add_pdm_subdev(struct rproc *rproc, struct qcom_rproc_pdm *pdm)
- {
-+	printk(KERN_INFO "aborting qcom_add_pdm_subdev, name %s\n", rproc->name);
-+	return;
- 	pdm->dev = &rproc->dev;
- 	pdm->index = rproc->index;
- 
-@@ -602,6 +604,8 @@ EXPORT_SYMBOL_GPL(qcom_add_pdm_subdev);
-  */
- void qcom_remove_pdm_subdev(struct rproc *rproc, struct qcom_rproc_pdm *pdm)
- {
-+	printk(KERN_INFO "aborting qcom_remove_pdm_subdev, name %s\n", rproc->name);
-+	return;
- 	rproc_remove_subdev(rproc, &pdm->subdev);
- }
- EXPORT_SYMBOL_GPL(qcom_remove_pdm_subdev);
-- 
-2.47.1
-
@@ -6,7 +6,7 @@
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
 pkgver=6.13.0_rc2
-pkgrel=2
+pkgrel=3
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -24,7 +24,6 @@ _tag="sdm845-6.13-rc2-r2"
 source="
 	linux-$_tag.tar.gz::https://gitlab.com/sdm845-mainline/linux/-/archive/$_tag/linux-$_tag.tar.gz
 	$_config
-	0001-HACK-remoteproc-qcom-disable-in-kernel-PD-mapper.patch
 "
 builddir="$srcdir/linux-$_tag"

@@ -73,6 +72,5 @@ package() {

 sha512sums="
 af8b5e960248adf5da95571e964e664c8e329bf610a567b43fa22fc8a853b6e321192cb39667492ac86d8ac48e75b1e47eb546017937c9d0aeb11485e70797d3  linux-sdm845-6.13-rc2-r2.tar.gz
-4c663896c0bc76858a91cbe6d64461ebebe5beb42a14320479e2291761dd9bfb01fd68047b2813df24f697f1f7465f63c3ca5777f5bca9d26552366e851400d6  config-postmarketos-qcom-sdm845.aarch64
-a107cada98c5902aaf193bbc80d19276cf286c5094c7e8587a6d5756929d91f46b555efbf48f4b7b85c1feb8c71b989fbb49b26b2c7a8f7ec2ee1385c20b9d03  0001-HACK-remoteproc-qcom-disable-in-kernel-PD-mapper.patch
+d8efddd59cb27c26a3ed47c690a1461f243b8f573683e818c23426f53f30646c898fd760a403387d10a4321ffcd6ff2ad32c6201d4ac686005bc73306d41e1da  config-postmarketos-qcom-sdm845.aarch64
 "
@@ -4998,7 +4998,19 @@ CONFIG_FB_MODE_HELPERS=y
 #
 # Backlight & LCD device support
 #
-# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LCD_PLATFORM is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+# CONFIG_LCD_OTM3225A is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_KTD253 is not set
 # CONFIG_BACKLIGHT_KTD2801 is not set
@@ -5515,136 +5527,154 @@ CONFIG_HID_GENERIC=m
 #
 # Special HID drivers
 #
-CONFIG_HID_A4TECH=y
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-CONFIG_HID_APPLE=y
-# CONFIG_HID_APPLEIR is not set
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
 # CONFIG_HID_ASUS is not set
-# CONFIG_HID_AUREAL is not set
-CONFIG_HID_BELKIN=y
-# CONFIG_HID_BETOP_FF is not set
-# CONFIG_HID_BIGBEN_FF is not set
-CONFIG_HID_CHERRY=y
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
-# CONFIG_HID_CORSAIR is not set
-# CONFIG_HID_COUGAR is not set
-# CONFIG_HID_MACALLY is not set
-# CONFIG_HID_PRODIKEYS is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-CONFIG_HID_CYPRESS=y
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELAN is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EVISION is not set
-CONFIG_HID_EZKEY=y
-# CONFIG_HID_FT260 is not set
-# CONFIG_HID_GEMBIRD is not set
-# 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_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+# CONFIG_DRAGONRISE_FF is not set
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EVISION=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+# CONFIG_HOLTEK_FF is not set
+CONFIG_HID_VIVALDI_COMMON=m
+CONFIG_HID_GOODIX_SPI=m
 # CONFIG_HID_GOOGLE_HAMMER is not set
-# CONFIG_HID_GOOGLE_STADIA_FF is not set
-# CONFIG_HID_VIVALDI is not set
-# CONFIG_HID_GT683R is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
+CONFIG_HID_GOOGLE_STADIA_FF=m
+CONFIG_HID_VIVALDI=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
 # CONFIG_HID_KYSONA is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
 # CONFIG_HID_VRC2 is not set
-# CONFIG_HID_XIAOMI is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_ICADE is not set
-CONFIG_HID_ITE=y
-# CONFIG_HID_JABRA is not set
-# CONFIG_HID_TWINHAN is not set
-CONFIG_HID_KENSINGTON=y
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LED is not set
-# CONFIG_HID_LENOVO is not set
-# CONFIG_HID_LETSKETCH is not set
+CONFIG_HID_XIAOMI=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LETSKETCH=m
 CONFIG_HID_LOGITECH=m
-# CONFIG_HID_LOGITECH_DJ is not set
-# CONFIG_HID_LOGITECH_HIDPP is not set
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIWHEELS_FF is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_MEGAWORLD_FF is not set
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_MEGAWORLD_FF=m
 CONFIG_HID_REDRAGON=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_MONTEREY=y
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NINTENDO=m
 # CONFIG_NINTENDO_FF is not set
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_NVIDIA_SHIELD is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PLAYSTATION is not set
-# CONFIG_HID_PXRC is not set
-# CONFIG_HID_RAZER is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_RETRODE is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SEMITEK is not set
-# CONFIG_HID_SIGMAMICRO is not set
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_NVIDIA_SHIELD=m
+# CONFIG_NVIDIA_SHIELD_FF is not set
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+# CONFIG_PLAYSTATION_FF is not set
+CONFIG_HID_PXRC=m
+CONFIG_HID_RAZER=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SIGMAMICRO=m
 CONFIG_HID_SONY=m
 CONFIG_SONY_FF=y
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEAM is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+# CONFIG_STEAM_FF is not set
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
 CONFIG_HID_RMI=m
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TOPRE is not set
-# CONFIG_HID_THINGM is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_U2FZERO is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_WIIMOTE is not set
-# CONFIG_HID_WINWING is not set
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_ALPS is not set
+CONFIG_HID_GREENASIA=m
+# CONFIG_GREENASIA_FF is not set
+CONFIG_HID_SMARTJOYPLUS=m
+# CONFIG_SMARTJOYPLUS_FF is not set
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_TOPRE=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+# CONFIG_THRUSTMASTER_FF is not set
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WINWING=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+# CONFIG_ZEROPLUS_FF is not set
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
+CONFIG_HID_ALPS=m
 # CONFIG_HID_MCP2200 is not set
-# CONFIG_HID_MCP2221 is not set
+CONFIG_HID_MCP2221=m
 # end of Special HID drivers

 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
+CONFIG_HID_BPF=y
 # end of HID-BPF support

 #
 # USB HID support
 #
 CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
+CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
 # end of USB HID support

@@ -6305,6 +6335,7 @@ CONFIG_RTC_DRV_RTD119X=y
 #
 # HID Sensor RTC drivers
 #
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_GOLDFISH is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
@@ -6853,7 +6884,7 @@ CONFIG_QCOM_LLCC=y
 CONFIG_QCOM_KRYO_L2_ACCESSORS=y
 CONFIG_QCOM_MDT_LOADER=y
 CONFIG_QCOM_OCMEM=y
-CONFIG_QCOM_PD_MAPPER=m
+# CONFIG_QCOM_PD_MAPPER is not set
 CONFIG_QCOM_PDR_HELPERS=y
 CONFIG_QCOM_PDR_MSG=y
 # CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
@@ -6998,6 +7029,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_DMARD10 is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
+CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_KX022A_SPI is not set
@@ -7171,6 +7203,8 @@ CONFIG_IIO_CROS_EC_SENSORS=m
 #
 # Hid Sensor IIO Common
 #
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # end of Hid Sensor IIO Common

 #
@@ -7286,6 +7320,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
 # CONFIG_FXAS21002C is not set
+CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set
@@ -7314,6 +7349,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_HDC100X is not set
 # CONFIG_HDC2010 is not set
 # CONFIG_HDC3020 is not set
+CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
@@ -7376,6 +7412,8 @@ CONFIG_IIO_CROS_EC_LIGHT_PROX=m
 # CONFIG_SENSORS_ISL29028 is not set
 # CONFIG_ISL29125 is not set
 # CONFIG_ISL76682 is not set
+CONFIG_HID_SENSOR_ALS=m
+# CONFIG_HID_SENSOR_PROX is not set
 # CONFIG_JSA1212 is not set
 # CONFIG_ROHM_BU27008 is not set
 # CONFIG_ROHM_BU27034 is not set
@@ -7424,6 +7462,7 @@ CONFIG_VCNL4000=m
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 # CONFIG_MMC35240 is not set
 CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
@@ -7445,6 +7484,8 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 #
 # Inclinometer sensors
 #
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # end of Inclinometer sensors

 #
@@ -7457,6 +7498,7 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 #
 # Linear and angular position sensors
 #
+CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
 # end of Linear and angular position sensors

 #
@@ -7491,6 +7533,7 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 CONFIG_IIO_CROS_EC_BARO=m
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
+# CONFIG_HID_SENSOR_PRESS is not set
 # CONFIG_HP03 is not set
 # CONFIG_HSC030PA is not set
 # CONFIG_ICP10100 is not set
@@ -7548,6 +7591,7 @@ CONFIG_IIO_CROS_EC_BARO=m
 #
 # CONFIG_LTC2983 is not set
 # CONFIG_MAXIM_THERMOCOUPLE is not set
+CONFIG_HID_SENSOR_TEMP=m
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLX90635 is not set
@@ -4,12 +4,12 @@

 _flavor="postmarketos-qcom-sm8250"
 pkgname=linux-$_flavor
-pkgver=6.12.0
-pkgrel=1
+pkgver=6.13.0
+pkgrel=0
 pkgdesc="Mainline kernel fork for SM8250"
 arch="aarch64"
 _carch="arm64"
-url="https://gitlab.com/sm8250-mainline/linux"
+url="https://gitlab.postmarketos.org/jianhua/sm8250-mainline"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps
 	pmb:cross-native
@@ -31,10 +31,10 @@ makedepends="
 _tag="sm8250-$pkgver"
 _config="config-$_flavor.$arch"
 source="
-	$pkgname-$_tag.tar.gz::https://gitlab.com/sm8250-mainline/linux/-/archive/$_tag/linux-$_tag.tar.gz
+	$pkgname-$_tag.tar.gz::https://gitlab.postmarketos.org/jianhua/sm8250-mainline/-/archive/$_tag/sm8250-mainline-$_tag.tar.gz
 	$_config
 "
-builddir="$srcdir/linux-$_tag"
+builddir="$srcdir/sm8250-mainline-$_tag"

 prepare() {
 	default_prepare
@@ -63,6 +63,6 @@ package() {
 }

 sha512sums="
-6de31ce37ce6870c2ee12a72fdd4b4efc52b2dc1b031ffc0d2d049e882bbc9cb1e86507ddee37cb4d910e43ade217c017dfdd57b2e95363c2ccf6f7f29a68fb1  linux-postmarketos-qcom-sm8250-sm8250-6.12.0.tar.gz
-78745823967530af2132cdadb770c0f97b147b71f8332de174a759f21bd8a7416202d0466cc23fb54f0aa11df44a35e4e17f96f41d688153cd245843d1f69479  config-postmarketos-qcom-sm8250.aarch64
+9d67f82cacbed9b1eb6663d848051de0abdfa5f763097203c6ef93ad157ab7bf0268e9dabbc4933bea75a9cb55905797ff83d91d78090c57abba2c3b500fcd5e  linux-postmarketos-qcom-sm8250-sm8250-6.13.0.tar.gz
+5277ce718243dfd7ae7378d8c76777ef9d563974ecccf9fc1dad5d32f3f49930977cfd03176090e7dd0b74caf0bdbf665bea54595402b802c3eb7e658bd9a72b  config-postmarketos-qcom-sm8250.aarch64
 "
@@ -1,8 +1,8 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=soc-qcom-msm8953
 pkgdesc="Common package for Qualcomm MSM8953 devices"
-pkgver=11
-pkgrel=1
+pkgver=12
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -21,6 +21,7 @@ source="
 	90-feedbackd-pm8xxx-vib.rules
 	q6voiced.conf
 	adreno-a506-quirks.sh
+	moto-modem-rfs-setup.openrc
 "

 package() {
@@ -43,6 +44,7 @@ modem() {
 		q6voiced
 		qrtr
 		rmtfs
+		tqftpserv
 	"

 	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
@@ -54,9 +56,9 @@ modem_openrc() {
 	depends="
 		q6voiced-openrc
 		rmtfs-openrc
+		tqftpserv-openrc
 	"
-
-	mkdir -p "$subpkgdir"
+	install -Dm755 $srcdir/moto-modem-rfs-setup.openrc "$subpkgdir"/etc/init.d/moto-modem-rfs-setup
 }

 gpu() {
@@ -72,4 +74,5 @@ sha512sums="
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8xxx-vib.rules
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 d546c99ca8d406b4e2e3901a417e4e461314a38f2f01c48525e44ca524ad57af7bfc280f416bda90573b0bfb1cca27d45cb0a0ed44e999ef8d406a380d1fdbb2  adreno-a506-quirks.sh
+d4fd0f3406c9f004e9cae7bc500c5713aab75f102f8e3ea1af820865f01eb03def01cd9ed3e8a184c7dfc22ab419628fad17957a3782885d96eb36e94461e842  moto-modem-rfs-setup.openrc
 "
@@ -1,2 +1,3 @@
 #!/bin/sh
 rc-update add -q q6voiced default
+rc-update add -q moto-modem-rfs-setup boot
@@ -2,13 +2,13 @@
 # Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=device-amediatech-x96-mini
 pkgver=3
-pkgrel=0
+pkgrel=1
 pkgdesc="Amediatech X96 mini"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base u-boot-amediatech-x96-mini soc-amlogic-s905 linux-postmarketos-amlogic"
+depends="postmarketos-base u-boot-amlogic-amediatech-x96-mini soc-amlogic-s905 linux-postmarketos-amlogic"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="asound.state deviceinfo modules-initfs"
@@ -3,12 +3,12 @@
 pkgname=device-bananapi-bpi-cm4-cm4io
 pkgdesc="BananaPi BPI-CM4IO Baseboard with BPI-CM4"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base u-boot-bananapi-bpi-cm4 soc-amlogic-s905 linux-postmarketos-amlogic"
+depends="postmarketos-base u-boot-amlogic-bananapi-bpi-cm4-cm4io soc-amlogic-s905 linux-postmarketos-amlogic"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo modules-initfs"
@@ -0,0 +1,33 @@
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-bananapi-bpi-m2-zero
+pkgdesc="Banana Pi BPI-M2 Zero"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	linux-bananapi-bpi-m2-zero
+	postmarketos-base
+	u-boot-bananapi-bpi-m2-zero
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+"
+_pmb_recommends="
+	firmware-bananapi-bpi-m2-zero
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+a5dcb9c56ea9225bf8cb3a0734d72b62540a8d710219eb14868c3f0f0b5a6f2c765ad01d0d2139d5a9d0469e16d444963ca7d1ce6dac582ced4e9f4160503b9e  deviceinfo
+"
@@ -0,0 +1,26 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Banana Pi BPI-M2 Zero"
+deviceinfo_manufacturer="Banana Pi"
+deviceinfo_codename="bananapi-bpi-m2-zero"
+deviceinfo_year="2017"
+deviceinfo_dtb="sun8i-h2-plus-bananapi-m2-zero"
+deviceinfo_arch="armv7"
+deviceinfo_generate_extlinux_config="true"
+
+# Device related
+deviceinfo_chassis="embedded"
+deviceinfo_external_storage="true"
+deviceinfo_keyboard="true"
+
+# Bootloader related
+
+# U-Boot conflicts with GPT. (Partition table gets overwritten.)
+deviceinfo_partition_type="msdos"
+deviceinfo_flash_method="none"
+deviceinfo_sd_embed_firmware_step_size="1024"
+deviceinfo_sd_embed_firmware="u-boot/bananapi-m2-zero/u-boot.sunxi:8"
+deviceinfo_boot_filesystem="fat32"
@@ -2,13 +2,13 @@
 # Maintainer:
 pkgname=device-beelink-gt1
 pkgver=2
-pkgrel=0
+pkgrel=1
 pkgdesc="Beelink gt1 (Ultimate)"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base u-boot-beelink-gt1 soc-amlogic-s905"
+depends="postmarketos-base u-boot-amlogic-beelink-gt1 soc-amlogic-s905"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-alpine:kernel_alpine
@@ -1,13 +1,13 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-alice
 pkgdesc="Huawei P8 Lite"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-huawei-alice mkbootimg msm-fb-refresher"
+depends="postmarketos-base linux-huawei-alice mkbootimg msm-fb-refresher postmarketos-base-downstream"
 makedepends="devicepkg-dev"
 source="deviceinfo"

@@ -28,5 +28,5 @@ package() {
 }

 sha512sums="
-7e6ef16d5f2e75f9299f88a0223853a12fccaf178803bb3f6d97921982cb316d1dfd4599f190fa26e83fead57d2d1ef4ac1a7549d0d69b24977cd541a1b3e2cc  deviceinfo
+5430865c8531590622e1adda2828a040694ad03f9cc6959a628aa32c77293d2aea7f6ffccaea3cac28e4c7f20f98e0293977a666ae13108ff2f8c20fdd545d3f  deviceinfo
 "
@@ -27,3 +27,4 @@ deviceinfo_flash_offset_ramdisk="0x07b88000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x02988000"
 deviceinfo_flash_pagesize="2048"
+deviceinfo_create_initfs_extra="true"
@@ -3,7 +3,7 @@
 pkgname=device-librecomputer-lepotato
 pkgdesc="Libre Computer AML-S905X-CC-V1.0"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ depends="
 	linux-postmarketos-amlogic
 	postmarketos-base
 	soc-amlogic-s905
-	u-boot-librecomputer-lepotato
+	u-boot-amlogic-librecomputer-lepotato
 "
 makedepends="devicepkg-dev"
 source="
@@ -1,33 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-motorola-ali
-pkgdesc="Motorola Moto G6"
-pkgver=3
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	firmware-motorola-ali
-	firmware-qcom-adreno-a530
-	linux-postmarketos-qcom-msm8953
-	lk2nd-msm8953
-	mkbootimg
-	msm-firmware-loader
-	postmarketos-base
-"
-makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-sha512sums="
-705416801d6633e09aa79438175065aff5c50277c9359cdd1d9399ad80eb9b46f3c98e78d60098c4788212188be2b22072cfd5e703da988d6686d8c96f51eb78  deviceinfo
-097ac4b7c82a984d3e71309b015ba161ab5d851cc3a7bac11afced39d762112d1ad1df64a26c9128a4d3f8338ecbd75820170f873ac28a4684c2d6b83562a8a7  modules-initfs
-"
@@ -1,34 +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="Motorola Moto G6"
-deviceinfo_manufacturer="Motorola"
-deviceinfo_codename="motorola-ali"
-deviceinfo_year="2018"
-deviceinfo_arch="aarch64"
-deviceinfo_dtb="qcom/sdm450-motorola-ali"
-deviceinfo_append_dtb="true"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="false"
-deviceinfo_screen_width="1080"
-deviceinfo_screen_height="2160"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_offset_base="0x80000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_pagesize="2048"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -1,4 +0,0 @@
-edt_ft5x06
-msm
-panel-motorola-ali-boe
-panel-motorola-ali-tianma
@@ -1,35 +0,0 @@
-# Maintainer: Ultracoolguy <ultracoolguy@disroot.org>
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-motorola-ocean
-pkgdesc="Motorola Moto G7 Power"
-pkgver=2
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	firmware-motorola-ocean
-	firmware-qcom-adreno-a530
-	linux-postmarketos-qcom-msm8953
-	lk2nd-msm8953
-	mkbootimg
-	msm-firmware-loader
-	postmarketos-base
-	soc-qcom-msm8916
-"
-makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-sha512sums="
-9dfe084b5394dc7bf1617f0396c5d853965a3bddaba438644d29e5fbbe95d6b704b98b89a0d7f233f6b677bb3e68b016eb55732ed9e22e56f93a32586f306663  deviceinfo
-f627d473ccfc01f39ed7b1345c2795af0cd358b4738d202e53fbae07c605d239f9139b034c5a29411bafe368b92a44c756e2bd029246b385d6397f519af8ff7c  modules-initfs
-"
@@ -1,36 +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="Motorola Moto G7 Power"
-deviceinfo_manufacturer="Motorola"
-deviceinfo_codename="motorola-ocean"
-deviceinfo_year="2019"
-deviceinfo_arch="aarch64"
-deviceinfo_dtb="qcom/sdm632-motorola-ocean"
-deviceinfo_append_dtb="true"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="720"
-deviceinfo_screen_height="1520"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
-deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_offset_base="0x80000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_pagesize="2048"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -1 +0,0 @@
-msm
@@ -1,44 +0,0 @@
-# Maintainer: Sireesh Kodali <scarface@disroot.org>
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-motorola-potter
-pkgdesc="Motorola Moto G5 Plus"
-pkgver=3
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	firmware-qcom-adreno-a530
-	firmware-motorola-potter
-	linux-postmarketos-qcom-msm8953
-	lk2nd-msm8953
-	mkbootimg
-	msm-firmware-loader
-	postmarketos-base
-	soc-qcom-msm8953
-	soc-qcom-msm8953-modem
-	tqftpserv
-"
-makedepends="devicepkg-dev"
-subpackages="$pkgname-openrc"
-source="deviceinfo modules-initfs"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-openrc() {
-	depends="tqftpserv-openrc"
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-c8c4c5ec686dfab80cc077632ed8e125c31fffe23a34536991acba40f1ce1083da451ea9c988309f63b0f488e0b4745e6815cb7b14ea4d2f0fbd61decc4e4f39  deviceinfo
-93c77bfcde005c021ac9b671f9671923339f855e45d4fce8b2caea4748eccc08c8ec65bdfc85fef4900c974860613e8d62e6fe0ea95741ec1ab08c814148472b  modules-initfs
-"
@@ -1,36 +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="Motorola Moto G5 Plus"
-deviceinfo_manufacturer="Motorola"
-deviceinfo_codename="motorola-potter"
-deviceinfo_year="2017"
-deviceinfo_dtb="qcom/msm8953-motorola-potter"
-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="1080"
-deviceinfo_screen_height="1920"
-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="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_sparse="true"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -1,5 +0,0 @@
-msm
-panel_boe_bs052fhm_a00_6c01
-panel_tianma_tl052vdxp02
-rmi_core
-rmi_i2c
@@ -3,12 +3,12 @@
 pkgname=device-odroid-c4
 pkgdesc="ODROID C4"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base u-boot-odroid-c4 soc-amlogic-s905 linux-postmarketos-amlogic"
+depends="postmarketos-base u-boot-amlogic-odroid-c4 soc-amlogic-s905 linux-postmarketos-amlogic"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo modules-initfs"
@@ -3,12 +3,12 @@
 pkgname=device-odroid-n2plus
 pkgdesc="ODROID N2+"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base u-boot-odroid-n2plus soc-amlogic-s905 linux-postmarketos-amlogic"
+depends="postmarketos-base u-boot-amlogic-odroid-n2plus soc-amlogic-s905 linux-postmarketos-amlogic"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo modules-initfs"
@@ -1,2 +1,2 @@
-SUBSYSTEM=="module", KERNEL=="rockchip_ebc", RUN+="/bin/chgrp video /sys/module/%k/parameters/auto_refresh /sys/module/%k/parameters/bw_dither_invert /sys/module/%k/parameters/bw_threshold /sys/module/%k/parameters/bw_mode /sys/module/%k/parameters/diff_mode /sys/module/%k/parameters/direct_mode /sys/module/%k/parameters/limit_fb_blits /sys/module/%k/parameters/panel_reflection /sys/module/%k/parameters/refresh_threshold /sys/module/%k/parameters/refresh_waveform /sys/module/%k/parameters/skip_reset /sys/module/%k/parameters/split_area_limit /sys/module/%k/parameters/default_waveform", RUN+="/bin/chmod g+w /sys/module/%k/parameters/bw_threshold /sys/module/%k/parameters/bw_mode /sys/module/%k/parameters/default_waveform  /sys/module/%k/parameters/diff_mode /sys/module/%k/parameters/direct_mode /sys/module/%k/parameters/limit_fb_blits /sys/module/%k/parameters/panel_reflection /sys/module/%k/parameters/refresh_threshold /sys/module/%k/parameters/refresh_waveform /sys/module/%k/parameters/skip_reset /sys/module/%k/parameters/auto_refresh /sys/module/%k/parameters/bw_dither_invert /sys/module/%k/parameters/split_area_limit"
+SUBSYSTEM=="module", KERNEL=="rockchip_ebc", RUN+="/bin/chgrp video /sys/module/%k/parameters/dclk_select /sys/module/%k/parameters/auto_refresh /sys/module/%k/parameters/bw_dither_invert /sys/module/%k/parameters/bw_threshold /sys/module/%k/parameters/bw_mode /sys/module/%k/parameters/diff_mode /sys/module/%k/parameters/direct_mode /sys/module/%k/parameters/limit_fb_blits /sys/module/%k/parameters/panel_reflection /sys/module/%k/parameters/refresh_threshold /sys/module/%k/parameters/refresh_waveform /sys/module/%k/parameters/skip_reset /sys/module/%k/parameters/split_area_limit /sys/module/%k/parameters/default_waveform", RUN+="/bin/chmod g+w /sys/module/%k/parameters/bw_threshold /sys/module/%k/parameters/bw_mode /sys/module/%k/parameters/default_waveform  /sys/module/%k/parameters/diff_mode /sys/module/%k/parameters/direct_mode /sys/module/%k/parameters/limit_fb_blits /sys/module/%k/parameters/panel_reflection /sys/module/%k/parameters/refresh_threshold /sys/module/%k/parameters/refresh_waveform /sys/module/%k/parameters/skip_reset /sys/module/%k/parameters/auto_refresh /sys/module/%k/parameters/bw_dither_invert /sys/module/%k/parameters/split_area_limit"
 DRIVER=="rockchip-ebc", RUN+="/bin/chgrp video /sys/%p/power/control", RUN+="/bin/chmod g+w /sys/%p/power/control"
@@ -1,26 +1,29 @@
-# Maintainer: Petr Hodina <phodina@protonmail.com>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=device-pine64-pinenote
 pkgdesc="Pine64 PineNote"
-pkgver=2
-pkgrel=7
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	u-boot-pine64-pinenote
 	linux-pine64-pinenote
+	pinenote-dbus-service<20221207
 	postmarketos-base
+	u-boot-pine64-pinenote
 "
 makedepends="devicepkg-dev"
 source="
-	deviceinfo
-	modules-initfs
-	phoc.ini
-	local-overrides.quirks
 	50-touchscreen.conf
 	81-libinput-pinenote.rules
 	82-ebc-rockchip.rules
+	deviceinfo
+	local-overrides.quirks
+	modules-initfs
+	panfrost.conf
+	phoc.ini
+	rockchip_ebc.conf
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -42,6 +45,10 @@ package() {
 		-t "$pkgdir"/usr/lib/udev/rules.d
 	install -Dm644 "$srcdir"/82-ebc-rockchip.rules \
 		"$pkgdir"/usr/lib/udev/rules.d
+	install -Dm644 "$srcdir"/panfrost.conf \
+		-t "$pkgdir"/etc/modprobe.d
+	install -Dm644 "$srcdir"/rockchip_ebc.conf \
+		-t "$pkgdir"/etc/modprobe.d
 }

 phosh() {
@@ -65,5 +72,7 @@ sha512sums="
 1123720962c9c8fec3c50302ca6a3dd56e2907dc9eea361a7b8eb4201b042476633d41a0ee4f6ab61d9c60eeccc894f83491ba9fa309a9bce2f1db0b0341d79d  local-overrides.quirks
 ac433eebbc35a48561837495997aee4e55510b979bc0d8e3bafb761bc1be5b4bdeed2f456369dcbc582688aefd07c63966b0d72b6ffa99e84cfd868e677f02c8  50-touchscreen.conf
 2bc51f200baefc37abfaaad368a911244999e906bdca4b728ac233f49a8fb3ae7206ee3c95cdb20d7dceae2a31d25a57f4e1da4fd67057fd64724b8232e42aed  81-libinput-pinenote.rules
-7c418cebf336df96cd484d7f0243cf27e859b11a7f2e7fb54dd2b4afedc4f570588bee08a5de8075db7c7d6d56b7971d19dc09909ebe68247505a3e37427e312  82-ebc-rockchip.rules
+19e922eec89dba419798c4e1dc9b39c040db33986d0969a39a8220c642fa081763f15ff2418115d5a748af4054a1be0784927d1712ea79942c2b237ebab47728  82-ebc-rockchip.rules
+6ba6638754e00908243de2f73ed6898dac03638a200dcf7b7cd9684757355ee1eb0ac874af0f971ad2e054c1a8c471867bdaea4d9aaf7eea6d3cf81ac7dd73a2  panfrost.conf
+b52d2e7f0c62d7c313b6db9aeb706cdb2596b6aa637aeddb862abf1e256103377fb6267e38cd4285e25d32112acf8d03bbf32ecff7be3dfbb9176209ea7ae283  rockchip_ebc.conf
 "
@@ -0,0 +1,2 @@
+softdep panfrost pre: rockchip_ebc
+# blacklist rockchip_ebc
@@ -0,0 +1,5 @@
+# rockchip-rga will crash the kernel on unload at the moment
+blacklist rockchip-rga
+blacklist ws8100_pen
+
+options rockchip_ebc direct_mode=0 auto_refresh=1 refresh_threshold=60 split_area_limit=0 panel_reflection=1 prepare_prev_before_a2=0 dclk_select=0
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-postmarketos-trailblazer
 pkgdesc="postmarketOS Trailblazer generic ARM64"
-pkgver=11
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,6 +26,7 @@ depends="
 	firmware-siliconlabs-rs9116
 	firmware-brcm43752
 	dtbloader
+	woa-firmware-yoinker
 "
 makedepends="devicepkg-dev"
 subpackages="
@@ -80,5 +81,5 @@ kernel_postmarketos_amlogic() {

 sha512sums="
 12e7c1af63b24a37198a73e77d45cc5cbcb3ce34bbdb32d913cb3e427896ddcf2266269f8fe0c73c15c751a34ad738bd7fc958629ad066cd3c0a9faaaae7d67f  deviceinfo
-d3a8fc6a343289e5d232cacdf539eba34c0f52e7110ca7b6c4708d6b9c2d1bc6f5f40afe75722b84023493aa1dbda9ccab1187fce14c21a85647837088058d2c  modules-initfs
+7642e07eb1d0d24c8b1d754371394ff5a5b532fb699be5cac75431b58755adb6f550bf4cf8cddde27ef4e7f20ea90a5368298b0e44f9d145f1f6d7a4026a550e  modules-initfs
 "
@@ -1,16 +1,22 @@
 atmel_mxt_ts
 aux-hpd-bridge
+backlight
 bq25890_charger
 clk-smd-rpm
 display_connector
+dispcc-x1e80100
 dwc3
 dwc3-qcom
 edt-ft5x06
 gcc-sm6115
 goodix
 gpi
+gpio_sbu_mux
 gpio_vibra
+gpucc-x1e80100
+i2c-hid
 i2c-hid-of
+i2c-hid-of-elan
 i2c-qcom-geni
 icc-bwmon
 icc-osm-l3
@@ -24,10 +30,13 @@ msm
 nvme
 nvmem_qfprom
 onboard-usb-dev
+panel_edp
+panel_samsung_atna33xc20
 panel-samsung-s6d7aa0
 panel-samsung-sofef00
 panel_sitronix_st7703
 panel-visionox-rm69299
+phy_qcom_edp
 phy-qcom-eusb2-repeater
 phy-qcom-qmp-combo
 phy-qcom-qmp-pcie
@@ -38,6 +47,8 @@ phy-qcom-qusb2
 phy-qcom-snps-eusb2
 phy_sun6i_mipi_dphy
 pinctrl-sm6115
+pmic-glink
+pmic-glink-altmode
 pwm_bl
 pwm_sun4i
 qcom-apcs-ipc-mailbox
@@ -53,8 +64,8 @@ qnoc-qcm2290
 qnoc-sm6115
 rmi_core
 rmi_i2c
-rpm-proc
 rpmpd
+rpm-proc
 rpmsg_core
 smd-rpm
 smem
@@ -66,6 +77,7 @@ sun6i_mipi_dsi
 sun8i_mixer
 sun8i_tcon_top
 tcpm
+tcsrcc-x1e80100
 typec
 udc-core
 ufs-qcom
@@ -2,13 +2,13 @@
 # Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=device-radxa-zero
 pkgver=2
-pkgrel=0
+pkgrel=1
 pkgdesc="Radxa Zero"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-edge u-boot-radxa-zero"
+depends="postmarketos-base linux-edge u-boot-amlogic-radxa-zero"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo modules-initfs"
@@ -0,0 +1 @@
+SUBSYSTEM=="vchiq", GROUP="video", MODE="0660"
@@ -0,0 +1,68 @@
+# Maintainer: winbo-yml-exe <winbo.yml@proton.me>
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-raspberry-pi5
+pkgver=1
+pkgrel=0
+pkgdesc="Raspberry Pi 5"
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="postmarketos-base raspberrypi-bootloader linux-rpi"
+makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-openrc
+	$pkgname-plasma-bigscreen:plasma_bigscreen
+	"
+source="
+	deviceinfo
+	modules-initfs
+	usercfg.txt
+	cmdline.txt
+	95-vchiq-permissions.rules
+	enforce-platform.sh
+	"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+	install -Dm644 "$srcdir"/usercfg.txt "$pkgdir"/boot/usercfg.txt
+	install -Dm644 "$srcdir"/cmdline.txt "$pkgdir"/boot/cmdline.txt
+	install -Dm644 "$srcdir"/95-vchiq-permissions.rules \
+		"$pkgdir"/etc/udev/rules.d/95-vchiq-permissions.rules
+	install -Dm755 "$srcdir"/enforce-platform.sh -t "$pkgdir"/etc/profile.d/
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/Bluetooth firmware"
+	depends="linux-firmware-brcm"
+	mkdir "$subpkgdir"
+}
+
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
+plasma_bigscreen() {
+	pkgdesc="$pkgdesc (Plasma Bigscreen)"
+	install_if="$pkgname plasma-bigscreen"
+
+	amove etc/profile.d
+}
+
+
+sha512sums="
+52a562c316e540a5f746f566f51cf6cc6455932c747606543c8a40b067b6add50348b9342b35d96ff0b0d0955bcabbe9b1d07c30a81ec82f118c39c1a5d08034  deviceinfo
+e3515cf9f41807917eac1f7663e0131bd18783824facf15f2bb0381635bf6d9a0c334f3786b6fb76d01469de6449878c871f8b747f45e9e3cee77699905cf319  modules-initfs
+4e832421e47dd0faf443a7a949aae83cc6d4a80fd816df5c6d9d72ac4ae23f803863b9b63903a14b18ae585e6abc5c8703376a003967b74dc30040dc544aa2e9  usercfg.txt
+ae3de0b8fec07d3a283dc3c06bf8678eec1e65c9faf0b7f4fdc9fb92751e324d1f8e2fb224dbbf561b7e5a6fb34769bfa1657858375f74b101a130d78e0737e2  cmdline.txt
+7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d  95-vchiq-permissions.rules
+5ebdd05414792b82073a6453517c19458863809cdfb25e7d8857030c1feb69cbebc02c5309e6a14373125d83e5e673a20f2006520a34148af17219fb1863dd95  enforce-platform.sh
+"
@@ -0,0 +1 @@
+modules=loop,squashfs,sd-mod,usb-storage quiet dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rc-update add swclock boot
@@ -0,0 +1 @@
+./device-raspberry-pi5-openrc.post-install
@@ -0,0 +1,22 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Raspberry Pi 5"
+deviceinfo_manufacturer="Raspberry Pi"
+deviceinfo_codename="raspberry-pi5"
+deviceinfo_year="2023"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="embedded"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1920"
+deviceinfo_screen_height="1080"
+deviceinfo_mesa_driver="vc4"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_boot_filesystem="fat16"
@@ -0,0 +1 @@
+export BIGSCREEN_HARDWARE_PLATFORM=RPI5
@@ -0,0 +1 @@
+vc4
@@ -0,0 +1,51 @@
+boot_delay=0
+
+arm_control=0x200
+
+kernel=vmlinuz-rpi
+initramfs initramfs
+
+gpu_mem=256
+
+# uncomment line to enable serial on ttyS0
+# NOTE: This fixes the core_freq to 250Mh
+#enable_uart=1
+
+# to take advantage of your high speed sd card
+dtparam=sd_overclock=100
+
+# use drm backend ( for weston and wayland )
+dtoverlay=vc4-kms-v3d
+
+# have a properly sized image
+disable_overscan=1
+
+# for sound over HDMI
+hdmi_drive=2
+
+# rotate the HDMI display
+# 0 => no rotation
+# 1 => 90 degrees clockwise
+# 2 => 180 degrees clockwise
+# 3 => 270 degrees clockwise
+#display_hdmi_rotate=0
+
+# Uncomment some or all of these to enable the optional hardware interfaces
+#dtparam=i2c_arm=on
+#dtparam=i2s=on
+#dtparam=spi=on
+
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
+
+# custom CVT mode for HDMI
+# see https://www.raspberrypi.org/documentation/configuration/config-txt/video.md
+#hdmi_group=2
+#hdmi_mode=87
+#hdmi_cvt 800 480 60 6 0 0 0
+
+# Automatically enable Bluetooth without having to use btattach
+# Note that the Pi's Bluetooth interface is connected via hardware UART;
+# if you intend to use it for other purposes (for example, serial debugging)
+# comment out the line below.
+dtparam=krnbt=on
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-baffinlite
 pkgdesc="Samsung Galaxy Grand Neo"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,6 +29,6 @@ nonfree_firmware() {
 }

 sha512sums="
-86ad4ae54269a33a5d1c717e29c5de4d4757778d430cbcd4ad9f26e47466a808a5333cb71a62c1ae989a5ba21c2bce6282fa3863112b1d8532a86286f56a5973  deviceinfo
+1370f768b23d17691ec66f235e7081735bd816d1f0ea390d5ffaf687ff01fcbc4368c46e715c0322f32acc8b11d79262281c5b9efa9f4117867855ccb41ba951  deviceinfo
 af036fe35011db078379dbb2e8c16c86546f0a4fcb3d1bcee3502bb1ea5b38f3ec5a9fa8cd1ca8ed8b89592a7f572d6072781289845303e0bf85fc2de4ead9fb  modules-load.conf
 "
@@ -14,6 +14,7 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
+deviceinfo_create_initfs_extra="true"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -0,0 +1,30 @@
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-samsung-i9105p
+pkgdesc="Samsung Galaxy S2 Plus"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	linux-samsung-i9105p
+	mkbootimg
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+61dcaf1daeb2ee96d8476e4fecbeb076bde2235fd58b9659e84d94509b8ff76ae5f2420bef521a07ad64ce53e6ee520caf207c1532c61207cb90191d19576bb1  deviceinfo
+"
@@ -0,0 +1,34 @@
+# 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 S2 Plus"
+deviceinfo_manufacturer="Samsung"
+deviceinfo_codename="samsung-i9105p"
+deviceinfo_year="2013"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+
+# Bootloader related
+deviceinfo_flash_method="heimdall-bootimg"
+deviceinfo_kernel_cmdline="console=ttyS0,115200n8 mem=832M@0xA2000000 androidboot.console=ttyS0 vc-cma-mem=0/176M@0xCB000000 buildvariant=userdebug"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_pagesize="4096"
+deviceinfo_header_version="0"
+deviceinfo_flash_offset_base="0xa2000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_heimdall_partition_kernel="KERNEL"
+deviceinfo_flash_heimdall_partition_rootfs="system"
+deviceinfo_flash_sparse="true"
+deviceinfo_create_initfs_extra="true"
+deviceinfo_partition_table="msdos"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-kylepro
 pkgdesc="Samsung Galaxy Trend Plus"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -27,5 +27,5 @@ nonfree_firmware() {
 }

 sha512sums="
-211694e966b6439373c1adcf43f48b2dc7563910541fd7369f07fb8a1828084ad9d949d3574f266d90bb9750679f8afb430dae6b525600126d4c6233ad6eee3f  deviceinfo
+c2b0b57031ef41d27e62866ad052fb0fed70c9719f93ed364d0b5ed6d36beb929ffdc6975aa49cd75d41c8b23a6b401856e1a2e1a581473dfa59840dafbf3506  deviceinfo
 "
@@ -15,6 +15,7 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
 deviceinfo_dev_touchscreen="/dev/input/event4"
+deviceinfo_create_initfs_extra="true"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-kylevess
 pkgdesc="Samsung Trend Lite"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -20,5 +20,5 @@ package() {
 }

 sha512sums="
-b2004367d71945f2fc7032a2a224d879a7f09a39aff9b4fc1032d92025a11733b533f903ebfb16b6bc226ea65c3b5540d186e2ff45e57dbbede68e9d11a1110b  deviceinfo
+70433acf0ea73e0876c4f168e3344d699b40118558d675a1b5c25b9995df7e4e1804d0e7c047e1db31c6adeea64ab6b11cac88366f3a69bbf85dc0aeb7bae1f7  deviceinfo
 "
@@ -15,6 +15,7 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
 deviceinfo_dev_touchscreen="/dev/input/event2"
+deviceinfo_create_initfs_extra="true"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-nevisp
 pkgdesc="Samsung Galaxy Fame GT-S6810P"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -28,6 +28,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 sha512sums="
-02eb7172cfb4fff71f400dfa8cbcdfcf1390efa6102c5cd9e4d35338e3c0fc572508351d6060df7e306d5eae514481ebe2ff538928b5ff4aa5f60ed6515bfb9e  deviceinfo
+e0d421d04fdc19b6ded5914bdab8afcb465314531d5817a98b562d44cf7811e55155192b541bc323443b4bb597a92b943a858e7f40b1c7177bbd04e10749c06f  deviceinfo
 0aa06f2147be0ce89fb1ae418abff809ffa8de677afce4e3b29926ccea66f776065d2bb95675a8692230e40e57ec2ce657d9b3f79be56f1db35f4a724a3484f9  modules-load.conf
 "
@@ -14,6 +14,7 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="320"
 deviceinfo_screen_height="480"
+deviceinfo_create_initfs_extra="true"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-zanin
 pkgdesc="Samsung Galaxy Chat"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -23,6 +23,6 @@ package() {


 sha512sums="
-a29dfdbf377a87a6ab24ac1b48bf06341ba3b6c0626980e889c00907ed06506bbfbfc274677396251b305109960c01dcaf1f7933919c863434783c2f9e7a3654  deviceinfo
+7bd44b5a297d009cd3f4ea8f4344e839a6a10b4b5cf7edc40cce46d49d2677508a6c158205e42afc8cfee975d03d4d2f725a0f90e04b7170243e91e0da6e95de  deviceinfo
 27a2263ce1dc96de8ac3a2ff6fc8d19c1ae591c883ff201637c5b8dfbbb07d807200853fa51de7d9ee1d0126ceb3a35a6787da53fd25389bbbb78c126eb049a3  initfs-hook.sh
 "
@@ -16,6 +16,7 @@ deviceinfo_screen_width="240"
 deviceinfo_screen_height="320"
 deviceinfo_dev_touchscreen="/dev/input/event7"
 deviceinfo_dev_touchscreen_calibration="1 0 0 0 1 0"
+deviceinfo_create_initfs_extra="true"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -0,0 +1,29 @@
+pkgname=firmware-bananapi-bpi-m2-zero
+pkgver=0
+pkgrel=0
+pkgdesc="Firmware for the Banana Pi M2 Zero"
+url="https://github.com/BPI-SINOVOIP/BPI_WiFi_Firmware"
+arch="armv7"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+builddir="$srcdir/"
+
+# Sources
+_commit="a4846b40bc92b6d12e83143353455b2e79bf385e"
+source="$pkgname-$pkgver.tar.gz::https://github.com/user0-07161/bananapi-m2-zero-wifi/archive/$_commit.tar.gz"
+
+package() {
+	_directories="ap6210 ap6212 brcm"
+	for _i in $_directories; do
+		_files=$(find bananapi-m2-zero-wifi-a4846b40bc92b6d12e83143353455b2e79bf385e/"$_i"/ -exec basename {} \;)
+		for _file in $_files; do
+			if [ "$_i" != "$file" ]; then
+				install -D -m644 bananapi-m2-zero-wifi-a4846b40bc92b6d12e83143353455b2e79bf385e/"$_i"/"$_file" "$pkgdir"/lib/firmware/"$_i"/"$_file" || true # true is needed to ignore errors when install tries to install the root directory.
+			fi
+		done
+	done
+}
+
+sha512sums="
+dca8fa72fca189e15f0e5f23c03fc2660074937a330bd5a43def3b3ab9df30308ae1906f80cc42547464076f4f137acd04ba1719a79871a032c8cf35a9796395  firmware-bananapi-bpi-m2-zero-0.tar.gz
+"
@@ -1,27 +0,0 @@
-pkgname=firmware-motorola-ali
-pkgver=1
-pkgrel=2
-pkgdesc="Firmware for Motorola Moto G6"
-url="https://github.com/julianbraha/firmware-motorola-ali"
-arch="aarch64"
-license="proprietary"
-_repository="firmware-blobs"
-_commit="153ba76124497fb7ce22d87a90149a15bcf67942"
-source="$pkgname-$_commit.tar.gz::https://github.com/moto-g6-mainlining/firmware-blobs/archive/$_commit.tar.gz"
-options="!strip !check !archcheck !spdx !tracedeps"
-builddir="$srcdir/$_repository-$_commit"
-
-_fwdir="/lib/firmware"
-
-package() {
-	# GPU Firmware files
-	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/qcom/msm8953/motorola/ali"
-	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/qcom/msm8953/motorola/ali"
-
-	# WLAN Firmware
-	install -Dm644 wlan/prima/WCNSS_qcom_wlan_nv.bin -t "$pkgdir/$_fwdir/postmarketos/wlan/prima"
-}
-
-sha512sums="
-269ac182806e9128557ac614142bfd6a2feab2cc3d2555268064df7ad1880de0d5e85b781a34ca57693d9c32ffe7d31da7fd34f9fd6364bc2b7cc2fdb90edc80  firmware-motorola-ali-153ba76124497fb7ce22d87a90149a15bcf67942.tar.gz
-"
@@ -1,39 +0,0 @@
-pkgname=firmware-motorola-ocean
-pkgver=5
-pkgrel=0
-pkgdesc="Firmware for Motorola Moto G7 Power"
-url="https://gitlab.com/Ultra-azu/firmware-motorola-ocean"
-arch="aarch64"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="787dcae00d0866079c6f55dc3ddf6592279b0661"
-source="
-	https://gitlab.com/Ultra-azu/firmware-motorola-ocean/-/archive/$_commit/firmware-motorola-ocean-$_commit.tar.gz
-	moto-modem-rfs-setup.initd
-	$pkgname-openrc.post-install
-"
-subpackages="$pkgname-openrc"
-
-builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
-_fwdir="/lib/firmware"
-
-package() {
-	install -Dm755 $srcdir/moto-modem-rfs-setup.initd "$pkgdir"/etc/init.d/moto-modem-rfs-setup
-
-	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/qcom/msm8953/motorola/ocean"
-	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/qcom/msm8953/motorola/ocean"
-
-	install -Dm644 wlan/prima/WCNSS_qcom_cfg.ini -t "$pkgdir/$_fwdir/postmarketos/wlan/prima"
-	install -Dm644 wlan/prima/WCNSS_qcom_wlan_nv.bin -t "$pkgdir/$_fwdir/postmarketos/wlan/prima"
-}
-
-openrc() {
-	install="$subpkgname.post-install"
-	default_openrc
-}
-
-sha512sums="
-fd0888bb6a0beeca961d9aabd0e60be64dfd841c3c89c7cdb8e7c1284347c4f56b2bad6a73aebc81e86625a4b548b5d2417ca31de6803ea5b3b58c7c1d97be51  firmware-motorola-ocean-787dcae00d0866079c6f55dc3ddf6592279b0661.tar.gz
-d4fd0f3406c9f004e9cae7bc500c5713aab75f102f8e3ea1af820865f01eb03def01cd9ed3e8a184c7dfc22ab419628fad17957a3782885d96eb36e94461e842  moto-modem-rfs-setup.initd
-784ac120a2231cfbee153fb8b2634af4ab5091eaa8fe207e66b47641d7531591ee3849e610bb66c7177822c86556f78d51c17ba8e4f3da2f946c4b8c5eaaf310  firmware-motorola-ocean-openrc.post-install
-"
@@ -1,2 +0,0 @@
-#!/bin/sh
-rc-update add moto-modem-rfs-setup boot
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-
-description="Setup modem firmware for tqftpserv"
-
-depend() {
-	before tqftpserv
-}
-
-start()
-{
-	MODEM_FIRMWARE_DIR="/lib/firmware/postmarketos/persist"
-	# The firmware present here is unique to each device
-	# Using the firmware of one device on another can will simply fail
-	# This is needed because motorola devices derive IMEI and other unique
-	# IDs from these files
-	# See also: https://forum.xda-developers.com/g5-plus/how-to/fix-persist-resolve-imei0-explanation-t3825147
-
-
-	if [ ! -d $MODEM_FIRMWARE_DIR ]; then
-		# Make a copy of the firmware if its not already made
-		# Use the copy instead of the original, because if due to some error
-		# somehow the firmware gets corrupted, the original firmware will
-		# still be available on the 'persist' partition
-
-		PERSIST_PATH="/tmp/persist"
-		PERSIST_DEV="/dev/disk/by-partlabel/persist"
-
-		mkdir -p $PERSIST_PATH
-		mount $PERSIST_DEV -o ro,noatime $PERSIST_PATH
-
-		mkdir $MODEM_FIRMWARE_DIR
-
-		cp -R "$PERSIST_PATH"/rfs/msm/mpss/ "$MODEM_FIRMWARE_DIR"/readwrite
-
-		umount $PERSIST_DEV
-		rmdir $PERSIST_PATH
-	fi
-
-	ln -s "$MODEM_FIRMWARE_DIR"/readwrite/ /tmp/tqftpserv
-}
@@ -1,39 +0,0 @@
-# Maintainer: Sireesh Kodali <scarface@disroot.org>
-pkgname=firmware-motorola-potter
-pkgver=2
-pkgrel=3
-pkgdesc="Firmware for Motorola Moto G5 Plus"
-url="https://github.com/scarface-one/firmware-motorola-potter"
-arch="aarch64"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps"
-_commit="cce83e64585c036facd4cef39f47bc23d18ba2e9"
-builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
-subpackages="$pkgname-openrc"
-_fwdir="/lib/firmware"
-
-source="
-	$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz
-	moto-modem-rfs-setup.openrc
-"
-
-package() {
-	# GPU Firmware files
-	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/qcom/msm8953/motorola/potter"
-	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/qcom/msm8953/motorola/potter"
-
-	# WLAN Firmware
-	install -Dm644 wlan/prima/WCNSS_qcom_wlan_nv.bin -t "$pkgdir/$_fwdir/postmarketos/wlan/prima"
-}
-
-openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-
-	install -Dm755 $srcdir/moto-modem-rfs-setup.openrc "$subpkgdir"/etc/init.d/moto-modem-rfs-setup
-}
-
-sha512sums="
-5a35ff1b567b672585f761eddbc772163f52b312c1e94410eff4b1d333852857a2f87769a45f47f7bcff373bdd5b062c3d16110e0211d85f83a7b4c6c78f6d3c  firmware-motorola-potter-cce83e64585c036facd4cef39f47bc23d18ba2e9.tar.gz
-d4fd0f3406c9f004e9cae7bc500c5713aab75f102f8e3ea1af820865f01eb03def01cd9ed3e8a184c7dfc22ab419628fad17957a3782885d96eb36e94461e842  moto-modem-rfs-setup.openrc
-"
@@ -1,2 +0,0 @@
-#!/bin/sh
-rc-update add moto-modem-rfs-setup boot
@@ -1 +0,0 @@
-./firmware-motorola-potter-openrc.post-install
@@ -1,18 +1,16 @@
 pkgname=firmware-samsung-a6lte
 pkgver=3
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware files for Samsung Galaxy A6 (2018)"
-url="https://github.com/fw-dumps/samsung_a6lte_dump"
 arch="aarch64"
+url="https://dumps.tadiphone.dev/dumps/samsung/a6lte"
 license="proprietary"
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 depends="linux-firmware-brcm"
 makedepends="zstd"

 # Source
-_commit="2ea1f7e1dfbe56d6ca085c9eb4061aca8909172c"
-builddir="$srcdir/samsung_a6lte_dump-$_commit"
-_raw_wifi_path="$url/raw/$_commit/vendor/etc/wifi"
+_raw_wifi_path="https://dumps.tadiphone.dev/dumps/samsung/a6lte/-/raw/a6ltejx-user-9-PPR1.180610.011-A600FJXS5BSL1-release-keys/vendor/etc/wifi"
 _install_wifi_path="/lib/firmware/postmarketos/wifi"
 source="
 	nvram.txt_c5::$_raw_wifi_path/nvram.txt_c5
@@ -0,0 +1,66 @@
+# Reference: <https://postmarketos.org/vendorkernel>
+# Kernel config based on: arch/arm/configs/sun8iw7p1smp_defconfig in downstream kernel for BPi M2 Zero
+
+pkgname=linux-bananapi-bpi-m2-zero
+pkgver=6.13.0_rc7
+pkgrel=0
+pkgdesc="Banana Pi BPI-M2 Zero mainline kernel fork"
+arch="armv7"
+_carch="arm"
+_flavor="bananapi-bpi-m2-zero"
+url="https://kernel.org"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps pmb:cross-native"
+makedepends="bash
+	bc
+	bison
+	devicepkg-dev
+	flex
+	openssl-dev
+	perl
+	gmp-dev
+	mpc1-dev
+	mpfr-dev
+	findutils
+	postmarketos-installkernel
+"
+
+# Source
+_commit="619f0b6fad524f08d493a98d55bac9ab8895e3a6"
+_config="config-$_flavor.$arch"
+_repository="linux"
+source="
+	$pkgname-$_commit.tar.gz::https://github.com/torvalds/$_repository/archive/$_commit.tar.gz
+	$_config
+"
+builddir="$srcdir/$_repository-$_commit"
+_outdir="out"
+
+prepare() {
+	default_prepare
+	cp -v "$srcdir/$_config" .config
+}
+
+build() {
+	unset LDFLAGS
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+}
+
+package() {
+	mkdir -p "$pkgdir"/boot
+	make zinstall modules_install dtbs_install \
+		ARCH="$_carch" \
+		INSTALL_MOD_STRIP=1 \
+		INSTALL_PATH="$pkgdir"/boot \
+		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb"
+
+	install -D "$builddir"/include/config/kernel.release \
+		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
+}
+
+sha512sums="
+6bf4bb3e7e6974ffb5eb21438d8ac7c651b6b4cf494133946650a95a0ca7ceac01820351e6583fc14b2aa66e6c4a4b6c2c9989d99ecff3731aef4f48a0bb2161  linux-bananapi-bpi-m2-zero-619f0b6fad524f08d493a98d55bac9ab8895e3a6.tar.gz
+eef1d6f4d1937a46307b6091d865d6607c5fb3876ad184bd61613860fe2ef88d215dfdd14946b1a4751c411a531190c78ed4c47a3fef096e3d4cef9b2c103e32  config-bananapi-bpi-m2-zero.armv7
+"
@@ -1,331 +0,0 @@
-diff --git a/drivers/input/misc/vl53L0/inc/stmvl53l0-cci.h b/drivers/input/misc/vl53L0/inc/stmvl53l0-cci.h
-new file mode 100644
-index 0000000..d8c3b77
--- /dev/null
-+++ b/drivers/input/misc/vl53L0/inc/stmvl53l0-cci.h
-@@ -0,0 +1,65 @@
-+/*
-+ *  stmvl53l0-cci.h - Linux kernel modules for STM VL53L0 FlightSense TOF sensor
-+ *
-+ *  Copyright (C) 2015 STMicroelectronics Imaging Division
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+/*
-+ * Defines
-+ */
-+#ifndef STMVL53L0_CCI_H
-+#define STMVL53L0_CCI_H
-+#include <linux/types.h>
-+
-+#include <soc/qcom/camera2.h>
-+#include "msm_camera_i2c.h"
-+#include "msm_camera_dt_util.h"
-+#include "msm_camera_io_util.h"
-+#include "msm_cci.h"
-+
-+#define	MSM_TOF_MAX_VREGS (10)
-+
-+struct msm_tof_vreg {
-+	struct camera_vreg_t *cam_vreg;
-+	void *data[MSM_TOF_MAX_VREGS];
-+	int num_vreg;
-+};
-+
-+struct cci_data {
-+	struct msm_camera_i2c_client g_client;
-+	struct msm_camera_i2c_client *client;
-+	struct platform_device *pdev;
-+	enum msm_camera_device_type_t device_type;
-+	enum cci_i2c_master_t cci_master;
-+	struct msm_tof_vreg vreg_cfg;
-+	struct msm_sd_subdev msm_sd;
-+	struct v4l2_subdev sdev;
-+	struct v4l2_subdev_ops *subdev_ops;
-+	char subdev_initialized;
-+	uint32_t subdev_id;
-+	uint8_t power_up;
-+	uint32_t lowv;
-+	uint32_t highv;
-+	uint32_t xtalk;
-+	struct msm_camera_gpio_conf gconf;
-+	struct msm_pinctrl_info pinctrl_info;
-+};
-+int stmvl53l0_init_cci(void);
-+void stmvl53l0_exit_cci(void *);
-+int stmvl53l0_power_down_cci(void *);
-+int stmvl53l0_power_up_cci(void *, unsigned int *);
-+
-+#endif /* STMVL53L0_CCI_H */
-diff --git a/drivers/input/misc/vl53L0/inc/stmvl53l0-i2c.h b/drivers/input/misc/vl53L0/inc/stmvl53l0-i2c.h
-new file mode 100644
-index 0000000..a75a9e5
--- /dev/null
-+++ b/drivers/input/misc/vl53L0/inc/stmvl53l0-i2c.h
-@@ -0,0 +1,47 @@
-+/*
-+ *  stmvl53l0-i2c.h - Linux kernel modules for STM VL53L0 FlightSense TOF sensor
-+ *
-+ *  Copyright (C) 2015 STMicroelectronics Imaging Division
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+/*
-+ * Defines
-+ */
-+#ifndef STMVL53L0_I2C_H
-+#define STMVL53L0_I2C_H
-+#include <linux/types.h>
-+#include <soc/qcom/camera2.h>
-+#include "msm_camera_i2c.h"
-+#include "msm_camera_dt_util.h"
-+#include "msm_camera_io_util.h"
-+#include "msm_cci.h"
-+
-+struct i2c_data {
-+	struct i2c_client *client;
-+	struct regulator *vana;
-+	uint8_t power_up;
-+	uint32_t lowv;
-+	uint32_t highv;
-+	uint32_t xtalk;
-+	struct msm_camera_gpio_conf gconf;
-+	struct msm_pinctrl_info pinctrl_info;
-+};
-+int stmvl53l0_init_i2c(void);
-+void stmvl53l0_exit_i2c(void *);
-+int stmvl53l0_power_up_i2c(void *, unsigned int *);
-+int stmvl53l0_power_down_i2c(void *);
-+
-+#endif /* STMVL53L0_I2C_H */
-diff --git a/drivers/input/misc/vl53L0/inc/stmvl53l0.h b/drivers/input/misc/vl53L0/inc/stmvl53l0.h
-new file mode 100644
-index 0000000..4ae84c9
--- /dev/null
-+++ b/drivers/input/misc/vl53L0/inc/stmvl53l0.h
-@@ -0,0 +1,201 @@
-+/*
-+ *  stmvl53l0.h - Linux kernel modules for STM VL53L0 FlightSense TOF sensor
-+ *
-+ *  Copyright (C) 2015 STMicroelectronics Imaging Division
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+/*
-+ * Defines
-+ */
-+#ifndef STMVL53L0_H
-+#define STMVL53L0_H
-+
-+#include <linux/types.h>
-+#include <linux/mutex.h>
-+#include <linux/workqueue.h>
-+#include <linux/miscdevice.h>
-+
-+#define STMVL53L0_DRV_NAME	"stmvl53l0"
-+#define STMVL53L0_SLAVE_ADDR	(0x52>>1)
-+
-+#define DRIVER_VERSION		"1.1.18"
-+#define DRIVER_VERSION_NUM		18
-+#define I2C_M_WR			0x00
-+/* #define INT_POLLING_DELAY	20 */
-+
-+/* if don't want to have output from vl6180_dbgmsg, comment out #DEBUG macro */
-+/*#define DEBUG*/
-+/* #define vl6180_dbgmsg(str, args...) pr_debug("%s: " str, __func__, ##args) */
-+#define vl53l0_dbgmsg_en(str, args...)	\
-+	pr_debug("%s: " str, __func__, ##args)
-+
-+#define vl53l0_dbgmsg(str, args...)  \
-+	pr_debug("%s: " str, __func__, ##args)
-+/* #define vl6180_errmsg(str, args...) pr_err("%s: " str, __func__, ##args) */
-+#define vl53l0_errmsg(str, args...) \
-+	printk(KERN_ERR "%s: " str, __func__, ##args)
-+
-+#define VL53L0_VDD_MIN      2850000
-+#define VL53L0_VDD_MAX      2850000
-+/*driver working mode*/
-+#define	OFF_MODE  0
-+#define	CAM_MODE  1
-+#define	SAR_MODE  2
-+#define	SUPER_MODE  3
-+#define	XTALKCAL_MODE  4
-+#define	OFFSETCAL_MODE  5
-+
-+/*user actions*/
-+#define	CAM_ON  0
-+#define	CAM_OFF 1
-+#define	SAR_ON  2
-+#define	SAR_OFF 3
-+#define	XTALKCAL_ON 4
-+#define	OFFSETCAL_ON 5
-+#define	CAL_OFF 6
-+#define RESET 7
-+/*parameter types*/
-+#define	OFFSET_PAR 0
-+#define	XTALKRATE_PAR 1
-+#define	XTALKENABLE_PAR 2
-+#define	SIGMAVAL_PRA 3
-+#define	SIGMACTL_PRA 4
-+#define	WRAPAROUNDCTL_PRA 5
-+#define	INTERMEASUREMENTPERIOD_PAR 6
-+#define	MEASUREMENTTIMINGBUDGET_PAR 7
-+#define	SGLVAL_PRA 8
-+#define	SGLCTL_PRA 9
-+#define CUTV_PRA 10
-+#define DRVV_PRA 11
-+#define PLLPRE_PRA 12
-+#define PLLFINAL_PRA 13
-+#define	CCI_BUS  0
-+#define	I2C_BUS  1
-+
-+
-+/*
-+ *  IOCTL register data structs
-+ */
-+struct stmvl53l0_register {
-+	uint32_t is_read; /*1: read 0: #define write*/
-+	uint32_t reg_index;
-+	uint32_t reg_bytes;
-+	uint32_t reg_data;
-+	int32_t status;
-+};
-+
-+/*
-+ *  IOCTL parameter structs
-+ */
-+struct stmvl53l0_parameter {
-+	uint32_t is_read; /*1: Get 0: Set*/
-+	uint32_t name;
-+	int32_t value;
-+	int32_t status;
-+};
-+
-+/*
-+ *  driver data structs
-+ */
-+struct stmvl53l0_data {
-+	/* embed ST VL53L0 Dev data as "dev_data" */
-+	VL53L0_DevData_t Data;
-+	/* i2c device address user specific field */
-+	uint8_t   I2cDevAddr;
-+	uint8_t   comms_type;
-+	uint16_t  comms_speed_khz;
-+
-+	struct cci_data cci_client_object;
-+	struct i2c_data i2c_client_object;
-+	void *client_object;
-+	struct mutex update_lock;
-+	struct delayed_work	dwork;		/* for PS  work handler */
-+	struct delayed_work     initwork;
-+	struct delayed_work     resetwork;
-+	struct delayed_work     checkwork;
-+	struct input_dev *input_dev_ps;
-+	struct kobject *range_kobj;
-+
-+	const char *dev_name;
-+
-+	/* misc device */
-+	struct miscdevice miscdev;
-+
-+	int irq;
-+	unsigned int reset;
-+
-+	/* control flag from HAL */
-+	unsigned int enable_ps_sensor;
-+
-+	/* PS parameters */
-+	unsigned int ps_is_singleshot;
-+	unsigned int ps_is_started;
-+	unsigned int ps_data;			/* to store PS data */
-+
-+	/* Range Data */
-+	VL53L0_RangingMeasurementData_t rangeData;
-+	int offset;
-+	int xtalk;
-+
-+	/* delay time in miniseconds*/
-+	unsigned int delay_ms;
-+
-+	struct mutex work_mutex;
-+	/* Debug */
-+	unsigned int enableDebug;
-+	uint8_t interrupt_received;
-+	int d_mode;
-+	uint8_t w_mode;
-+	/*for SAR mode indicate low range interrupt*/
-+	uint8_t lowint;
-+	uint8_t bus_type;
-+	uint32_t lowv;
-+	uint32_t highv;
-+	wait_queue_head_t range_data_wait;
-+	uint8_t d_ready;
-+	uint8_t cut_v;
-+	unsigned int xtalkCalDistance;
-+	unsigned int offsetCalDistance;
-+	unsigned int xtalkcalval;
-+	VL53L0_GpioFunctionality gpio_function;
-+	uint8_t c_suspend;
-+	uint8_t c_stopped;
-+	uint32_t refSpadCount;
-+	uint8_t isApertureSpads;
-+	uint8_t VhvSettings;
-+	uint8_t PhaseCal;
-+	uint8_t pll_p;
-+	uint8_t pll_f;
-+};
-+
-+/*
-+ *  funtion pointer structs
-+ */
-+struct stmvl53l0_module_fn_t {
-+	int (*init)(void);
-+	void (*deinit)(void *);
-+	int (*power_up)(void *, unsigned int *);
-+	int (*power_down)(void *);
-+};
-+
-+struct stmvl53l0_data *stmvl53l0_getobject(void);
-+int stmvl53l0_setup(struct stmvl53l0_data *data, uint8_t type);
-+int stmvl53l0_checkmoduleid(struct stmvl53l0_data *data,
-+	void *client, uint8_t type);
-+int stmvl53l0_livechecking(struct stmvl53l0_data *data);
-+void i2c_setclient(void *client, uint8_t type);
-+
-+#endif /* STMVL53L0_H */
@@ -1,58 +0,0 @@
-# Maintainer: Uclydde <julianbraha@gmail.com>
-# Reference: <https://postmarketos.org/vendorkernel>
-
-pkgname=linux-motorola-ali
-pkgver=3.18.140
-pkgrel=4
-pkgdesc="Motorola Moto G6 kernel fork"
-arch="armv7"
-_carch="arm"
-_flavor="motorola-ali"
-url="https://kernel.org"
-license="GPL-2.0-only"
-options="!strip !check !tracedeps pmb:cross-native"
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev openssl-dev"
-
-# Source
-_repository="kernel-msm"
-_commit="974646412f6e865f6847a7c6b72528f3a14bdb56"
-_config="config-$_flavor.$arch"
-source="
-	$pkgname-$_commit.tar.gz::https://github.com/Uclydde/$_repository/archive/$_commit.tar.gz
-	$_config
-	04_fix_stmvl53l0_headers.patch
-	fix_focaltech_recursive_dependency.patch
-	fix_mdp_ctrl_off.patch
-	fix_fb.patch
-	fix_fb_h.patch
-	fix_mdss_overlay.patch
-	gcc10-extern_YYLOC_global_declaration.patch
-"
-builddir="$srcdir/$_repository-$_commit"
-_outdir="out"
-
-prepare() {
-	default_prepare
-	REPLACE_GCCH=0
-	. downstreamkernel_prepare
-}
-
-build() {
-	unset LDFLAGS
-	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-}
-
-package() {
-	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
-}
-
-sha512sums="9ce6156aa8fd62ba1dff15413b526a870f45368d72774690f43229de82935acc52fcc58467e9bb72cca889ce03f6978ef1be454fd671c0fe845341c09d51d648  linux-motorola-ali-974646412f6e865f6847a7c6b72528f3a14bdb56.tar.gz
-af7ebc73c1d99a2fc6b47f6a9710f5016f59c997841148b99f19159b9f7628947176dca37c60a4d13df9329241cefad0dcec88f5620b66bb55bc2e496975012b  config-motorola-ali.armv7
-1a128e1483459144726458175314c58528e6b1f1a85e5f4230fa0461b0c3dd650037567f672c220a95618f9df023a82a35f010e8e8b784e349806516c1daaf7e  04_fix_stmvl53l0_headers.patch
-e2cf5b20831c05881780b7db1f40135ca7c8e0d2a4f7a8afa4eee16c7eae1711f2f02f72266309d52cb4437e9580ed58472e768c266f1283994ab1098861e9fc  fix_focaltech_recursive_dependency.patch
-3ccfaf591befba3b67d24134a516352173767cac0479d3011f077866e02a792f3581e50d05110375a8f84876213823d37d3791c4cb82f19f212bc4bee57934c8  fix_mdp_ctrl_off.patch
-cb7edd7bf9642400276ccb1ddf38cc4ed6fd934c0f0fbc43839903dfd9a3d433121d7624f53be309a10e1703024079d25b369016ccadc870dfd31d988dc22b77  fix_fb.patch
-3532faa75cbdbe034082420491abbf61c4a0a744b5d5c676ee9e1de971655dfac77129932baf78ad45ff0f01c3fa139253d1a3ff8461671536a9aebc5d16586a  fix_fb_h.patch
-eb183307dd0b79407c0b6c92cdc9898d2834a8309938e1af14708e94a375c1c68b5f63c0096bae7e29f28d9191dd73c33d0bbf0686fb722daa37bcabc92dea3f  fix_mdss_overlay.patch
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch"
@@ -1,76 +0,0 @@
-diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
-@@ -2130,7 +2130,7 @@
- 		if (is_panel_split(mfd) && pdata->next)
- 			mdss_fb_validate_split(pdata->panel_info.xres,
- 					pdata->next->panel_info.xres, mfd);
-		mdss_panelinfo_to_fb_var(panel_info, var);
-+		mdss_panelinfo_to_fb_var(mfd);
- 		if (mdss_fb_send_panel_event(mfd, MDSS_EVENT_CHECK_PARAMS,
- 							panel_info))
- 			pr_err("Failed to send panel event CHECK_PARAMS\n");
-@@ -2274,7 +2274,7 @@
- 		 * programmed in the controller.
- 		 * Update this info in the upstream structs.
- 		 */
-		mdss_panelinfo_to_fb_var(panel_info, var);
-+		mdss_panelinfo_to_fb_var(mfd);
-
- 		/* Start the work thread to signal idle time */
- 		if (mfd->idle_time)
-@@ -3018,7 +3018,7 @@
- 		return ret;
- 	}
-
-	mdss_panelinfo_to_fb_var(panel_info, var);
-+	mdss_panelinfo_to_fb_var(mfd);
-
- 	fix->type = panel_info->is_3d_panel;
- 	if (mfd->mdp.fb_stride)
-@@ -3729,7 +3729,7 @@
- 	}
- 	var->xres_virtual = var->xres;
- 	var->yres_virtual = pinfo->yres * mfd->fb_page;
-	mdss_panelinfo_to_fb_var(pinfo, var);
-+	mdss_panelinfo_to_fb_var(mfd);
- }
-
- int mdss_fb_atomic_commit(struct fb_info *info,
-@@ -3951,9 +3951,14 @@
- 		pinfo->mipi.dsi_pclk_rate = pinfo->clk_rate;
- }
-
-void mdss_panelinfo_to_fb_var(struct mdss_panel_info *pinfo,
-						struct fb_var_screeninfo *var)
-+void mdss_panelinfo_to_fb_var(struct msm_fb_data_type *mfd)
- {
-+	if (!mfd)
-+		return -EINVAL;
-+
-+	struct mdss_panel_info *pinfo = mfd->panel_info;
-+	struct fb_info *fbi = mfd->fbi;
-+	struct fb_var_screeninfo *var = &fbi->var;
- 	u32 frame_rate;
-
- 	var->xres = mdss_fb_get_panel_xres(pinfo);
-@@ -3989,7 +3994,14 @@
- 	if (pinfo->physical_height)
- 		var->height = pinfo->physical_height;
-
-	pr_debug("ScreenInfo: res=%dx%d [%d, %d] [%d, %d]\n",
-+	//Hack to update current fbi->mode according to fbi->var when var is updated from panel info
-+	if (fbi->mode) {
-+		printk("Updating mdss fb mode from fb var\n");
-+		fb_var_to_videomode(fbi->mode, var);
-+	}
-+
-+	printk("ScreenInfo: res=%dx%d [%d, %d] [%d, %d]\n",
-+
- 		var->xres, var->yres, var->left_margin,
- 		var->right_margin, var->upper_margin,
- 		var->lower_margin);
-@@ -5562,4 +5574,4 @@
- 		mfd->fps_info.last_sampled_time_us = current_time_us;
- 		mfd->fps_info.frame_count = 0;
- 	}
-}
-+}
				`@@ -0,0 +1 @@`
				`SUBSYSTEM=="vchiq", GROUP="video", MODE="0660"`
				`@@ -0,0 +1 @@`
				`modules=loop,squashfs,sd-mod,usb-storage quiet dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1`
				`@@ -1 +0,0 @@`
				`./firmware-motorola-potter-openrc.post-install`