device-oneplus-fajita: start hexagonrpcd on boot and configure accelerometer

hexagonrpcd is necessary to provide access to the filesystem for the SDSP. Also, OP6T accelerometer is mounted differently than the screen, adjust it with a mount matrix. This way, screen rotations follow the actual screen rotation by the user.
device-oneplus-enchilada: start hexagonrpcd on boot and configure accelerometer
2023-12-11 23:23:09 -08:00 · 2023-12-11 23:22:45 -08:00 · 2023-12-11 23:22:18 -08:00 · 2023-12-11 23:22:18 -08:00 · 2023-12-11 23:22:18 -08:00 · 2023-12-11 23:02:27 -08:00
244 changed files with 1489 additions and 31401 deletions
@@ -1,43 +0,0 @@
-#!/bin/sh -e
-# Description: verify CODEOWNERS file is sane
-# https://postmarketos.org/pmb-ci
-
-# TODO Future improvements:
-# * Check that all devices in main/community have someone in CODEOWNERS
-# * Check that GitLab user actually exists (e.g. deleted account, account with
-#   changed user name)
-
-if grep -q "  " CODEOWNERS; then
-	echo
-	echo "ERROR: Found space indentation in CODEOWNERS."
-	echo "ERROR: Please indent with tab characters."
-	grep "  " CODEOWNERS
-	echo
-	exit 1
-fi
-
-fail=0
-tmppipe=$(mktemp -u)
-mkfifo "$tmppipe"
-grep -v "^#" CODEOWNERS | cut -d'	' -f1  > "$tmppipe" &
-while IFS= read -r line; do
-	[ -z "$line" ] && continue
-
-	# Check if entry generally exists
-	# shellcheck disable=SC2086
-	ls $line >/dev/null 2>&1 || { fail=1; echo "Non-existing: $line"; }
-
-	# Check that directories end with a slash
-	# shellcheck disable=SC2086
-	if test -d "$(ls -d $line)"; then
-		echo "$line" | grep -q '/$' || { fail=1; echo "Missing trailing slash: $line"; }
-	fi
-done < "$tmppipe"
-rm "$tmppipe"
-
-if [ "$fail" = 1 ]; then
-	echo
-	echo "ERROR: Invalid CODEOWNERS entries, see above."
-	echo
-	exit 1
-fi
@@ -60,7 +60,6 @@ shellcheck-grep:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/shellcheck.sh
    - .ci/grep.sh
-    - .ci/codeowners.sh

 editor-config:
  stage: lint
@@ -22,7 +22,7 @@
 -->
 * [ ] edge (`master` branch)
 * [ ] `v23.12`
-* [ ] `v23.06` (supported until 2024-01-18)
+* [ ] `v23.06`

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

@@ -7,53 +7,82 @@ device/*/*-purism-librem5/			@craftyguy @bshah
 device/*/device-lg-judyln/			@Newbyte
 device/*/device-samsung-m0/			@Newbyte
 device/*/linux-postmarketos-exynos4/		@Newbyte
-device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
+device/*/linux-postmarketos-msm8939/		@Newbyte
 device/*/linux-postmarketos-stericsson/		@Newbyte
 device/*/*-qcom-sdm845/				@sdm845-mainline
-device/*/*-xiaomi-beryllium/			@joelselvaraj
+device/*/*-xiaomi-berrylium/ 			@joelselvaraj
 device/*/device-oneplus-enchilada/		@calebccff
 device/*/device-oneplus-fajita/			@calebccff
 device/*/firmware-oneplus-sdm845/		@calebccff
 device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
-device/*/*-lenovo-21bx/				@craftyguy
 device/*/*-lenovo-a6010/			@jenneron
 device/*/*-lenovo-a6000/			@jenneron
 device/*/device-microsoft-surface-rt/		@jenneron
+device/*/device-google-fennel/			@jenneron
+device/*/device-google-veyron-minnie/		@jenneron
+device/*/device-google-burnet/			@jenneron
+device/*/device-google-elm/			@jenneron
 device/*/device-google-nyan-big/		@jenneron
 device/*/device-google-peach-pi/		@jenneron
+device/*/device-google-veyron-speedy/		@jenneron
 device/*/linux-google-veyron/			@jenneron
+device/*/u-boot-peach-pi/			@jenneron
+device/*/device-google-cozmo/			@jenneron
+device/*/u-boot-veyron-speedy/			@jenneron
+device/*/device-google-juniper/			@jenneron @binarycraft
+device/*/u-boot-peach-pit/			@jenneron
+device/*/device-google-damu/			@jenneron
+device/*/u-boot-nyan-4gb/			@jenneron
+device/*/device-google-kenzo/			@jenneron
+device/*/device-google-kodama/			@jenneron
+device/*/u-boot-snow/				@jenneron
+device/*/device-google-kevin/			@jenneron
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
+device/*/device-google-krane/			@jenneron
 device/*/soc-mediatek-mt8183/			@jenneron
+device/*/u-boot-veyron-minnie/			@jenneron
+device/*/device-google-fennel14/		@jenneron
 device/*/linux-google-nyan/			@jenneron
+device/*/device-google-willow/			@jenneron
 device/*/linux-postmarketos-mediatek-mt8173/	@jenneron
 device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
 device/*/device-google-nyan-blaze/		@jenneron
 device/*/firmware-powervr-gx6250/		@jenneron
+device/*/device-google-hana/			@jenneron
 device/*/device-google-snow/			@jenneron
+device/*/device-google-kappa/			@jenneron
+device/*/u-boot-nyan-2gb/			@jenneron
+device/*/device-google-veyron-jerry/		@jenneron
+device/*/device-google-kakadu/			@jenneron
 device/*/firmware-google-veyron-brcm/		@jenneron
 device/*/device-google-peach-pit/		@jenneron
 device/*/device-lg-judyp/			@jenneron
+device/*/device-asus-tf201/			@clamor95
+device/*/device-asus-tf300t/			@clamor95
+device/*/device-asus-tf300tg/			@clamor95
+device/*/device-asus-tf700t/			@clamor95
+device/*/device-lg-p895/			@clamor95
+device/*/firmware-asus-transformer/		@clamor95 @jenneron
+device/*/firmware-lg-x3/			@clamor95
 device/*/linux-postmarketos-grate/		@clamor95 @jenneron
-device/*/device-samsung-chagallwifi/		@Grimler
-device/*/device-odroid-xu4/			@Grimler
-device/*/device-samsung-klimtlte/		@Grimler
-device/*/linux-samsung-klimtlte/		@Grimler
-device/*/firmware-odroid-xu4/			@Grimler
-device/*/linux-samsung-chagallwifi/		@Grimler
-device/*/device-huawei-plank/			@gtrxAC
-device/*/linux-huawei-plank/			@gtrxAC
-device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
-device/*/linux-samsung-coreprimevelte/		@legolivesmatter @balejk
+device/*/device-samsung-chagallwifi		@Grimler
+device/*/device-odroid-xu4			@Grimler
+device/*/device-samsung-klimtlte		@Grimler
+device/*/linux-samsung-klimtlte			@Grimler
+device/*/firmware-odroid-xu4			@Grimler
+device/*/linux-samsung-chagallwifi		@Grimler
+device/*/device-huawei-plank			@gtrxAC
+device/*/linux-huawei-plank			@gtrxAC

 main/postmarketos-update-depthcharge-kernel/	@jenneron
 main/osk-sdl/					@craftyguy
-main/postmarketos-ui-plasma-mobile/		@bshah
-main/ttyescape/					@calebccff
-device/*/u-boot-librem5/			@craftyguy @bshah
-device/*/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
-device/*/alsa-ucm-conf-google-gru/		@jenneron
-device/*/*-videostrong-kii-pro/			@vitali64yt
-device/*/*-amlogic-s905*/			@vitali64yt
-device/*/linux-postmarketos-amlogic/		@vitali64yt @exkc
+main/postmarketos-ui-plasma-mobile/ 		@bshah
+main/ttyescape					@calebccff
+temp/u-boot-librem5/				@craftyguy @bshah
+temp/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
+temp/alsa-ucm-conf-google-gru/			@jenneron
+device/*/*-videostrong-kii-pro/                 @vitali64yt
+device/*/*-amlogic-s905*                        @vitali64yt
+device/*/linux-postmarketos-amlogic/            @vitali64yt @exkc

 # vim: ts=8 sw=4 et
@@ -9,13 +9,13 @@ branch_aports=master
 mirrordir_alpine=edge

 [v23.12]
-description=Latest release / Recommended for best stability
+description=Upcoming stable release (DO NOT USE)
 branch_pmaports=v23.12
 branch_aports=3.19-stable
 mirrordir_alpine=v3.19

 [v23.06]
-description=Old release (supported until 2024-01-18)
+description=Latest release / Recommended for best stability
 branch_pmaports=v23.06
 branch_aports=3.18-stable
 mirrordir_alpine=v3.18
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=18
+pkgrel=15

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

 sha512sums="
-08f68b23bd880be12f95c5e1f071891f6b658fe7576f63d54e71d7390e4afc58de01813b2ea628f2b062830a89b0f69e8bd8a2b15fdb08bb9aba9e2a08971b0b  busybox-static-1.36.1-r18-aarch64-edge.apk
+699364194b6c321a515ef992bc9e3e2dc99ffffa377de1e4de3abd591062057e91457f7bf1b5391ba9746f2a5ad18ab84a06af7da8942cb29f7aee989e43bdb6  busybox-static-1.36.1-r15-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=18
+pkgrel=15

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

 sha512sums="
-20b11081b5d1f25298fd4d8dfde51062f5c65060f5b53840eaad6fb69b94d64c5f5e522c9286f9a56cef4a9c88bdf53dcd385f47451b1563faf2058f1ea928cb  busybox-static-1.36.1-r18-armhf-edge.apk
+9888649f0ac120a1f0bdb21fe73a5399db0259b20e17cf01c5430016b0b41bdef0b77ff31dd20a1d6399af5cc5f2eaeff56e0e9af91e84afb3498aeb74eef54e  busybox-static-1.36.1-r15-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=18
+pkgrel=15

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

 sha512sums="
-8f2fa87d979bdbe88eef0b9dece61001998df960e025902854b2af415b96d63ce9831dbe44d5c32b671c313efdfe9e22743a26de73febcc92d8d45d944ad66c0  busybox-static-1.36.1-r18-armv7-edge.apk
+a16da8a83ed45522025b1710e9a9c8f5aed1559de6798e6289990db345bbb5336660cb50cb2e2a479067c055a692c719bda2d14f1c32a8857457ad9c82acc7ef  busybox-static-1.36.1-r15-armv7-edge.apk
 "
@@ -2,8 +2,8 @@
 # Generator: pmbootstrap aportgen grub-efi-x86

 pkgname=grub-efi-x86
-pkgver=2.12
-pkgrel=0
+pkgver=2.06
+pkgrel=17

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

 sha512sums="
-2958746c0c05271d3bb27912973ddf9180bbf060f9909037f0b9dcf3da2036dd81b69a37e1c43414def0e26942f83bccab04554ae6ddd6b3b9dc94d5e3744ac4  grub-efi-2.12-r0-x86-edge.apk
+0de678af05ad5af685afbb77abe3f98a0e470546e61e576d29646b96e8eedcced59cf6fd391eb806d593ab59e2bb82aa536035dbf6edf9905475625b3f36305b  grub-efi-2.06-r17-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-aarch64
 pkgver=1.2.4_git20230717
-pkgrel=5
+pkgrel=4
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

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

 sha512sums="
-478704707b55072b9be8747e8c3bf3a20832d0329f63429fae2048e6b9a0674e31e92b4c1b8af87f65f84270711fef6b7ce54653448e580e532fa2c94e3761e1  musl-1.2.4_git20230717-r5-aarch64-edge.apk
-24471c9d781ce9920d06ab79296afb30ce61563729bb319ee8cd8feb960d1c05e5f96edb9464fcdb95b6c16fde788400408dd2e768e69ce13cc15ad3be54a969  musl-dev-1.2.4_git20230717-r5-aarch64-edge.apk
+dc2312748073a940f97cfa831395f417433abd761c7c4e770833ae887971ad0bfee449d3e3fafb4a7ebfa8e2fb61884a81c2e1c647e8c6df25fcdb026b4184d9  musl-1.2.4_git20230717-r4-aarch64-edge.apk
+60f429312d5a7780925f9f7a156cb049f9964bad1758cbdd91f7275bf73b22b9dfc39e1c38b9a8243b433f2a6777427deecf74a5f3f75fc3813559037455c2af  musl-dev-1.2.4_git20230717-r4-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armhf
 pkgver=1.2.4_git20230717
-pkgrel=5
+pkgrel=4
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

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

 sha512sums="
-c0bdfbfc2c1f475c17850e7462cf286e9d8ce874deb03d536d208fcdeb45b35c761737f693be3be9711c15547cd9d2bbafae45280fc9b0291192c2489da0790f  musl-1.2.4_git20230717-r5-armhf-edge.apk
-1197968b53adca7c482d23ea2ca99d21fe905b554b83c30b960a4e64dda6ff40009745cd18621bd363b4994ccbc8b9b763b6c3105f6f6283dc8ee1305ab7206e  musl-dev-1.2.4_git20230717-r5-armhf-edge.apk
+30a0cec66695dfbe8f0950e9c5766e9697bd1ad824965a6bac40449c283d179970c11728bf86269e37dac4d6b3fa716bb83d1b21e63cfc9b2b0c0109204b7394  musl-1.2.4_git20230717-r4-armhf-edge.apk
+5b7fe6f49da7453181bae945f22bf0119583bccaa2b43b9b7dd5a9a1fdc47a15e25b04972da47579305cd13503bd293a18213be0989fcd6f84c44bf97f9360ca  musl-dev-1.2.4_git20230717-r4-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armv7
 pkgver=1.2.4_git20230717
-pkgrel=5
+pkgrel=4
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

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

 sha512sums="
-5236dadbdb41e9543426592cf7e64e548fec59742e4943a99bb18e3cb93c9ae1287c9ac34c2de7fcb58bd1f94df4313324e8afa1160acc4929fb91f06754c77c  musl-1.2.4_git20230717-r5-armv7-edge.apk
-1877267544198d867752d02cb8cbe6672c4bd1fcd20ac8e5e4c614675b31921f3da9bc2a68f769fbd726ffc0c7125406387e01a9ebf49d0e56d49e1ce257e71d  musl-dev-1.2.4_git20230717-r5-armv7-edge.apk
+a4ac608257e996f08654ace0d19973aada8a7c70b3663aa80cdba10edfea58a388611731cd47f3010c0a43f578d0a3ecf910c59f9ab94b43159ab331f656cd4b  musl-1.2.4_git20230717-r4-armv7-edge.apk
+1a7ed9f5f78e99dd470bf6ea8b6d4a4aaffd80571d466747450f1ba40a97d852b5f366f891e74199ed75039f7fb890b379b21cdefef400bea892a58de8919f6f  musl-dev-1.2.4_git20230717-r4-armv7-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-riscv64
 pkgver=1.2.4_git20230717
-pkgrel=5
+pkgrel=4
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

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

 sha512sums="
-3f924270fb0ec0fa8fb5a23f0f9d6d9148affcac89cae413940dc04465d375415fcf0aff734754e2ac0b9ba2113c10f836b186908d75cdccec4d923eacafb961  musl-1.2.4_git20230717-r5-riscv64-edge.apk
-76ae321a9d3895f8367968226a6a492b268ae582a83e74d4152cf88dd48aaa79814532e8e1a057cba7c29b926f48d2309f2c12a16b991649cb8f713455aa5501  musl-dev-1.2.4_git20230717-r5-riscv64-edge.apk
+0129d1d2161b93ad893cd4dcacf470397a1bbf2814e505f3cc1e52ff678f1a832c0fc2370206f4c54e898bcbfbb064aec0cdbd76973add377062d9240821a365  musl-1.2.4_git20230717-r4-riscv64-edge.apk
+4988e46329557048dfa1459e3ee0fbf0b7d00f2328887989cb40e47a2de17db09d0266951b69186149948328e30d507ee2ed4ffdcb640215ae67fc4c8ff6c368  musl-dev-1.2.4_git20230717-r4-riscv64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86
 pkgver=1.2.4_git20230717
-pkgrel=5
+pkgrel=4
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"

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

 sha512sums="
-c93eec26b3bd7b2bc5c8859d71a9dfcfc3c0d346183d97b8600d57270585ce57ac9f84dd633b8d8ae4eae0324aa6f8e98c67a0bdd33e2e8994d721e208e07a3c  musl-1.2.4_git20230717-r5-x86-edge.apk
-77723100d0b2ae558816e4b9eb86c07d9ed64c69a84d6a07904d0806646e800a0f81b3a158948d5681394b9e3304a10bd0ca26445f5d4630f921bb87328d3afe  musl-dev-1.2.4_git20230717-r5-x86-edge.apk
+e99858a6fa752a3a8c4989055c9b7e05357bbe3664858fc1fb00fc7797b7819881481cc44d81c24c8dae63c6b3d6e2105e131f03703a8d2d24197fb79a4cf080  musl-1.2.4_git20230717-r4-x86-edge.apk
+fead00944a2fd00e54f1ebc141c0d955f1c0e5a0c4e59d4ce0ee27273db1b6884dca6e4812928b940847aaa9f1a8ae0c6f949b22283d5c0f990b2f96dfc881d1  musl-dev-1.2.4_git20230717-r4-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86_64
 pkgver=1.2.4_git20230717
-pkgrel=5
+pkgrel=4
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"

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

 sha512sums="
-4ea90456fcff08cb7c9065f4c790c5d0a3b2b17224f2490f6954c2de7ddb64559a6e1f0df1f13629da5d8f619fc1d9737a6982bb438120641bf1d717004e2688  musl-1.2.4_git20230717-r5-x86_64-edge.apk
-0ce4a260cb8c6fc9d412d5164d848ee6155d4ea4fca9dff89d5b08b8e2c0fcde5e635846ca762be54a6df139aa178902fc2594ffe76f94ae1e5414a67f0707a3  musl-dev-1.2.4_git20230717-r5-x86_64-edge.apk
+710ae61f73f2ec41d7d0e290e97755d3d06e7d3ba7fc97ede2305c9951977c65b7adc762d4cb2c1de7615650e466a505d3426625597626c4bcf7c5ff92b49fd7  musl-1.2.4_git20230717-r4-x86_64-edge.apk
+b4e21c8a9374bf926cce724ea9cb2f4aeebf58eee66518e24d45b082489a671e3eb26d1473bcf246997d5f286d745b147ce1be2cae4d5d3966b4327d809ed34e  musl-dev-1.2.4_git20230717-r4-x86_64-edge.apk
 "
@@ -0,0 +1,12 @@
+This patch is the supplementation of linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch.
+
+diff --git a/arch/arm/boot/compressed/piggy.xzkern.S b/arch/arm/boot/compressed/piggy.xzkern.S
+index d7e69cffbc0a..cfea81ae8f4b 100644
+--- a/arch/arm/boot/compressed/piggy.xzkern.S
+++ b/arch/arm/boot/compressed/piggy.xzkern.S
+@@ -1,4 +1,4 @@
+-	.section .piggydata,#alloc
+	.section .piggydata, "a"
+ 	.globl	input_data
+ input_data:
+ 	.incbin	"arch/arm/boot/compressed/piggy.xzkern"
@@ -1,4 +1,4 @@
-From 704dfdbbc7df036ed1d5d234dfc67d765804eb4d Mon Sep 17 00:00:00 2001
+From 3020e3a81b63e05891ef5d40f3acfbd00040ba17 Mon Sep 17 00:00:00 2001
 From: Nick Desaulniers <ndesaulniers@google.com>
 Date: Mon, 4 Nov 2019 19:31:45 +0100
 Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
@@ -26,13 +26,12 @@ Suggested-by: Peter Smith <peter.smith@linaro.org>
 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 [ partial backport to 3.4 ]
 ---
- arch/arm/boot/bootp/init.S              | 2 +-
- arch/arm/boot/compressed/big-endian.S   | 2 +-
- arch/arm/boot/compressed/head.S         | 2 +-
- arch/arm/boot/compressed/piggy.lzma.S   | 2 +-
- arch/arm/boot/compressed/piggy.xzkern.S | 2 +-
- arch/arm/mm/proc-v7.S                   | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
+ arch/arm/boot/bootp/init.S            | 2 +-
+ arch/arm/boot/compressed/big-endian.S | 2 +-
+ arch/arm/boot/compressed/head.S       | 2 +-
+ arch/arm/boot/compressed/piggy.lzma.S | 2 +-
+ arch/arm/mm/proc-v7.S                 | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)

 diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
 index 78b508075161..868eeeaaa46e 100644
@@ -83,16 +82,6 @@ index d7e69cffbc0a..cfea81ae8f4b 100644
 	.globl	input_data
 input_data:
 	.incbin	"arch/arm/boot/compressed/piggy.lzma"
-diff --git a/arch/arm/boot/compressed/piggy.xzkern.S b/arch/arm/boot/compressed/piggy.xzkern.S
-index 5703f300d027..a135d3b549c5 100644
--- a/arch/arm/boot/compressed/piggy.xzkern.S
-+++ b/arch/arm/boot/compressed/piggy.xzkern.S
-@@ -1,4 +1,4 @@
-	.section .piggydata,#alloc
-+	.section .piggydata, "a"
- 	.globl	input_data
- input_data:
- 	.incbin	"arch/arm/boot/compressed/piggy.xzkern"
 diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
 index 69363be2f241..321cb1c6a091 100644
 --- a/arch/arm/mm/proc-v7.S
@@ -107,5 +96,5 @@ index 69363be2f241..321cb1c6a091 100644
 	/*
 	 * Standard v7 proc info content
 -- 
-2.43.0
+2.30.2

@@ -1,101 +0,0 @@
-From 3020e3a81b63e05891ef5d40f3acfbd00040ba17 Mon Sep 17 00:00:00 2001
-From: Nick Desaulniers <ndesaulniers@google.com>
-Date: Mon, 4 Nov 2019 19:31:45 +0100
-Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
- directive
-
-It looks like a section directive was using "Solaris style" to declare
-the section flags. Replace this with the GNU style so that Clang's
-integrated assembler can assemble this directive.
-
-The modified instances were identified via:
-$ ag \.section | grep #
-
-Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119
-Link: https://github.com/ClangBuiltLinux/linux/issues/744
-Link: https://bugs.llvm.org/show_bug.cgi?id=43759
-Link: https://reviews.llvm.org/D69296
-
-Acked-by: Nicolas Pitre <nico@fluxnic.net>
-Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
-Reviewed-by: Stefan Agner <stefan@agner.ch>
-Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
-Suggested-by: Fangrui Song <maskray@google.com>
-Suggested-by: Jian Cai <jiancai@google.com>
-Suggested-by: Peter Smith <peter.smith@linaro.org>
-Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-[ partial backport to 5.4 ]
---
- arch/arm/boot/bootp/init.S            | 2 +-
- arch/arm/boot/compressed/big-endian.S | 2 +-
- arch/arm/boot/compressed/head.S       | 2 +-
- arch/arm/boot/compressed/piggy.lzma.S | 2 +-
- arch/arm/mm/proc-v7.S                 | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
-index 78b508075161..868eeeaaa46e 100644
--- a/arch/arm/boot/bootp/init.S
-+++ b/arch/arm/boot/bootp/init.S
-@@ -16,7 +16,7 @@
-  *  size immediately following the kernel, we could build this into
-  *  a binary blob, and concatenate the zImage using the cat command.
-  */
-		.section .start,#alloc,#execinstr
-+		.section .start, "ax"
- 		.type	_start, #function
- 		.globl	_start
- 
-diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
-index 25ab26f1c6f0..f22428e275f8 100644
--- a/arch/arm/boot/compressed/big-endian.S
-+++ b/arch/arm/boot/compressed/big-endian.S
-@@ -5,7 +5,7 @@
-  *  Author: Nicolas Pitre
-  */
- 
-	.section ".start", #alloc, #execinstr
-+	.section ".start", "ax"
- 
- 	mrc	p15, 0, r0, c1, c0, 0	@ read control reg
- 	orr	r0, r0, #(1 << 7)	@ enable big endian mode
-diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
-index 77a716bdf4d3..b70606652d21 100644
--- a/arch/arm/boot/compressed/head.S
-+++ b/arch/arm/boot/compressed/head.S
-@@ -113,7 +113,7 @@
- #endif
- 		.endm
- 
-		.section ".start", #alloc, #execinstr
-+		.section ".start", "ax"
- /*
-  * sort out different calling conventions
-  */
-diff --git a/arch/arm/boot/compressed/piggy.S b/arch/arm/boot/compressed/piggy.S
-index 0284f84dcf3804..27577644ee721a 100644
--- a/arch/arm/boot/compressed/piggy.S
-+++ b/arch/arm/boot/compressed/piggy.S
-@@ -1,5 +1,5 @@
- /* SPDX-License-Identifier: GPL-2.0 */
-	.section .piggydata,#alloc
-+	.section .piggydata, "a"
- 	.globl	input_data
- input_data:
- 	.incbin	"arch/arm/boot/compressed/piggy_data"
-diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
-index c4e8006a1a8cdd..48e0ef6f0dccfe 100644
--- a/arch/arm/mm/proc-v7.S
-+++ b/arch/arm/mm/proc-v7.S
-@@ -644,7 +644,7 @@ __v7_setup_stack:
- 	string	cpu_elf_name, "v7"
- 	.align
- 
-	.section ".proc.info.init", #alloc
-+	.section ".proc.info.init", "a"
- 
- 	/*
- 	 * Standard v7 proc info content
-- 
-2.30.2
-
@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@z3ntu.xyz>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=2
+pkgver=1.4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -65,5 +65,5 @@ nonfree_firmware() {
 sha512sums="
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
 e223df827d1d18507197d64fc409f527514f7f76b68f784811b7b59452260dbd72133c85277b1e7df38b0058e0f16ac0d1174104a193b7f6c8dcf64577863eba  deviceinfo
-52bb7ed829caa4dcff9728bd6e3cdf118b3c7ee7dfe90df0d4e6422dd67bf3258ae2a4d2dc7599da4182fbd8eb47a0e1d20c58198dc17f2bf178b8f01a8887f7  modules-initfs
+285dcb0011a2114e83621811a4204dfae4310ff9312f727d2cbf5d10712fe7fae7a20f636fc02b7794a41af67864a42d04f8c2f7e241f9f5182827d0a0556179  modules-initfs
 "
@@ -1,2 +1,2 @@
 msm
-panel-himax-hx83112a
+panel-hx83112a-auo
@@ -2,8 +2,8 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=10
-pkgrel=0
+pkgver=9.2.1
+pkgrel=1
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -39,7 +39,6 @@ source="
 	keymaps/rx51_ch.map
 	keymaps/rx51_fise.map
 	keymaps/rx51_it.map
-	keymaps/rx51_ptes.map
 	keymaps/rx51_us.map
 	lock.sh
 	modem-load.conf
@@ -60,12 +59,18 @@ options="!check !archcheck"
 build() {
 	devicepkg_build $startdir $pkgname
 	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n postmarketos -d "$srcdir"/uboot-script.cmd "$srcdir"/boot.scr
-	cd "$srcdir"
-	mkdir keymaps
-	for i in ../keymaps/*.map; do
-		loadkeys -b $i > keymaps/"${i%.*}.bmap"
-		gzip keymaps/"${i%.*}.bmap"
-	done
+	mkdir "$srcdir"/keymaps
+	loadkeys -b "$srcdir"/rx51_us.map > "$srcdir"/keymaps/rx51_us.bmap
+	gzip "$srcdir"/keymaps/rx51_us.bmap
+	loadkeys -b "$srcdir"/rx51_ch.map > "$srcdir"/keymaps/rx51_ch.bmap
+	gzip "$srcdir"/keymaps/rx51_ch.bmap
+	loadkeys -b "$srcdir"/rx51_it.map > "$srcdir"/keymaps/rx51_it.bmap
+	gzip "$srcdir"/keymaps/rx51_it.bmap
+	# Finnish and Swedish use the same mapping
+	loadkeys -b "$srcdir"/rx51_fise.map > "$srcdir"/keymaps/rx51_fi.bmap
+	gzip "$srcdir"/keymaps/rx51_fi.bmap
+	loadkeys -b "$srcdir"/rx51_fise.map > "$srcdir"/keymaps/rx51_se.bmap
+	gzip "$srcdir"/keymaps/rx51_se.bmap
 	return 0
 }

@@ -108,14 +113,10 @@ package() {
 		"$pkgdir"/usr/share/bkeymaps/ch/rx51_ch.bmap.gz
 	install -D -m644 "$srcdir"/keymaps/rx51_it.bmap.gz \
 		"$pkgdir"/usr/share/bkeymaps/it/rx51_it.bmap.gz
-	install -D -m644 "$srcdir"/keymaps/rx51_fise.bmap.gz \
+	install -D -m644 "$srcdir"/keymaps/rx51_fi.bmap.gz \
 		"$pkgdir"/usr/share/bkeymaps/fi/rx51_fi.bmap.gz
-	install -D -m644 "$srcdir"/keymaps/rx51_fise.bmap.gz \
+	install -D -m644 "$srcdir"/keymaps/rx51_se.bmap.gz \
 		"$pkgdir"/usr/share/bkeymaps/se/rx51_se.bmap.gz
-	install -D -m644 "$srcdir"/keymaps/rx51_ptes.bmap.gz \
-		"$pkgdir"/usr/share/bkeymaps/pt/rx51_pt.bmap.gz
-	install -D -m644 "$srcdir"/keymaps/rx51_ptes.bmap.gz \
-		"$pkgdir"/usr/share/bkeymaps/es/rx51_es.bmap.gz

 	# Kernel module management
 	install -D -m644 "$srcdir"/modem-load.conf \
@@ -205,7 +206,6 @@ d7f79fa0887110b85dfb676bd426fa76764fbbb8093df89184552838ddb703b62500f61d7cfa8dec
 dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058edc6f87cc2877da2ecafd2f627d9b465d4fd24475fc21fdc71  rx51_ch.map
 0a3e58a3a81c463937caf508a76461b4cc43f593f0817a52b6581fdd132cc894c0960fe7b950b6e6bfac1fad15cd9dd230c103fcf08a30b44ef7d8fbe31cea28  rx51_fise.map
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
-6e4e8b10a41d0957968736f5d780f14c7070b03913d80859cb07180e9cec9a36bbc9c639748765e48962772640974f5491627520cc36bd3d6c9d01748f9ddaff  rx51_ptes.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
 caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f  lock.sh
 157b27feebcfddf800a1ffd8c6e369d2b58e5db25b1a44b4443dada8d9fe74abb91d036b9f0e97769bbafbdc72020b5637313682c6932fe7b0bddb9ebebbad42  modem-load.conf
@@ -217,7 +217,7 @@ b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 d46adf47194c02b434cb46751003e67ee008d60978458e69b1f59dc709a7135a70f542918c29e359ba8308bdeda58a21e8efa446d06625511af05403db90e455  upower.conf
-c7837e6688f09c7d650ac7479b8881d4bad709480a71a1dea8b5bba4f4215d6b48a3aebd3f58923bbd48813559478d4ef137dcc9838d321722e141f0aa6a6085  x11-keymap
+737d9e57e219a0220c5b1943375f325309323344fdf06973546c7d88ed9aec857657abd6b7861669873574f865e1c99719d411e0564dbfebe028f9e77d308491  x11-keymap
 19694204f2f370a4132762ac1888eaf5736939bba2f12ec2bccd18dde0645cdb621dda3a0772d2ef6d26a65d14e39a628e0d23321fe3064777ad2b76ce45ed2d  xdefaults
 a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef29f636f99c8f8da8b992f746eab6424aac04260c16158bcc2  xorg.conf
 "
@@ -1,116 +0,0 @@
-keymaps 0-4
-#
-keycode 14 = Delete
-		shift		keycode 14 = Remove
-		altgr		keycode 14 = Escape
-		shift	altgr	keycode	14 = F12
-keycode 16 = q
-		altgr		keycode	16 = one
-		shift	altgr	keycode	16 = F1
-keycode 17 = w
-		altgr		keycode	17 = two
-		shift	altgr	keycode	17 = F2
-keycode 18 = e
-		altgr		keycode	18 = three
-		shift	altgr	keycode	18 = F3
-keycode 19 = r
-		altgr		keycode	19 = four
-		shift	altgr	keycode	19 = F4
-keycode 20 = t
-		altgr		keycode	20 = five
-		shift	altgr	keycode	20 = F5
-keycode 21 = y
-		altgr		keycode	21 = six
-		shift	altgr	keycode	21 = F6
-keycode 22 = u
-		altgr		keycode	22 = seven
-		shift	altgr	keycode	22 = F7
-keycode 23 = i
-		altgr		keycode	23 = eight
-		shift	altgr	keycode	23 = F8
-keycode 24 = o
-		altgr		keycode	24 = nine
-		shift	altgr	keycode	24 = F9
-keycode 25 = p
-		altgr		keycode	25 = zero
-		shift	altgr	keycode	25 = F10
-keycode 28 = Return
-		altgr		keycode 28 = Tab
-keycode 29 = Control
-		altgr		keycode	29 = Compose
-keycode 30 = a
-		altgr		keycode	30 = asterisk
-keycode 31 = s
-		altgr		keycode	31 = plus
-keycode 32 = d
-		altgr		keycode	32 = numbersign
-		shift	altgr	keycode	32 = percent
-keycode 33 = f
-		altgr		keycode	33 = minus
-		shift	altgr	keycode	33 = underscore
-keycode 34 = g
-		altgr		keycode	34 = exclamdown
-		shift	altgr	keycode	34 = bracketleft
-keycode 35 = h
-		altgr		keycode	35 = exclam
-		shift	altgr	keycode	35 = bracketright
-keycode 36 = j
-		altgr		keycode	36 = questiondown
-keycode 37 = k
-		altgr		keycode	37 = question
-keycode 38 = l
-		altgr		keycode	38 = diaeresis
-		shift	altgr	keycode	38 = bar
-keycode 42 = Shift
-keycode 44 = z
-		altgr		keycode	44 = parenleft
-keycode 45 = x
-		altgr		keycode	45 = parenright
-keycode 46 = c
-		altgr		keycode	46 = slash
-		shift	altgr	keycode 46 = backslash
-keycode 47 = v
-		altgr		keycode	47 = quotedbl
-		shift	altgr	keycode	47 = less
-keycode 48 = b
-		altgr		keycode	48 = apostrophe
-		shift	altgr	keycode	48 = greater
-keycode 49 = n
-		altgr		keycode	49 = colon
-		shift	altgr	keycode	49 = braceleft
-keycode 50 = m
-		altgr		keycode	50 = semicolon
-		shift	altgr	keycode	50 = braceright
-keycode 51 = dead_acute
-		altgr		keycode 51 = dead_grave
-		shift	altgr	keycode	51 = F11
-keycode 52 = ntilde
-		shift		keycode 52 = Ntilde
-		altgr		keycode	52 = tilde
-keycode 57 = space
-		shift		keycode	57 = Tab
-		altgr		keycode	57 = at
-keycode 65 = Meta_b
-		shift		keycode 65 = Meta_y
-		altgr		keycode 65 = Decr_Console
-keycode 66 = Meta_f
-		shift		keycode 66 = Meta_r
-		altgr		keycode 66 = Incr_Console
-keycode 100 = AltGr
-keycode 103 = ccedilla
-		altgr		keycode 103 = dead_circumflex
-		shift		keycode 103 = Ccedilla
-		shift	altgr	keycode 103 = Scroll_Backward
-keycode 105 = period
-		altgr		keycode	105 = comma
-		shift	altgr	keycode	105 = degree
-keycode 106 = Right
-		shift		keycode 106 = End
-		altgr		keycode	106 = Down
-		shift	altgr	keycode	106 = Scroll_Forward
-keycode 108 = Left
-		shift		keycode 108 = Home
-		altgr		keycode 108 = Up
-		shift	altgr	keycode 108 = Scroll_Backward
-compose '(' '(' to '['
-compose ')' ')' to ']'
@@ -126,7 +126,6 @@ xkb_symbols "ptes" {
    key <AB08>	{ [	dead_acute,	dead_acute,	dead_grave,	dead_grave	] };

    // 2. row
-    key <AC04>	{ [	f,		F,		minus,		underscore	] };
    key <AC05>	{ [	g,		G,		exclamdown,	exclamdown	] };
    key <AC06>	{ [	h,		H,		exclam,		exclam		] };
    key <AC07>	{ [	j,		J,		questiondown,	questiondown	] };
@@ -138,7 +137,7 @@ xkb_symbols "ptes" {
    // 3. row
    key <AB01>	{ [	z,		Z,		parenleft,	parenleft	] };
    key <AB02>	{ [	x,		X,		parenright,	parenright 	] };
-    key <AB03>	{ [	c,		C,		slash,		backslash	] };
+    key <AB03>	{ [	c,		C,		slash,		slash		] };
    key <AB04>	{ [	v,		V,		quotedbl,	quotedbl	] };
    key <AB05>	{ [	b,		B,		apostrophe,	apostrophe	] };
    key <AB06>	{ [	n,		N,		colon,		colon		] };
@@ -1,3 +1,3 @@
 # iio-sensor-proxy with libssc: accelerometer mount matrix

-SUBSYSTEM=="misc", KERNEL=="fastrpc-*", ENV{ACCEL_MOUNT_MATRIX}+="-1, 0, 0; 0, 1, 0; 0, 0, -1"
+SUBSYSTEM=="misc", KERNEL=="fastrpc-*", ENV{ACCEL_MOUNT_MATRIX}+="-1, 0, 0; 0, -1, 0; 0, 0, -1"
@@ -3,7 +3,7 @@

 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=13
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -68,5 +68,5 @@ e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac424
 07e3d79715befccd1e7393908c06f88ac8468d1ce6cb96138e3a04e6f8274889db169f5daf05b04b633bcc9e85d11ea5c2017b84bc0ae86a8fad80b05794d0d8  deviceinfo
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
-f4961015c920c50182d35767de080f16ec348ff693a8cca91dd2593640cf19c31c1e6eac1e8a12a1d38946755eb21bdacad29c9e972adaec854500ab3a7ad3a0  81-libssc-oneplus-fajita.rules
+2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-oneplus-fajita.rules
 "
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-markw
 pkgdesc="Xiaomi Redmi 4 Prime"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -16,7 +16,7 @@ depends="
 	soc-qcom-msm8953
 "
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs modprobe.d_touchscreens-workaround.conf"
+source="deviceinfo modules-initfs"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

 build() {
@@ -24,7 +24,6 @@ build() {
 }

 package() {
-	install -D -m644 "$srcdir"/modprobe.d_touchscreens-workaround.conf "$pkgdir"/etc/modprobe.d/touchscreens-workaround.conf
 	devicepkg_package $startdir $pkgname
 }

@@ -41,6 +40,5 @@ nonfree_firmware() {

 sha512sums="
 0d393f07e551058781a67c096b1ad7f252c78e801a2da8752f893f4ea7c24f7aa65bc69f9c80c7be53e615269a7028eb151e7bc3fe79f0c260a4d28e97f10e7d  deviceinfo
-00f2a07de0aaedd3f3fee4aed6e1f591539cb56aa109c49d5b0a5de11c7f8c5d0a3cef8111b855d064bfe38901f3bbcddd9cf2c65ae811578d43319137f586ac  modules-initfs
-b6d005ac8be56b6eca402869fcf33f671f02000fb927af36ae9a860817c92a17329323408e94f4593d63e9f6a95881e270bc9dcd930ad4cf8312e1ac85ab4a20  modprobe.d_touchscreens-workaround.conf
+0cba88d7ede62dc7c47feefb27d10e58e4c93498bec97cd274a1d10c4f16dff06c5472ed555170e0392a57c9269cc50bf550523f41bf1ba6c600af533302574b  modules-initfs
 "
@@ -1 +0,0 @@
-softdep atmel_mxt_ts pre: edt_ft5x06
@@ -1,3 +1,5 @@
+atmel_mxt_ts
+edt_ft5x06
 msm
 panel_mdss_nt35596_ebbg
 panel_mdss_r63350
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-xiaomi-wt88047
 pkgdesc="Xiaomi Redmi 2"
-pkgver=8
-pkgrel=0
+pkgver=7
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,6 +38,6 @@ nonfree_firmware() {
 }

 sha512sums="
-cbee0ac591aafc31b8b581df61f41ea968339d318a9eb472afecaa1630bc42763efa4bd29b97dcfec58471298f99c70adcc8cf79b6074db8739b91ad99cd093d  deviceinfo
+7016d6fcfd10435e0212389a4da2d6c479fa0ffa58bf9ce22a5d6acf839c626f6cc207fda1953cbcb85645b72cb08607d9ee6576b8a76e80926e59b5c9bac212  deviceinfo
 7f6892125a15fdfcfca140571073150df25a5c355eae8ae632a56a00cd9e5fc7168d435680ca83eb8a8d9ae63aef6af478f42e92815f175d26ec592941de61e6  modules-initfs
 "
@@ -30,8 +30,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
-
-# Xiaomi Inc.
-deviceinfo_usb_idVendor="0x2717"
-# Mi/Redmi series (MTP)
-deviceinfo_usb_idProduct="0xFF40"
@@ -1,6 +1,6 @@
 pkgname=firmware-fairphone-fp4
-pkgver=20231122
-pkgrel=0
+pkgver=20230215
+pkgrel=2
 pkgdesc="Firmware for Fairphone 4"
 subpackages="
 	$pkgname-adreno
@@ -15,18 +15,11 @@ subpackages="
 url="https://github.com/FairBlobs/FP4-firmware"
 arch="aarch64"
 license="proprietary"
-makedepends="pil-squasher"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="9bcb18012b18756e5f7adc4fcd41396e7f28199b"
+_commit="7b95dc9cabee71fd2444cf1c99216bbc0421c111"
 source="https://github.com/FairBlobs/FP4-firmware/archive/$_commit/FP4-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP4-firmware-$_commit"

-build() {
-	for i in *.mdt; do
-		pil-squasher "$(basename "$i" .mdt)".mbn "$i"
-	done
-}
-
 package() {
 	# parent package is empty
 	mkdir -p "$pkgdir"
@@ -35,21 +28,14 @@ package() {
 adreno() {
 	pkgdesc="Fairphone 4 adreno firmware"

-	install -Dm644 "$builddir"/a619_gmu.bin -t \
+	install -Dm644 "$builddir"/a615_zap* "$builddir"/a619_gmu.bin -t \
 		"$subpkgdir/lib/firmware/qcom/"
-	install -Dm644 "$builddir"/a615_zap.mbn -t \
-		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s a615_zap.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/a615_zap.mdt"
-	ln -s sm7225/fairphone4/a615_zap.mbn "$subpkgdir/lib/firmware/qcom/a615_zap.mdt"
 }

 adsp() {
 	pkgdesc="Fairphone 4 adsp firmware"

-	install -Dm644 "$builddir"/adsp.mbn -t \
-		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s adsp.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/adsp.mdt"
-	install -Dm644 "$builddir"/adsp*.jsn -t \
+	install -Dm644 "$builddir"/adsp* -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
 }

@@ -65,10 +51,7 @@ bluetooth() {
 cdsp() {
 	pkgdesc="Fairphone 4 cdsp firmware"

-	install -Dm644 "$builddir"/cdsp.mbn -t \
-		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s cdsp.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/cdsp.mdt"
-	install -Dm644 "$builddir"/cdsp*.jsn -t \
+	install -Dm644 "$builddir"/cdsp* -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
 }

@@ -76,21 +59,18 @@ ipa() {
 	pkgdesc="Fairphone 4 ipa firmware"

 	cd "$builddir"
-	install -Dm644 "$builddir"/lagoon_ipa_fws.mbn \
-		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/ipa_fws.mbn"
-	ln -s ipa_fws.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/ipa_fws.mdt"
+	for i in lagoon_ipa_fws.*; do
+		install -Dm644 $i \
+			"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/${i/lagoon_/}"
+	done
 }

 modem() {
 	pkgdesc="Fairphone 4 modem firmware"

-	install -Dm644 "$builddir"/modem.mbn -t \
-		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s modem.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/modem.mdt"
-	install -Dm644 "$builddir"/modem*.jsn -t \
-		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-
-	cp -r "$builddir"/modem_pr/ \
+	# cp because of the modem_pr directory
+	mkdir -p "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
+	cp -r "$builddir"/modem* \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
 	find "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/" \
 		-type f -exec chmod 0644 {} \;
@@ -99,7 +79,7 @@ modem() {
 venus() {
 	pkgdesc="Fairphone 4 venus firmware"

-	install -Dm644 "$builddir"/venus.mbn -t \
+	install -Dm644 "$builddir"/venus.* -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
 }

@@ -111,5 +91,5 @@ wlan() {
 }

 sha512sums="
-c579b1893a61e09f532e0858ddb90b83e663bf1489707ba8b0e524771504db73764233c2dfe3a4b97b40eab4ef88d50adbea33ab25c28c289d1890d7b0addd70  FP4-firmware-9bcb18012b18756e5f7adc4fcd41396e7f28199b.tar.gz
+5e64b2146250227ab70d605c586c516c2337d5a1f23db539603ac6709be6683cb09677caf7ee4880e9cc5ec9f3b5f6cc0b2e88184b1ebe859d0166353a3d1ae3  FP4-firmware-7b95dc9cabee71fd2444cf1c99216bbc0421c111.tar.gz
 "
@@ -1,29 +0,0 @@
-# Maintainer: Svyatoslav Ryhel <clamor95@gmail.com>
-# Co-Maintainer: Ion Agorria
-# Co-Maintainer: Anton Bambura <jenneron@protonmail.com>
-# Co-Maintainer: Maxim Schwalm <maxim.schwalm@gmail.com>
-
-pkgname=firmware-nvidia-tegra-armv7
-pkgver=3
-pkgrel=0
-pkgdesc="Firmware files for Tegra devices supported by GRATE project"
-url="https://gitlab.com/grate-driver/firmware"
-arch="armv7"
-license="proprietary"
-makedepends="coreutils"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-
-# source
-_commit="b1a06c42ff16a814a3c8044143151f3df48a7df2"
-_repo="firmware"
-source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$_repo-$_commit.tar.gz"
-
-builddir="$srcdir/$_repo-$_commit"
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="
-e20b40a290faf54ddfe9502f91cc6108b79a19a322696c7460e6b455319bcfe4583933fa43a5e5e82e968562666404e40d6ca5a6bd401e09d0fdcc30707e6786  firmware-nvidia-tegra-armv7-b1a06c42ff16a814a3c8044143151f3df48a7df2.tar.gz
-"
@@ -1,6 +1,6 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 pkgname=gps-nokia-n900
-pkgver=0.3.2
+pkgver=0.3.1
 pkgrel=0
 pkgdesc="GPS support for Nokia N900"
 url="https://github.com/maemo-leste/gps-nokia-n900"
@@ -19,5 +19,5 @@ package() {
 }

 sha512sums="
-46eaea4c96be2d0ce4bd4aac5bdcec18ef4e4f7a65fa41354ffb259f90725157f6b3c7ac606c0a311c2d181f1b14f857f33284c8de5874cd1e5ace4a566c839d  gps-nokia-n900-0.3.2.tar.gz
+02e16cfd37f675298df9c340f5f8f6408d919744d22490336609cb101896c7b3bfe255f33601c12b4267588540fc42f9d14ff1a83eca1b50a5814a9173627006  gps-nokia-n900-0.3.1.tar.gz
 "
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.7
-pkgrel=1
+pkgver=6.6.2
+pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -67,8 +67,8 @@ package() {
 }

 sha512sums="
-de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad  linux-6.7.tar.xz
-9f4492cac39c33d0e247da43f9d8f711994b1d1daeb928ef778f0921a69f104f129b5d9f21bd7e8b16362e5520bb12c1aca0c4408536a572ac036015081216f5  config-postmarketos-mediatek-mt8173.aarch64
+8c4b1213912190a17c8f54f92dd4eb38e7641b637c9a0b440f2bcd6988d1e22aa2f7d06c4c942d851cc918143e0fc56cfe9821938d7a1c96030595da4d88b487  linux-6.6.2.tar.xz
+fed803fabde5416cb44c893d044f6e2498a882c1ff8265e51cf0e92cdbf0cc6a72bcbc8360c8b6bef45618f171263ef502565594cee3783fc097dc9646105ed3  config-postmarketos-mediatek-mt8173.aarch64
 4b499c1fbf53631cffd6fa7299643dc744e0e2187f71804664b02f05296162b42e3f76aa0d8c688cecb43a8bcd41ec92991c98287951292260237b828dcca710  fix-mmc1-speed.patch
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 caf48ac0f77661153ee94c7de4931baca135a69a97e93f01ad8f276b4a9944e077d7214c117450943cca07990c773661f79718cb0c2ff7c5789c93d37afb26de  fix-spi-nor-max-frequency.patch
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.7.0 Kernel Configuration
+# Linux/arm64 6.6.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
@@ -321,7 +321,6 @@ CONFIG_ARCH_MEDIATEK=y
 # CONFIG_ARCH_NXP is not set
 # CONFIG_ARCH_MA35 is not set
 # CONFIG_ARCH_NPCM is not set
-# CONFIG_ARCH_PENSANDO is not set
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
@@ -434,7 +433,6 @@ CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y
 CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y
 CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y
 CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
-CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y
 CONFIG_TRANS_TABLE=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN=y
@@ -907,7 +905,6 @@ CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_ARCH_ENABLE_THP_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
-CONFIG_PCP_BATCH_SCALE_MAX=5
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
@@ -947,7 +944,6 @@ CONFIG_SECRETMEM=y
 # CONFIG_USERFAULTFD is not set
 CONFIG_LRU_GEN=y
 CONFIG_LRU_GEN_ENABLED=y
-# CONFIG_LRU_GEN_STATS is not set
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
@@ -1578,6 +1574,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
@@ -1789,6 +1786,7 @@ CONFIG_GENERIC_ARCH_NUMA=y
 #
 # Bus devices
 #
+# CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_MOXTET is not set
 # CONFIG_VEXPRESS_CONFIG is not set
 CONFIG_MHI_BUS=m
@@ -1822,7 +1820,6 @@ CONFIG_ARM_SCMI_TRANSPORT_SMC=y
 # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
 CONFIG_ARM_SCMI_POWER_DOMAIN=y
-CONFIG_ARM_SCMI_PERF_DOMAIN=y
 # CONFIG_ARM_SCMI_POWER_CONTROL is not set
 # end of ARM System Control and Management Interface Protocol

@@ -1863,12 +1860,6 @@ CONFIG_EFI_EARLYCON=y

 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
-
-#
-# Qualcomm firmware drivers
-#
-# end of Qualcomm firmware drivers
-
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
 CONFIG_ARM_SMCCC_SOC_ID=y
@@ -1891,6 +1882,7 @@ CONFIG_MTD=y
 #
 # Partition parsers
 #
+# CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
@@ -2085,7 +2077,7 @@ CONFIG_BLK_DEV_NVME=m
 # CONFIG_NVME_HWMON is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TCP is not set
-# CONFIG_NVME_HOST_AUTH is not set
+# CONFIG_NVME_AUTH is not set
 # CONFIG_NVME_TARGET is not set
 # end of NVME Support

@@ -2123,6 +2115,7 @@ CONFIG_PCI_ENDPOINT_TEST=m
 #
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_AT25=m
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
@@ -2424,7 +2417,6 @@ CONFIG_TAP=m
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=y
 # CONFIG_NLMON is not set
-# CONFIG_NETKIT is not set
 # CONFIG_NET_VRF is not set
 # CONFIG_MHI_NET is not set
 # CONFIG_ARCNET is not set
@@ -2522,7 +2514,6 @@ CONFIG_IGBVF=y
 # CONFIG_ICE is not set
 # CONFIG_FM10K is not set
 # CONFIG_IGC is not set
-# CONFIG_IDPF is not set
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_ADI=y
 # CONFIG_ADIN1110 is not set
@@ -2867,8 +2858,6 @@ CONFIG_MT7663U=m
 # CONFIG_MT7921S is not set
 # CONFIG_MT7921U is not set
 # CONFIG_MT7996E is not set
-# CONFIG_MT7925E is not set
-# CONFIG_MT7925U is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
@@ -2890,7 +2879,7 @@ CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192EE is not set
 # CONFIG_RTL8821AE is not set
 # CONFIG_RTL8192CU is not set
-CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU is not set
 # CONFIG_RTW88 is not set
 # CONFIG_RTW89 is not set
 CONFIG_WLAN_VENDOR_RSI=y
@@ -3614,6 +3603,7 @@ CONFIG_GPIO_MAX77620=y

 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_BRCMSTB is not set
 # CONFIG_POWER_RESET_GPIO is not set
 # CONFIG_POWER_RESET_GPIO_RESTART is not set
 # CONFIG_POWER_RESET_LTC2952 is not set
@@ -3677,7 +3667,6 @@ CONFIG_CHARGER_CROS_PCHG=y
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set
-# CONFIG_FUEL_GAUGE_MM8013 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set

@@ -3729,14 +3718,12 @@ CONFIG_SENSORS_GPIO_FAN=m
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_IT87 is not set
 CONFIG_SENSORS_JC42=m
-# CONFIG_SENSORS_POWERZ is not set
 # CONFIG_SENSORS_POWR1220 is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LTC2945 is not set
 # CONFIG_SENSORS_LTC2947_I2C is not set
 # CONFIG_SENSORS_LTC2947_SPI is not set
 # CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC2991 is not set
 # CONFIG_SENSORS_LTC2992 is not set
 # CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
@@ -4090,7 +4077,6 @@ CONFIG_REGULATOR_HI6421V530=y
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX77503 is not set
 CONFIG_REGULATOR_MAX77620=y
 # CONFIG_REGULATOR_MAX77857 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
@@ -4375,10 +4361,6 @@ CONFIG_VIDEO_MEDIATEK_VPU=m
 # Microchip Technology, Inc. media platform drivers
 #

-#
-# Nuvoton media platform drivers
-#
-
 #
 # NVidia media platform drivers
 #
@@ -4471,7 +4453,6 @@ CONFIG_VIDEO_IMX219=m
 # CONFIG_VIDEO_IMX415 is not set
 # CONFIG_VIDEO_MT9M001 is not set
 # CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9M114 is not set
 # CONFIG_VIDEO_MT9P031 is not set
 # CONFIG_VIDEO_MT9T112 is not set
 # CONFIG_VIDEO_MT9V011 is not set
@@ -4711,12 +4692,10 @@ CONFIG_DRM_PANEL_EDP=y
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=y
 # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
-# CONFIG_DRM_PANEL_JDI_LPM102A188A is not set
 # CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=y
@@ -4744,7 +4723,6 @@ CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
-# CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
@@ -4918,7 +4896,6 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
-CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
@@ -5183,8 +5160,6 @@ 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_AW87390 is not set
-# CONFIG_SND_SOC_AW88399 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 CONFIG_SND_SOC_BT_SCO=m
 # CONFIG_SND_SOC_CHV3_CODEC is not set
@@ -5291,7 +5266,6 @@ CONFIG_SND_SOC_RT5677_SPI=m
 # CONFIG_SND_SOC_RT715_SDW is not set
 # CONFIG_SND_SOC_RT715_SDCA_SDW is not set
 # CONFIG_SND_SOC_RT9120 is not set
-# CONFIG_SND_SOC_RTQ9128 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SIMPLE_MUX=m
@@ -5563,7 +5537,6 @@ CONFIG_USB_ULPI_BUS=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
 CONFIG_USB_PCI=y
-# CONFIG_USB_PCI_AMD is not set
 # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

 #
@@ -5701,7 +5674,6 @@ CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_CHIPIDEA_PCI=y
 CONFIG_USB_CHIPIDEA_MSM=y
-CONFIG_USB_CHIPIDEA_NPCM=y
 CONFIG_USB_CHIPIDEA_IMX=y
 CONFIG_USB_CHIPIDEA_GENERIC=y
 CONFIG_USB_CHIPIDEA_TEGRA=y
@@ -5917,7 +5889,6 @@ CONFIG_TYPEC_HD3SS3220=m
 # CONFIG_TYPEC_MUX_GPIO_SBU is not set
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
 # CONFIG_TYPEC_MUX_NB7VPQ904M is not set
-# CONFIG_TYPEC_MUX_PTN36502 is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support

 #
@@ -6044,7 +6015,6 @@ CONFIG_LEDS_SYSCON=y
 # RGB LED drivers
 #
 # CONFIG_LEDS_GROUP_MULTICOLOR is not set
-# CONFIG_LEDS_KTD202X is not set
 # CONFIG_LEDS_PWM_MULTICOLOR is not set
 CONFIG_LEDS_QCOM_LPG=m

@@ -6060,7 +6030,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 CONFIG_LEDS_TRIGGER_CPU=y
 # CONFIG_LEDS_TRIGGER_ACTIVITY is not set
-# CONFIG_LEDS_TRIGGER_GPIO is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

 #
@@ -6338,6 +6307,7 @@ CONFIG_XEN_AUTO_XLATE=y
 # CONFIG_COMEDI is not set
 CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
+CONFIG_RTL8192U=m
 # CONFIG_RTLLIB is not set
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
@@ -6380,6 +6350,12 @@ CONFIG_R8712U=m
 #
 # CONFIG_AD5933 is not set
 # end of Network Analyzer, Impedance Converters
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
 # end of IIO staging drivers

 # CONFIG_FB_SM750 is not set
@@ -6394,6 +6370,7 @@ CONFIG_VIDEO_MAX96712=m
 # CONFIG_PI433 is not set
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
+# CONFIG_QLGE is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_CHROME_PLATFORMS=y
@@ -6682,6 +6659,7 @@ CONFIG_SOUNDWIRE_QCOM=m
 #
 # Broadcom SoC drivers
 #
+# CONFIG_SOC_BRCMSTB is not set
 # end of Broadcom SoC drivers

 #
@@ -6715,6 +6693,8 @@ CONFIG_MTK_DEVAPC=m
 CONFIG_MTK_INFRACFG=y
 CONFIG_MTK_PMIC_WRAP=y
 CONFIG_MTK_REGULATOR_COUPLER=y
+CONFIG_MTK_SCPSYS=y
+CONFIG_MTK_SCPSYS_PM_DOMAINS=y
 CONFIG_MTK_MMSYS=y
 CONFIG_MTK_SVS=y
 # end of MediaTek SoC drivers
@@ -6736,38 +6716,6 @@ CONFIG_QCOM_QMI_HELPERS=m
 # end of Xilinx SoC drivers
 # end of SOC (System On Chip) specific Drivers

-#
-# PM Domains
-#
-
-#
-# Amlogic PM Domains
-#
-# end of Amlogic PM Domains
-
-#
-# Broadcom PM Domains
-#
-# end of Broadcom PM Domains
-
-#
-# i.MX PM Domains
-#
-# end of i.MX PM Domains
-
-#
-# MediaTek PM Domains
-#
-CONFIG_MTK_SCPSYS=y
-CONFIG_MTK_SCPSYS_PM_DOMAINS=y
-# end of MediaTek PM Domains
-
-#
-# Qualcomm PM Domains
-#
-# end of Qualcomm PM Domains
-# end of PM Domains
-
 CONFIG_PM_DEVFREQ=y

 #
@@ -6899,7 +6847,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_LTC2309 is not set
 # CONFIG_LTC2471 is not set
 # CONFIG_LTC2485 is not set
 # CONFIG_LTC2496 is not set
@@ -6914,7 +6861,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 CONFIG_MAX9611=m
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
-# CONFIG_MCP3564 is not set
 # CONFIG_MCP3911 is not set
 # CONFIG_MEDIATEK_MT6360_ADC is not set
 CONFIG_MEDIATEK_MT6577_AUXADC=m
@@ -7301,7 +7247,6 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 # Pressure sensors
 #
 # CONFIG_ABP060MG is not set
-# CONFIG_ROHM_BM1390 is not set
 # CONFIG_BMP280 is not set
 CONFIG_IIO_CROS_EC_BARO=m
 # CONFIG_DLHL60D is not set
@@ -7352,7 +7297,6 @@ CONFIG_MPL3115=m
 #
 # CONFIG_AD2S90 is not set
 # CONFIG_AD2S1200 is not set
-# CONFIG_AD2S1210 is not set
 # end of Resolver to digital converters

 #
@@ -7572,6 +7516,7 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
@@ -7587,7 +7532,6 @@ CONFIG_F2FS_FS_POSIX_ACL=y
 # CONFIG_F2FS_FS_COMPRESSION is not set
 CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
-# CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
@@ -8042,9 +7986,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
-CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
-CONFIG_CRYPTO_JITTERENTROPY_OSR=1
+# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
 CONFIG_CRYPTO_KDF800108_CTR=y
 # end of Random number generation

@@ -8211,6 +8153,7 @@ CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
@@ -8276,7 +8219,6 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
 CONFIG_SBITMAP=y
-# CONFIG_LWQ_TEST is not set
 # end of Library routines

 CONFIG_GENERIC_IOREMAP=y
@@ -8461,6 +8403,8 @@ CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_MAPLE_TREE is not set
 # end of Debug kernel data structures

+# CONFIG_DEBUG_CREDENTIALS is not set
+
 #
 # RCU Debugging
 #
@@ -4,7 +4,7 @@

 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
-pkgver=6.6.10
+pkgver=6.5.2
 pkgrel=0
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
@@ -25,7 +25,7 @@ makedepends="
 	postmarketos-installkernel
 "

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

 source="
 	$pkgname-v$_tag.tar.gz::$url/archive/v$_tag.tar.gz
@@ -60,6 +60,6 @@ package() {
 }

 sha512sums="
-5114a563f14b391503b392ad7b72faefbe964c2530d75197fbe4d7c6f6acfcb606b511eda338923a297e4e0c84407edbe129c59988a094c449b37d1f5cac0120  linux-postmarketos-qcom-msm8953-v6.6.10-r0.tar.gz
-76351c35b7c39cbd37bbc675c32432ad53b8580593003d04a1b486b6bd911803b24da78ec6c995766a20806588806548b213a0be902166de1514b7004afed02b  config-postmarketos-qcom-msm8953.aarch64
+72603a44b0a41937be7b2a9bb31b062034396bc6c78c16226f98604fee57a1e9ae6c659ec1692d48e0fde0bb06aca30048c795d15e74c26ab79cd60f0064be73  linux-postmarketos-qcom-msm8953-v6.5.2-r1.tar.gz
+6e8d1667f2dea647ef0e0d3a778387f5952054df25523eff485d7d0b27916c93f89171929b742cb9a705498e5365e5f22d545faa1f2264037afd8ee357eb6691  config-postmarketos-qcom-msm8953.aarch64
 "
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.10 Kernel Configuration
+# Linux/arm64 6.5.2 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.1.1_git20230722) 13.1.1 20230722"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130201
+CONFIG_GCC_VERSION=130101
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24100
+CONFIG_AS_VERSION=24000
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24100
+CONFIG_LD_VERSION=24000
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -153,7 +153,6 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 # end of Scheduler features

 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
 CONFIG_GCC11_NO_ARRAY_BOUNDS=y
@@ -243,6 +242,7 @@ CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_KCMP=y
 CONFIG_RSEQ=y
 CONFIG_CACHESTAT_SYSCALL=y
+# CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_GUEST_PERF_EVENTS=y

@@ -255,17 +255,6 @@ CONFIG_PERF_EVENTS=y

 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
-
-#
-# Kexec and crash features
-#
-CONFIG_CRASH_CORE=y
-CONFIG_KEXEC_CORE=y
-CONFIG_KEXEC=y
-CONFIG_KEXEC_FILE=y
-# CONFIG_KEXEC_SIG is not set
-CONFIG_CRASH_DUMP=y
-# end of Kexec and crash features
 # end of General setup

 CONFIG_ARM64=y
@@ -288,6 +277,7 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
 CONFIG_SMP=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
@@ -377,7 +367,6 @@ CONFIG_ARM64_ERRATUM_2067961=y
 CONFIG_ARM64_ERRATUM_2441009=y
 CONFIG_ARM64_ERRATUM_2457168=y
 CONFIG_ARM64_ERRATUM_2645198=y
-CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -423,13 +412,10 @@ CONFIG_HW_PERF_EVENTS=y
 CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_ARCH_SUPPORTS_KEXEC=y
-CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y
-CONFIG_ARCH_SELECTS_KEXEC_FILE=y
-CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y
-CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y
-CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y
-CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
+CONFIG_KEXEC=y
+CONFIG_KEXEC_FILE=y
+# CONFIG_KEXEC_SIG is not set
+CONFIG_CRASH_DUMP=y
 CONFIG_TRANS_TABLE=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN=y
@@ -449,6 +435,7 @@ CONFIG_KUSER_HELPERS=y
 #
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
+CONFIG_AS_HAS_LDAPR=y
 CONFIG_AS_HAS_LSE_ATOMICS=y
 CONFIG_ARM64_LSE_ATOMICS=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
@@ -473,7 +460,6 @@ CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
 CONFIG_AS_HAS_ARMV8_3=y
 CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
-CONFIG_AS_HAS_LDAPR=y
 # end of ARMv8.3 architectural features

 #
@@ -612,6 +598,7 @@ CONFIG_KVM_MMIO=y
 CONFIG_HAVE_KVM_MSI=y
 CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
 CONFIG_KVM_VFIO=y
+CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
@@ -624,6 +611,8 @@ CONFIG_KVM=y
 #
 # General architecture-dependent options
 #
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
 CONFIG_ARCH_HAS_SUBPAGE_FAULTS=y
 CONFIG_HOTPLUG_CORE_SYNC=y
 CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
@@ -691,7 +680,6 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_WANT_PMD_MKWRITE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
@@ -851,7 +839,6 @@ CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_HARDENED is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_RANDOM_KMALLOC_CACHES is not set
 # end of SLAB allocator options

 # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
@@ -867,7 +854,6 @@ CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY_HOTPLUG is not set
-CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_COMPACTION=y
@@ -914,7 +900,6 @@ CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_GUP_TEST is not set
 # CONFIG_DMAPOOL_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
-CONFIG_MEMFD_CREATE=y
 CONFIG_SECRETMEM=y
 # CONFIG_ANON_VMA_NAME is not set
 # CONFIG_USERFAULTFD is not set
@@ -933,7 +918,6 @@ CONFIG_LOCK_MM_AND_FIND_VMA=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
-CONFIG_NET_XGRESS=y
 CONFIG_SKB_EXTENSIONS=y

 #
@@ -1641,11 +1625,6 @@ CONFIG_GENERIC_ARCH_NUMA=y
 # CONFIG_MHI_BUS_EP is not set
 # end of Bus devices

-#
-# Cache Drivers
-#
-# end of Cache Drivers
-
 # CONFIG_CONNECTOR is not set

 #
@@ -1820,7 +1799,6 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ATA is not set
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
-CONFIG_MD_BITMAP_FILE=y
 # CONFIG_MD_LINEAR is not set
 # CONFIG_MD_RAID0 is not set
 # CONFIG_MD_RAID1 is not set
@@ -2002,7 +1980,6 @@ CONFIG_AX88796B_PHY=m
 # CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MARVELL_10G_PHY is not set
-# CONFIG_MARVELL_88Q2XXX_PHY is not set
 # CONFIG_MARVELL_88X2222_PHY is not set
 # CONFIG_MAXLINEAR_GPHY is not set
 # CONFIG_MEDIATEK_GE_PHY is not set
@@ -2305,7 +2282,6 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 # CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_IQS5XX is not set
-# CONFIG_TOUCHSCREEN_IQS7211 is not set
 # CONFIG_TOUCHSCREEN_ZINITIX is not set
 CONFIG_TOUCHSCREEN_HIMAX_HX83112B=m
 CONFIG_INPUT_MISC=y
@@ -2659,9 +2635,7 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 CONFIG_PINCTRL_LPASS_LPI=m
 # CONFIG_PINCTRL_SC7280_LPASS_LPI is not set
-# CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8250_LPASS_LPI is not set
-# CONFIG_PINCTRL_SM8350_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8450_LPASS_LPI is not set
 # CONFIG_PINCTRL_SC8280XP_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8550_LPASS_LPI is not set
@@ -2708,7 +2682,6 @@ CONFIG_GPIO_XGENE=y
 #
 # CONFIG_GPIO_ADNP is not set
 # CONFIG_GPIO_FXL6408 is not set
-# CONFIG_GPIO_DS4520 is not set
 # CONFIG_GPIO_GW_PLD is not set
 # CONFIG_GPIO_MAX7300 is not set
 CONFIG_GPIO_MAX732X=y
@@ -2817,6 +2790,8 @@ CONFIG_CHARGER_QCOM_SMBCHG=y
 CONFIG_BATTERY_QCOM_FG=y
 # CONFIG_BATTERY_UG3105 is not set
 # CONFIG_CHARGER_QCOM_SMB2 is not set
+CONFIG_FUEL_GAUGE_SM5708=m
+CONFIG_CHARGER_SM5708=m
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
 # CONFIG_THERMAL_NETLINK is not set
@@ -2873,7 +2848,6 @@ CONFIG_MFD_CORE=y
 CONFIG_MFD_BD9571MWV=y
 CONFIG_MFD_AXP20X=y
 CONFIG_MFD_AXP20X_I2C=y
-# CONFIG_MFD_CS42L43_I2C is not set
 # CONFIG_MFD_MADERA is not set
 # CONFIG_MFD_MAX5970 is not set
 # CONFIG_PMIC_DA903X is not set
@@ -2930,6 +2904,7 @@ CONFIG_MFD_SPMI_PMIC=y
 # CONFIG_MFD_RN5T618 is not set
 CONFIG_MFD_SEC_CORE=y
 # CONFIG_MFD_SI476X_CORE is not set
+CONFIG_MFD_SIMPLE_MFD_I2C=m
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
@@ -2990,7 +2965,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
-# CONFIG_REGULATOR_AW37503 is not set
 # CONFIG_REGULATOR_AXP20X is not set
 # CONFIG_REGULATOR_BD718XX is not set
 # CONFIG_REGULATOR_BD9571MWV is not set
@@ -3012,7 +2986,6 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX77620 is not set
-# CONFIG_REGULATOR_MAX77857 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_MAX8893 is not set
@@ -3035,7 +3008,6 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 # CONFIG_REGULATOR_PWM is not set
-# CONFIG_REGULATOR_QCOM_REFGEN is not set
 # CONFIG_REGULATOR_QCOM_RPM is not set
 CONFIG_REGULATOR_QCOM_SMD_RPM=y
 CONFIG_REGULATOR_QCOM_SPMI=y
@@ -3053,7 +3025,6 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 # CONFIG_REGULATOR_RTQ2134 is not set
 # CONFIG_REGULATOR_RTMV20 is not set
 # CONFIG_REGULATOR_RTQ6752 is not set
-# CONFIG_REGULATOR_RTQ2208 is not set
 # CONFIG_REGULATOR_S2MPA01 is not set
 # CONFIG_REGULATOR_S2MPS11 is not set
 # CONFIG_REGULATOR_S5M8767 is not set
@@ -3107,11 +3078,8 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_V4L2_MEM2MEM_DEV=m
-# CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=m
 CONFIG_V4L2_ASYNC=m
-CONFIG_V4L2_CCI=m
-CONFIG_V4L2_CCI_I2C=m
 # end of Video4Linux options

 #
@@ -3262,7 +3230,10 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 #
 # Media ancillary drivers
 #
-CONFIG_VIDEO_CAMERA_SENSOR=y
+
+#
+# Camera sensor devices
+#
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_HI556 is not set
 CONFIG_VIDEO_SR556=m
@@ -3330,6 +3301,7 @@ CONFIG_VIDEO_S5K2XX=m
 # CONFIG_VIDEO_ST_VGXY61 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
+# end of Camera sensor devices

 #
 # Lens drivers
@@ -3337,7 +3309,6 @@ CONFIG_VIDEO_S5K2XX=m
 # CONFIG_VIDEO_AD5820 is not set
 # CONFIG_VIDEO_AK7375 is not set
 # CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9719 is not set
 # CONFIG_VIDEO_DW9768 is not set
 # CONFIG_VIDEO_DW9807_VCM is not set
 # end of Lens drivers
@@ -3358,14 +3329,6 @@ CONFIG_VIDEO_S5K2XX=m
 # Video and audio decoders
 #

-#
-# Video serializers and deserializers
-#
-# CONFIG_VIDEO_DS90UB913 is not set
-# CONFIG_VIDEO_DS90UB953 is not set
-# CONFIG_VIDEO_DS90UB960 is not set
-# end of Video serializers and deserializers
-
 #
 # SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'
 #
@@ -3382,7 +3345,6 @@ CONFIG_VIDEO_S5K2XX=m
 #
 CONFIG_VIDEO_CMDLINE=y
 CONFIG_VIDEO_NOMODESET=y
-# CONFIG_AUXDISPLAY is not set
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_KMS_HELPER=m
@@ -3511,7 +3473,6 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7=m
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
-# CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
@@ -3519,7 +3480,6 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7=m
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
-# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set
 # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set

@@ -3639,7 +3599,23 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 #
 # Frame buffer Devices
 #
+CONFIG_FB_NOTIFY=y
 CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_SYS_HELPERS=y
+CONFIG_FB_SYS_HELPERS_DEFERRED=y
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -3651,20 +3627,6 @@ CONFIG_FB=y
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SSD1307 is not set
-CONFIG_FB_CORE=y
-CONFIG_FB_NOTIFY=y
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB_DEVICE=y
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=y
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_SYSMEM_HELPERS=y
-CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
 # end of Frame buffer Devices

 #
@@ -3856,10 +3818,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
 # CONFIG_SND_SOC_ALC5623 is not set
-# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set
 CONFIG_SND_SOC_AW8738=m
 # CONFIG_SND_SOC_AW88395 is not set
-# CONFIG_SND_SOC_AW88261 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CHV3_CODEC is not set
@@ -4075,7 +4035,6 @@ CONFIG_HID_EZKEY=y
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_GLORIOUS is not set
 # CONFIG_HID_HOLTEK 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
@@ -4428,7 +4387,6 @@ CONFIG_USB_CONFIGFS_F_FS=y
 # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
 # CONFIG_USB_CONFIGFS_F_UAC2 is not set
 # CONFIG_USB_CONFIGFS_F_MIDI is not set
-# CONFIG_USB_CONFIGFS_F_MIDI2 is not set
 # CONFIG_USB_CONFIGFS_F_HID is not set
 # CONFIG_USB_CONFIGFS_F_UVC is not set
 # CONFIG_USB_CONFIGFS_F_PRINTER is not set
@@ -4517,6 +4475,7 @@ CONFIG_MMC_SDHCI_XENON=y
 CONFIG_MMC_SDHCI_AM654=y
 CONFIG_SCSI_UFSHCD=y
 # CONFIG_SCSI_UFS_BSG is not set
+# CONFIG_SCSI_UFS_HPB is not set
 CONFIG_SCSI_UFSHCD_PLATFORM=y
 # CONFIG_SCSI_UFS_CDNS_PLATFORM is not set
 # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
@@ -4524,7 +4483,7 @@ CONFIG_SCSI_UFS_QCOM=m
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
+# CONFIG_LEDS_CLASS_FLASH is not set
 CONFIG_LEDS_CLASS_MULTICOLOR=m
 # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set

@@ -4552,7 +4511,6 @@ CONFIG_LEDS_ATC=m
 # CONFIG_LEDS_LP8860 is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PCA995X is not set
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_PWM is not set
 # CONFIG_LEDS_REGULATOR is not set
@@ -4579,19 +4537,10 @@ CONFIG_LEDS_LM3697=y
 #
 # Flash and Torch LED drivers
 #
-# CONFIG_LEDS_AAT1290 is not set
-# CONFIG_LEDS_AS3645A is not set
-# CONFIG_LEDS_KTD2692 is not set
-# CONFIG_LEDS_LM3601X is not set
-# CONFIG_LEDS_QCOM_FLASH is not set
-# CONFIG_LEDS_RT4505 is not set
-# CONFIG_LEDS_RT8515 is not set
-# CONFIG_LEDS_SGM3140 is not set

 #
 # RGB LED drivers
 #
-# CONFIG_LEDS_GROUP_MULTICOLOR is not set
 # CONFIG_LEDS_PWM_MULTICOLOR is not set
 CONFIG_LEDS_QCOM_LPG=m

@@ -4719,6 +4668,7 @@ CONFIG_RTC_DRV_DS3232=y
 # CONFIG_RTC_DRV_M48T35 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
 # CONFIG_RTC_DRV_RP5C01 is not set
 # CONFIG_RTC_DRV_ZYNQMP is not set

@@ -4784,6 +4734,7 @@ CONFIG_SYNC_FILE=y
 # CONFIG_DMABUF_SYSFS_STATS is not set
 # end of DMABUF options

+# CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 # CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
@@ -4909,7 +4860,6 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_RS9_PCIE is not set
 # CONFIG_COMMON_CLK_SI521XX is not set
-# CONFIG_COMMON_CLK_VC3 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_VC7 is not set
 # CONFIG_COMMON_CLK_BD718XX is not set
@@ -4920,14 +4870,12 @@ CONFIG_COMMON_CLK_QCOM=y
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CLK_APCS_MSM8916 is not set
-CONFIG_QCOM_CLK_APCS_MSM8953=y
 CONFIG_QCOM_CLK_APCC_MSM8996=y
 # CONFIG_QCOM_CLK_RPM is not set
 CONFIG_QCOM_CLK_SMD_RPM=y
 # CONFIG_IPQ_APSS_PLL is not set
 # CONFIG_IPQ_APSS_6018 is not set
 # CONFIG_IPQ_GCC_4019 is not set
-# CONFIG_IPQ_GCC_5018 is not set
 # CONFIG_IPQ_GCC_5332 is not set
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_8074 is not set
@@ -4935,7 +4883,6 @@ CONFIG_QCOM_CLK_SMD_RPM=y
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8917 is not set
 # CONFIG_MSM_GCC_8939 is not set
-# CONFIG_MSM_GCC_8953_DEBUG is not set
 CONFIG_MSM_GCC_8953=y
 # CONFIG_MSM_GCC_8976 is not set
 # CONFIG_MSM_MMCC_8994 is not set
@@ -5011,6 +4958,8 @@ CONFIG_SC_GCC_7280=y
 # CONFIG_SM_VIDEOCC_8550 is not set
 # CONFIG_SPMI_PMIC_CLKDIV is not set
 # CONFIG_QCOM_HFPLL is not set
+CONFIG_QCOM_ALPHA_PLL=y
+CONFIG_QCOM_CPU_MUX_DIV=y
 # CONFIG_KPSS_XCC is not set
 # CONFIG_CLK_GFM_LPASS_SM8250 is not set
 # CONFIG_SM_VIDEOCC_8450 is not set
@@ -5149,7 +5098,7 @@ CONFIG_RPMSG_QCOM_SMD=y
 # CONFIG_QCOM_AOSS_QMP is not set
 CONFIG_QCOM_COMMAND_DB=y
 # CONFIG_QCOM_CPR is not set
-CONFIG_QCOM_CPR4PD=y
+CONFIG_QCOM_CPR3PD=y
 # CONFIG_QCOM_GENI_SE is not set
 # CONFIG_QCOM_GSBI is not set
 # CONFIG_QCOM_LLCC is not set
@@ -5176,7 +5125,6 @@ CONFIG_QCOM_STATS=m
 CONFIG_QCOM_WCNSS_CTRL=m
 CONFIG_QCOM_APR=m
 # CONFIG_QCOM_ICC_BWMON is not set
-CONFIG_QCOM_PBS=m
 # end of Qualcomm SoC drivers

 # CONFIG_SOC_TI is not set
@@ -5457,7 +5405,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_MAX5522 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
-# CONFIG_MCP4728 is not set
 # CONFIG_MCP4922 is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
@@ -5718,7 +5665,6 @@ CONFIG_YAMAHA_YAS530=m
 #
 # Proximity and distance sensors
 #
-# CONFIG_IRSD200 is not set
 # CONFIG_ISL29501 is not set
 # CONFIG_LIDAR_LITE_V2 is not set
 # CONFIG_MB1232 is not set
@@ -5821,7 +5767,6 @@ CONFIG_GENERIC_PHY=y
 CONFIG_PHY_QCOM_QUSB2=y
 # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set
 # CONFIG_PHY_QCOM_EUSB2_REPEATER is not set
-# CONFIG_PHY_QCOM_M31_USB is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -5842,7 +5787,6 @@ CONFIG_PHY_QCOM_QUSB2=y
 # CONFIG_ARM_CCN is not set
 # CONFIG_ARM_CMN is not set
 CONFIG_ARM_PMU=y
-# CONFIG_ARM_SMMU_V3_PMU is not set
 CONFIG_ARM_PMUV3=y
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
@@ -5873,9 +5817,8 @@ CONFIG_NVMEM_SYSFS=y
 # end of Layout Types

 CONFIG_NVMEM_QCOM_QFPROM=y
-# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
 CONFIG_NVMEM_RMEM=m
-CONFIG_NVMEM_SPMI_SDAM=m
+# CONFIG_NVMEM_SPMI_SDAM is not set

 #
 # HW tracing support
@@ -5916,7 +5859,6 @@ CONFIG_INTERCONNECT_CLK=y
 CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_VALIDATE_FS_PARSER is not set
 CONFIG_FS_IOMAP=y
-CONFIG_BUFFER_HEAD=y
 CONFIG_LEGACY_DIRECT_IO=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
@@ -5981,7 +5923,6 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_OVERLAY_FS_METACOPY is not set
-# CONFIG_OVERLAY_FS_DEBUG is not set

 #
 # Caches
@@ -6029,10 +5970,10 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_TMPFS_INODE64 is not set
-# CONFIG_TMPFS_QUOTA is not set
 CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
 # end of Pseudo filesystems
@@ -6074,7 +6015,12 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_ROMFS_FS is not set
 CONFIG_PSTORE=y
 CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
-CONFIG_PSTORE_COMPRESS=y
+# CONFIG_PSTORE_DEFLATE_COMPRESS is not set
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS is not set
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
 CONFIG_PSTORE_RAM=y
@@ -6231,13 +6177,6 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 # CONFIG_ZERO_CALL_USED_REGS is not set
 # end of Memory initialization

-#
-# Hardening of kernel data structures
-#
-# CONFIG_LIST_HARDENED is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# end of Hardening of kernel data structures
-
 CONFIG_RANDSTRUCT_NONE=y
 # CONFIG_RANDSTRUCT_FULL is not set
 # CONFIG_RANDSTRUCT_PERFORMANCE is not set
@@ -6549,7 +6488,7 @@ CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_AUDIT_COMPAT_GENERIC=y
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=m
@@ -6596,14 +6535,13 @@ CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_SWIOTLB=y
-# CONFIG_SWIOTLB_DYNAMIC is not set
 CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
 # CONFIG_DMA_RESTRICTED_POOL is not set
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_CMA=y
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_PERNUMA_CMA=y

 #
 # Default contiguous memory area size:
@@ -6819,9 +6757,12 @@ CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_DEBUG_MAPLE_TREE is not set
 # end of Debug kernel data structures

+# CONFIG_DEBUG_CREDENTIALS is not set
+
 #
 # RCU Debugging
 #
@@ -1,36 +0,0 @@
-From 720541f67f730e31c7b19b21b6c7eb92bfd9b6c2 Mon Sep 17 00:00:00 2001
-From: Konrad Dybcio <konrad.dybcio@linaro.org>
-Date: Fri, 16 Jun 2023 01:36:58 +0200
-Subject: [PATCH 06/17] media: venus: core: Set up secure memory ranges for
- SC7180
-
-Not all SC7180 devices ship with ChromeOS firmware. WoA devices use
-Android-like TZ, which uses PAS for image authentication. That requires
-the predefined virtual address ranges to be passed via scm calls.
-Define them to enable Venus on non-CrOS SC7180 devices.
-
-Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>
-Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
- drivers/media/platform/qcom/venus/core.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
-index 990a1519f968..1d9e416e5322 100644
--- a/drivers/media/platform/qcom/venus/core.c
-+++ b/drivers/media/platform/qcom/venus/core.c
-@@ -762,6 +762,10 @@ static const struct venus_resources sc7180_res = {
- 	.vmem_size = 0,
- 	.vmem_addr = 0,
- 	.dma_mask = 0xe0000000 - 1,
-+	.cp_start = 0,
-+	.cp_size = 0x70800000,
-+	.cp_nonpixel_start = 0x1000000,
-+	.cp_nonpixel_size = 0x24800000,
- 	.fwname = "qcom/venus-5.4/venus.mdt",
- };
- 
-- 
-2.43.0
-
@@ -1,387 +0,0 @@
-From 0fed0e8058be5fdf261092e6b42f0f8ef3c37040 Mon Sep 17 00:00:00 2001
-From: Nikita Travkin <nikita@trvn.ru>
-Date: Tue, 8 Aug 2023 15:10:13 +0500
-Subject: [PATCH 07/17] arm64: dts: qcom: sc7180: Split up TF-A related PSCI
- configuration
-
-When initially submitted, the sc7180 support only targeted CROS devices
-that make use of alternative TF-A firmware and not the official Qualcomm
-firmware. The PSCI implementations in those firmwares differ however so
-devices that use qcom firmware, like WoA laptops such as aspire1 need
-different setup.
-
-This commit adjusts the SoC dtsi to the OSI mode PSCI setup, common to
-the Qualcomm firmware and introduces new sc7180-firmware-tfa.dtsi that
-overrides the PSCI setup for the PC mode and uses TF-A specific
-psci-suspend-param. This dtsi is added to all boards that appear to use
-TF-A.
-
-Link: https://lore.kernel.org/r/20230808-sc7180-tfa-fw-v1-1-666d5d8467e5@trvn.ru
-Signed-off-by: Nikita Travkin <nikita@trvn.ru>
---
- .../boot/dts/qcom/sc7180-firmware-tfa.dtsi    | 107 +++++++++++++++
- arch/arm64/boot/dts/qcom/sc7180-idp.dts       |   1 +
- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi  |   1 +
- arch/arm64/boot/dts/qcom/sc7180.dtsi          | 127 +++++++++++++-----
- 4 files changed, 206 insertions(+), 30 deletions(-)
- create mode 100644 arch/arm64/boot/dts/qcom/sc7180-firmware-tfa.dtsi
-
-diff --git a/arch/arm64/boot/dts/qcom/sc7180-firmware-tfa.dtsi b/arch/arm64/boot/dts/qcom/sc7180-firmware-tfa.dtsi
-new file mode 100644
-index 000000000000..ee35a454dbf6
--- /dev/null
-+++ b/arch/arm64/boot/dts/qcom/sc7180-firmware-tfa.dtsi
-@@ -0,0 +1,107 @@
-+// SPDX-License-Identifier: BSD-3-Clause
-+
-+/*
-+ * Devices that use SC7180 with TrustedFirmware-A
-+ * need PSCI PC mode instead of the OSI mode provided
-+ * by Qualcomm firmware.
-+ */
-+
-+&CPU0 {
-+	/delete-property/ power-domains;
-+	/delete-property/ power-domain-names;
-+
-+	cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-+			   &LITTLE_CPU_SLEEP_1
-+			   &CLUSTER_SLEEP_0>;
-+};
-+
-+&CPU1 {
-+	/delete-property/ power-domains;
-+	/delete-property/ power-domain-names;
-+
-+	cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-+			   &LITTLE_CPU_SLEEP_1
-+			   &CLUSTER_SLEEP_0>;
-+};
-+
-+&CPU2 {
-+	/delete-property/ power-domains;
-+	/delete-property/ power-domain-names;
-+
-+	cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-+			   &LITTLE_CPU_SLEEP_1
-+			   &CLUSTER_SLEEP_0>;
-+};
-+
-+&CPU3 {
-+	/delete-property/ power-domains;
-+	/delete-property/ power-domain-names;
-+
-+	cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-+			   &LITTLE_CPU_SLEEP_1
-+			   &CLUSTER_SLEEP_0>;
-+};
-+
-+&CPU4 {
-+	/delete-property/ power-domains;
-+	/delete-property/ power-domain-names;
-+
-+	cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-+			   &LITTLE_CPU_SLEEP_1
-+			   &CLUSTER_SLEEP_0>;
-+};
-+
-+&CPU5 {
-+	/delete-property/ power-domains;
-+	/delete-property/ power-domain-names;
-+
-+	cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-+			   &LITTLE_CPU_SLEEP_1
-+			   &CLUSTER_SLEEP_0>;
-+};
-+
-+&CPU6 {
-+	/delete-property/ power-domains;
-+	/delete-property/ power-domain-names;
-+
-+	cpu-idle-states = <&BIG_CPU_SLEEP_0
-+			   &BIG_CPU_SLEEP_1
-+			   &CLUSTER_SLEEP_0>;
-+};
-+
-+&CPU7 {
-+	/delete-property/ power-domains;
-+	/delete-property/ power-domain-names;
-+
-+	cpu-idle-states = <&BIG_CPU_SLEEP_0
-+			   &BIG_CPU_SLEEP_1
-+			   &CLUSTER_SLEEP_0>;
-+};
-+
-+/delete-node/ &domain_idle_states;
-+
-+&idle_states {
-+	CLUSTER_SLEEP_0: cluster-sleep-0 {
-+		compatible = "arm,idle-state";
-+		idle-state-name = "cluster-power-down";
-+		arm,psci-suspend-param = <0x40003444>;
-+		entry-latency-us = <3263>;
-+		exit-latency-us = <6562>;
-+		min-residency-us = <9926>;
-+		local-timer-stop;
-+	};
-+};
-+
-+/delete-node/ &CPU_PD0;
-+/delete-node/ &CPU_PD1;
-+/delete-node/ &CPU_PD2;
-+/delete-node/ &CPU_PD3;
-+/delete-node/ &CPU_PD4;
-+/delete-node/ &CPU_PD5;
-+/delete-node/ &CPU_PD6;
-+/delete-node/ &CPU_PD7;
-+/delete-node/ &CLUSTER_PD;
-+
-+&apps_rsc {
-+	/delete-property/ power-domains;
-+};
-diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
-index d3c4b5804a69..c224fc93f1ee 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
-+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
-@@ -11,6 +11,7 @@
- #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
- #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
- #include "sc7180.dtsi"
-+#include "sc7180-firmware-tfa.dtsi"
- #include "pm6150.dtsi"
- #include "pm6150l.dtsi"
- 
-diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
-index f4db4ccf48e5..38d327fa1394 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
-@@ -13,6 +13,7 @@
- #include <dt-bindings/sound/sc7180-lpass.h>
- 
- #include "sc7180.dtsi"
-+#include "sc7180-firmware-tfa.dtsi"
- /* PMICs depend on spmi_bus label and so must come after sc7180.dtsi */
- #include "pm6150.dtsi"
- #include "pm6150l.dtsi"
-diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
-index 19f39a5b3b56..64ae9f27ba80 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
-@@ -133,9 +133,8 @@ CPU0: cpu@0 {
- 			compatible = "qcom,kryo468";
- 			reg = <0x0 0x0>;
- 			enable-method = "psci";
-			cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-					   &LITTLE_CPU_SLEEP_1
-					   &CLUSTER_SLEEP_0>;
-+			power-domains = <&CPU_PD0>;
-+			power-domain-names = "psci";
- 			capacity-dmips-mhz = <415>;
- 			dynamic-power-coefficient = <137>;
- 			operating-points-v2 = <&cpu0_opp_table>;
-@@ -158,9 +157,8 @@ CPU1: cpu@100 {
- 			compatible = "qcom,kryo468";
- 			reg = <0x0 0x100>;
- 			enable-method = "psci";
-			cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-					   &LITTLE_CPU_SLEEP_1
-					   &CLUSTER_SLEEP_0>;
-+			power-domains = <&CPU_PD1>;
-+			power-domain-names = "psci";
- 			capacity-dmips-mhz = <415>;
- 			dynamic-power-coefficient = <137>;
- 			next-level-cache = <&L2_100>;
-@@ -180,9 +178,8 @@ CPU2: cpu@200 {
- 			compatible = "qcom,kryo468";
- 			reg = <0x0 0x200>;
- 			enable-method = "psci";
-			cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-					   &LITTLE_CPU_SLEEP_1
-					   &CLUSTER_SLEEP_0>;
-+			power-domains = <&CPU_PD2>;
-+			power-domain-names = "psci";
- 			capacity-dmips-mhz = <415>;
- 			dynamic-power-coefficient = <137>;
- 			next-level-cache = <&L2_200>;
-@@ -202,9 +199,8 @@ CPU3: cpu@300 {
- 			compatible = "qcom,kryo468";
- 			reg = <0x0 0x300>;
- 			enable-method = "psci";
-			cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-					   &LITTLE_CPU_SLEEP_1
-					   &CLUSTER_SLEEP_0>;
-+			power-domains = <&CPU_PD3>;
-+			power-domain-names = "psci";
- 			capacity-dmips-mhz = <415>;
- 			dynamic-power-coefficient = <137>;
- 			next-level-cache = <&L2_300>;
-@@ -224,9 +220,8 @@ CPU4: cpu@400 {
- 			compatible = "qcom,kryo468";
- 			reg = <0x0 0x400>;
- 			enable-method = "psci";
-			cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-					   &LITTLE_CPU_SLEEP_1
-					   &CLUSTER_SLEEP_0>;
-+			power-domains = <&CPU_PD4>;
-+			power-domain-names = "psci";
- 			capacity-dmips-mhz = <415>;
- 			dynamic-power-coefficient = <137>;
- 			next-level-cache = <&L2_400>;
-@@ -246,9 +241,8 @@ CPU5: cpu@500 {
- 			compatible = "qcom,kryo468";
- 			reg = <0x0 0x500>;
- 			enable-method = "psci";
-			cpu-idle-states = <&LITTLE_CPU_SLEEP_0
-					   &LITTLE_CPU_SLEEP_1
-					   &CLUSTER_SLEEP_0>;
-+			power-domains = <&CPU_PD5>;
-+			power-domain-names = "psci";
- 			capacity-dmips-mhz = <415>;
- 			dynamic-power-coefficient = <137>;
- 			next-level-cache = <&L2_500>;
-@@ -268,9 +262,8 @@ CPU6: cpu@600 {
- 			compatible = "qcom,kryo468";
- 			reg = <0x0 0x600>;
- 			enable-method = "psci";
-			cpu-idle-states = <&BIG_CPU_SLEEP_0
-					   &BIG_CPU_SLEEP_1
-					   &CLUSTER_SLEEP_0>;
-+			power-domains = <&CPU_PD6>;
-+			power-domain-names = "psci";
- 			capacity-dmips-mhz = <1024>;
- 			dynamic-power-coefficient = <480>;
- 			next-level-cache = <&L2_600>;
-@@ -290,9 +283,8 @@ CPU7: cpu@700 {
- 			compatible = "qcom,kryo468";
- 			reg = <0x0 0x700>;
- 			enable-method = "psci";
-			cpu-idle-states = <&BIG_CPU_SLEEP_0
-					   &BIG_CPU_SLEEP_1
-					   &CLUSTER_SLEEP_0>;
-+			power-domains = <&CPU_PD7>;
-+			power-domain-names = "psci";
- 			capacity-dmips-mhz = <1024>;
- 			dynamic-power-coefficient = <480>;
- 			next-level-cache = <&L2_700>;
-@@ -343,7 +335,7 @@ core7 {
- 			};
- 		};
- 
-		idle-states {
-+		idle_states: idle-states {
- 			entry-method = "psci";
- 
- 			LITTLE_CPU_SLEEP_0: cpu-sleep-0-0 {
-@@ -385,15 +377,34 @@ BIG_CPU_SLEEP_1: cpu-sleep-1-1 {
- 				min-residency-us = <5555>;
- 				local-timer-stop;
- 			};
-+		};
- 
-			CLUSTER_SLEEP_0: cluster-sleep-0 {
-				compatible = "arm,idle-state";
-+		domain_idle_states: domain-idle-states {
-+			CLUSTER_SLEEP_PC: cluster-sleep-0 {
-+				compatible = "domain-idle-state";
-+				idle-state-name = "cluster-l3-power-collapse";
-+				arm,psci-suspend-param = <0x41000044>;
-+				entry-latency-us = <2752>;
-+				exit-latency-us = <3048>;
-+				min-residency-us = <6118>;
-+			};
-+
-+			CLUSTER_SLEEP_CX_RET: cluster-sleep-1 {
-+				compatible = "domain-idle-state";
-+				idle-state-name = "cluster-cx-retention";
-+				arm,psci-suspend-param = <0x41001244>;
-+				entry-latency-us = <3638>;
-+				exit-latency-us = <4562>;
-+				min-residency-us = <8467>;
-+			};
-+
-+			CLUSTER_AOSS_SLEEP: cluster-sleep-2 {
-+				compatible = "domain-idle-state";
- 				idle-state-name = "cluster-power-down";
-				arm,psci-suspend-param = <0x40003444>;
-+				arm,psci-suspend-param = <0x4100b244>;
- 				entry-latency-us = <3263>;
- 				exit-latency-us = <6562>;
-				min-residency-us = <9926>;
-				local-timer-stop;
-+				min-residency-us = <9826>;
- 			};
- 		};
- 	};
-@@ -643,6 +654,61 @@ ipa_smp2p_in: ipa-modem-to-ap {
- 	psci {
- 		compatible = "arm,psci-1.0";
- 		method = "smc";
-+
-+		CPU_PD0: cpu0 {
-+			#power-domain-cells = <0>;
-+			power-domains = <&CLUSTER_PD>;
-+			domain-idle-states = <&LITTLE_CPU_SLEEP_0 &LITTLE_CPU_SLEEP_1>;
-+		};
-+
-+		CPU_PD1: cpu1 {
-+			#power-domain-cells = <0>;
-+			power-domains = <&CLUSTER_PD>;
-+			domain-idle-states = <&LITTLE_CPU_SLEEP_0 &LITTLE_CPU_SLEEP_1>;
-+		};
-+
-+		CPU_PD2: cpu2 {
-+			#power-domain-cells = <0>;
-+			power-domains = <&CLUSTER_PD>;
-+			domain-idle-states = <&LITTLE_CPU_SLEEP_0 &LITTLE_CPU_SLEEP_1>;
-+		};
-+
-+		CPU_PD3: cpu3 {
-+			#power-domain-cells = <0>;
-+			power-domains = <&CLUSTER_PD>;
-+			domain-idle-states = <&LITTLE_CPU_SLEEP_0 &LITTLE_CPU_SLEEP_1>;
-+		};
-+
-+		CPU_PD4: cpu4 {
-+			#power-domain-cells = <0>;
-+			power-domains = <&CLUSTER_PD>;
-+			domain-idle-states = <&LITTLE_CPU_SLEEP_0 &LITTLE_CPU_SLEEP_1>;
-+		};
-+
-+		CPU_PD5: cpu5 {
-+			#power-domain-cells = <0>;
-+			power-domains = <&CLUSTER_PD>;
-+			domain-idle-states = <&LITTLE_CPU_SLEEP_0 &LITTLE_CPU_SLEEP_1>;
-+		};
-+
-+		CPU_PD6: cpu6 {
-+			#power-domain-cells = <0>;
-+			power-domains = <&CLUSTER_PD>;
-+			domain-idle-states = <&BIG_CPU_SLEEP_0 &BIG_CPU_SLEEP_1>;
-+		};
-+
-+		CPU_PD7: cpu7 {
-+			#power-domain-cells = <0>;
-+			power-domains = <&CLUSTER_PD>;
-+			domain-idle-states = <&BIG_CPU_SLEEP_0 &BIG_CPU_SLEEP_1>;
-+		};
-+
-+		CLUSTER_PD: cpu-cluster0 {
-+			#power-domain-cells = <0>;
-+			domain-idle-states = <&CLUSTER_SLEEP_PC
-+					      &CLUSTER_SLEEP_CX_RET
-+					      &CLUSTER_AOSS_SLEEP>;
-+		};
- 	};
- 
- 	soc: soc@0 {
-@@ -3452,6 +3518,7 @@ apps_rsc: rsc@18200000 {
- 					  <SLEEP_TCS   3>,
- 					  <WAKE_TCS    3>,
- 					  <CONTROL_TCS 1>;
-+			power-domains = <&CLUSTER_PD>;
- 
- 			rpmhcc: clock-controller {
- 				compatible = "qcom,sc7180-rpmh-clk";
-- 
-2.43.0
-
@@ -1,32 +0,0 @@
-From d3e05226627152fff5417c441407fa4a796b707b Mon Sep 17 00:00:00 2001
-From: Nikita Travkin <nikita@trvn.ru>
-Date: Thu, 7 Sep 2023 15:02:35 +0500
-Subject: [PATCH 08/17] remoteproc: qcom: pas: Add sc7180 adsp
-
-sc7180 has a dedicated ADSP similar to the one found in sm8250.
-Add it's compatible to the driver reusing the existing config so
-the devices that use the adsp can probe it.
-
-Signed-off-by: Nikita Travkin <nikita@trvn.ru>
-Reviewed-by: Stephen Boyd <swboyd@chromium.org>
-Link: https://lore.kernel.org/r/20230907-sc7180-adsp-rproc-v3-2-6515c3fbe0a3@trvn.ru
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
---
- drivers/remoteproc/qcom_q6v5_pas.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
-index 6afd0941e552..92aa60d81845 100644
--- a/drivers/remoteproc/qcom_q6v5_pas.c
-+++ b/drivers/remoteproc/qcom_q6v5_pas.c
-@@ -956,6 +956,7 @@ static const struct of_device_id adsp_of_match[] = {
- 	{ .compatible = "qcom,qcs404-adsp-pas", .data = &adsp_resource_init },
- 	{ .compatible = "qcom,qcs404-cdsp-pas", .data = &cdsp_resource_init },
- 	{ .compatible = "qcom,qcs404-wcss-pas", .data = &wcss_resource_init },
-+	{ .compatible = "qcom,sc7180-adsp-pas", .data = &sm8250_adsp_resource},
- 	{ .compatible = "qcom,sc7180-mpss-pas", .data = &mpss_resource_init},
- 	{ .compatible = "qcom,sc7280-mpss-pas", .data = &mpss_resource_init},
- 	{ .compatible = "qcom,sc8180x-adsp-pas", .data = &sm8150_adsp_resource},
-- 
-2.43.0
-
@@ -1,37 +0,0 @@
-From 904af70e09880a072393d4871abe16f99cdde2eb Mon Sep 17 00:00:00 2001
-From: Nikita Travkin <nikita@trvn.ru>
-Date: Thu, 7 Sep 2023 15:02:36 +0500
-Subject: [PATCH 09/17] arm64: dts: qcom: sc7180: Add tertiary mi2s pinctrl
-
-Some devices use tertiary mi2s to connect external audio codec.
-Add it near the other two i2s pinctrl definitions so the devices don't
-have to duplicate it.
-
-Signed-off-by: Nikita Travkin <nikita@trvn.ru>
-Reviewed-by: Stephen Boyd <swboyd@chromium.org>
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Link: https://lore.kernel.org/r/20230907-sc7180-adsp-rproc-v3-3-6515c3fbe0a3@trvn.ru
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
---
- arch/arm64/boot/dts/qcom/sc7180.dtsi | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
-index 64ae9f27ba80..6988140a5270 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
-@@ -1957,6 +1957,11 @@ pinmux {
- 					function = "lpass_ext";
- 				};
- 			};
-+
-+			ter_mi2s_active: ter-mi2s-active-state {
-+				pins = "gpio63", "gpio64", "gpio65", "gpio66";
-+				function = "mi2s_2";
-+			};
- 		};
- 
- 		remoteproc_mpss: remoteproc@4080000 {
-- 
-2.43.0
-
@@ -1,162 +0,0 @@
-From 73db0fa78b569523c6a5fa8e68ddfbe83a07be6c Mon Sep 17 00:00:00 2001
-From: Nikita Travkin <nikita@trvn.ru>
-Date: Thu, 7 Sep 2023 15:02:37 +0500
-Subject: [PATCH 10/17] arm64: dts: qcom: sc7180: Add ADSP
-
-sc7180 has an ADSP remoteproc that exclusively controls the audio
-hardware on devices that use Qualcomm firmware.
-
-Add it along with the relevant audio services.
-
-Signed-off-by: Nikita Travkin <nikita@trvn.ru>
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Reviewed-by: Stephen Boyd <swboyd@chromium.org>
-Link: https://lore.kernel.org/r/20230907-sc7180-adsp-rproc-v3-4-6515c3fbe0a3@trvn.ru
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
---
- arch/arm64/boot/dts/qcom/sc7180.dtsi | 122 +++++++++++++++++++++++++++
- 1 file changed, 122 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
-index 6988140a5270..b9d6c95191ae 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
-@@ -19,6 +19,8 @@
- #include <dt-bindings/reset/qcom,sdm845-aoss.h>
- #include <dt-bindings/reset/qcom,sdm845-pdc.h>
- #include <dt-bindings/soc/qcom,rpmh-rsc.h>
-+#include <dt-bindings/soc/qcom,apr.h>
-+#include <dt-bindings/sound/qcom,q6afe.h>
- #include <dt-bindings/thermal/thermal.h>
- 
- / {
-@@ -3635,6 +3637,126 @@ wifi: wifi@18800000 {
- 			status = "disabled";
- 		};
- 
-+		remoteproc_adsp: remoteproc@62400000 {
-+			compatible = "qcom,sc7180-adsp-pas";
-+			reg = <0 0x62400000 0 0x100>;
-+
-+			interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>,
-+					      <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
-+					      <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
-+					      <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
-+					      <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
-+			interrupt-names = "wdog",
-+					  "fatal",
-+					  "ready",
-+					  "handover",
-+					  "stop-ack";
-+
-+			clocks = <&rpmhcc RPMH_CXO_CLK>;
-+			clock-names = "xo";
-+
-+			power-domains = <&rpmhpd SC7180_LCX>,
-+					<&rpmhpd SC7180_LMX>;
-+			power-domain-names = "lcx", "lmx";
-+
-+			qcom,qmp = <&aoss_qmp>;
-+			qcom,smem-states = <&adsp_smp2p_out 0>;
-+			qcom,smem-state-names = "stop";
-+
-+			status = "disabled";
-+
-+			glink-edge {
-+				interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
-+				label = "lpass";
-+				qcom,remote-pid = <2>;
-+				mboxes = <&apss_shared 8>;
-+
-+				apr {
-+					compatible = "qcom,apr-v2";
-+					qcom,glink-channels = "apr_audio_svc";
-+					qcom,domain = <APR_DOMAIN_ADSP>;
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					service@3 {
-+						compatible = "qcom,q6core";
-+						reg = <APR_SVC_ADSP_CORE>;
-+						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-+					};
-+
-+					q6afe: service@4 {
-+						compatible = "qcom,q6afe";
-+						reg = <APR_SVC_AFE>;
-+						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-+
-+						q6afedai: dais {
-+							compatible = "qcom,q6afe-dais";
-+							#address-cells = <1>;
-+							#size-cells = <0>;
-+							#sound-dai-cells = <1>;
-+						};
-+
-+						q6afecc: clock-controller {
-+							compatible = "qcom,q6afe-clocks";
-+							#clock-cells = <2>;
-+						};
-+					};
-+
-+					q6asm: service@7 {
-+						compatible = "qcom,q6asm";
-+						reg = <APR_SVC_ASM>;
-+						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-+
-+						q6asmdai: dais {
-+							compatible = "qcom,q6asm-dais";
-+							#address-cells = <1>;
-+							#size-cells = <0>;
-+							#sound-dai-cells = <1>;
-+							iommus = <&apps_smmu 0x1001 0x0>;
-+						};
-+					};
-+
-+					q6adm: service@8 {
-+						compatible = "qcom,q6adm";
-+						reg = <APR_SVC_ADM>;
-+						qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
-+
-+						q6routing: routing {
-+							compatible = "qcom,q6adm-routing";
-+							#sound-dai-cells = <0>;
-+						};
-+					};
-+				};
-+
-+				fastrpc {
-+					compatible = "qcom,fastrpc";
-+					qcom,glink-channels = "fastrpcglink-apps-dsp";
-+					label = "adsp";
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					compute-cb@3 {
-+						compatible = "qcom,fastrpc-compute-cb";
-+						reg = <3>;
-+						iommus = <&apps_smmu 0x1003 0x0>;
-+					};
-+
-+					compute-cb@4 {
-+						compatible = "qcom,fastrpc-compute-cb";
-+						reg = <4>;
-+						iommus = <&apps_smmu 0x1004 0x0>;
-+					};
-+
-+					compute-cb@5 {
-+						compatible = "qcom,fastrpc-compute-cb";
-+						reg = <5>;
-+						iommus = <&apps_smmu 0x1005 0x0>;
-+						qcom,nsessions = <5>;
-+					};
-+				};
-+			};
-+		};
-+
- 		lpasscc: clock-controller@62d00000 {
- 			compatible = "qcom,sc7180-lpasscorecc";
- 			reg = <0 0x62d00000 0 0x50000>,
-- 
-2.43.0
-
@@ -1,103 +0,0 @@
-From 8b12f09d1ba7f704e1ff0435d891556aae675b22 Mon Sep 17 00:00:00 2001
-From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
-Date: Wed, 2 Aug 2023 20:57:30 +0300
-Subject: [PATCH 11/17] ASoC: qcom: sc7180: Map missing jack kcontrols
-
-This driver does not properly map jack pins to kcontrols that PulseAudio
-and PipeWire need to handle jack detection events. The RT5682 and
-RT5682s codecs used here can detect Headphone and Headset Mic
-connections. Expose each to userspace as a kcontrol.
-
-Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
-Link: https://lore.kernel.org/r/20230802175737.263412-21-alpernebiyasak@gmail.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
---
- sound/soc/qcom/sc7180.c | 40 +++++++++++++++++++++++++++++++++-------
- 1 file changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/sound/soc/qcom/sc7180.c b/sound/soc/qcom/sc7180.c
-index f5f7c64b23a2..57c5f35dfcc5 100644
--- a/sound/soc/qcom/sc7180.c
-+++ b/sound/soc/qcom/sc7180.c
-@@ -42,6 +42,17 @@ static void sc7180_jack_free(struct snd_jack *jack)
- 	snd_soc_component_set_jack(component, NULL, NULL);
- }
- 
-+static struct snd_soc_jack_pin sc7180_jack_pins[] = {
-+	{
-+		.pin = "Headphone Jack",
-+		.mask = SND_JACK_HEADPHONE,
-+	},
-+	{
-+		.pin = "Headset Mic",
-+		.mask = SND_JACK_MICROPHONE,
-+	},
-+};
-+
- static int sc7180_headset_init(struct snd_soc_pcm_runtime *rtd)
- {
- 	struct snd_soc_card *card = rtd->card;
-@@ -51,13 +62,14 @@ static int sc7180_headset_init(struct snd_soc_pcm_runtime *rtd)
- 	struct snd_jack *jack;
- 	int rval;
- 
-	rval = snd_soc_card_jack_new(
-			card, "Headset Jack",
-			SND_JACK_HEADSET |
-			SND_JACK_HEADPHONE |
-			SND_JACK_BTN_0 | SND_JACK_BTN_1 |
-			SND_JACK_BTN_2 | SND_JACK_BTN_3,
-			&pdata->hs_jack);
-+	rval = snd_soc_card_jack_new_pins(card, "Headset Jack",
-+					  SND_JACK_HEADSET |
-+					  SND_JACK_HEADPHONE |
-+					  SND_JACK_BTN_0 | SND_JACK_BTN_1 |
-+					  SND_JACK_BTN_2 | SND_JACK_BTN_3,
-+					  &pdata->hs_jack,
-+					  sc7180_jack_pins,
-+					  ARRAY_SIZE(sc7180_jack_pins));
- 
- 	if (rval < 0) {
- 		dev_err(card->dev, "Unable to add Headset Jack\n");
-@@ -297,6 +309,11 @@ static const struct snd_soc_dapm_widget sc7180_snd_widgets[] = {
- 	SND_SOC_DAPM_MIC("Headset Mic", NULL),
- };
- 
-+static const struct snd_kcontrol_new sc7180_snd_controls[] = {
-+	SOC_DAPM_PIN_SWITCH("Headphone Jack"),
-+	SOC_DAPM_PIN_SWITCH("Headset Mic"),
-+};
-+
- static const struct snd_soc_dapm_widget sc7180_adau7002_snd_widgets[] = {
- 	SND_SOC_DAPM_MIC("DMIC", NULL),
- };
-@@ -320,6 +337,11 @@ static const struct snd_soc_dapm_widget sc7180_snd_dual_mic_widgets[] = {
- 	SND_SOC_DAPM_MUX("Dmic Mux", SND_SOC_NOPM, 0, 0, &sc7180_dmic_mux_control),
- };
- 
-+static const struct snd_kcontrol_new sc7180_snd_dual_mic_controls[] = {
-+	SOC_DAPM_PIN_SWITCH("Headphone Jack"),
-+	SOC_DAPM_PIN_SWITCH("Headset Mic"),
-+};
-+
- static const struct snd_soc_dapm_route sc7180_snd_dual_mic_audio_route[] = {
- 	{"Dmic Mux", "Front Mic", "DMIC"},
- 	{"Dmic Mux", "Rear Mic", "DMIC"},
-@@ -348,10 +370,14 @@ static int sc7180_snd_platform_probe(struct platform_device *pdev)
- 	card->dev = dev;
- 	card->dapm_widgets = sc7180_snd_widgets;
- 	card->num_dapm_widgets = ARRAY_SIZE(sc7180_snd_widgets);
-+	card->controls = sc7180_snd_controls;
-+	card->num_controls = ARRAY_SIZE(sc7180_snd_controls);
- 
- 	if (of_property_read_bool(dev->of_node, "dmic-gpios")) {
- 		card->dapm_widgets = sc7180_snd_dual_mic_widgets,
- 		card->num_dapm_widgets = ARRAY_SIZE(sc7180_snd_dual_mic_widgets),
-+		card->controls = sc7180_snd_dual_mic_controls,
-+		card->num_controls = ARRAY_SIZE(sc7180_snd_dual_mic_controls),
- 		card->dapm_routes = sc7180_snd_dual_mic_audio_route,
- 		card->num_dapm_routes = ARRAY_SIZE(sc7180_snd_dual_mic_audio_route),
- 		data->dmic_sel = devm_gpiod_get(&pdev->dev, "dmic", GPIOD_OUT_LOW);
-- 
-2.43.0
-
@@ -1,319 +0,0 @@
-From 98378d3ecfeb0741b313ff607a2c883ebee26da3 Mon Sep 17 00:00:00 2001
-From: Nikita Travkin <nikita@trvn.ru>
-Date: Thu, 19 Oct 2023 19:14:13 +0500
-Subject: [PATCH 12/17] ASoC: qcom: sc7180: Add support for qdsp6 baked sound
-
-Some sc7180 devices use audio adsp to play sound. The setup for this
-adsp is similar to the dirrect lpass usage but requires the use of
-different link ids and clocks.
-
-This commit adds support for the qdsp based audio, reusing the common
-parts like audio codec setup and jack creation.
-
-Since the setup is mostly generic and codec specific setup is guarded
-behind a check, a generic compatible is added, similar to other
-platforms. Even though those changes target Acer Aspire 1 as the only
-user of the adsp audio on this platform present upstream at the moment
-of the commit, those changes should be either dirrectly compatible or
-trivially expandable to the other devices that will be added in the
-future.
-
-Signed-off-by: Nikita Travkin <nikita@trvn.ru>
---
- sound/soc/qcom/sc7180.c | 194 +++++++++++++++++++++++++++++++++++-----
- 1 file changed, 172 insertions(+), 22 deletions(-)
-
-diff --git a/sound/soc/qcom/sc7180.c b/sound/soc/qcom/sc7180.c
-index 57c5f35dfcc5..c4f58ecd3896 100644
--- a/sound/soc/qcom/sc7180.c
-+++ b/sound/soc/qcom/sc7180.c
-@@ -15,6 +15,7 @@
- #include <sound/pcm.h>
- #include <sound/soc.h>
- #include <uapi/linux/input-event-codes.h>
-+#include "qdsp6/q6afe.h"
- 
- #include "../codecs/rt5682.h"
- #include "../codecs/rt5682s.h"
-@@ -22,6 +23,7 @@
- #include "lpass.h"
- 
- #define DEFAULT_MCLK_RATE		19200000
-+#define MI2S_BCLK_RATE			1536000
- #define RT5682_PLL1_FREQ (48000 * 512)
- 
- #define DRIVER_NAME "SC7180"
-@@ -134,12 +136,28 @@ static int sc7180_init(struct snd_soc_pcm_runtime *rtd)
- 	return 0;
- }
- 
-static int sc7180_snd_startup(struct snd_pcm_substream *substream)
-+static int sc7180_qdsp_init(struct snd_soc_pcm_runtime *rtd)
- {
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_card *card = rtd->card;
-	struct sc7180_snd_data *data = snd_soc_card_get_drvdata(card);
- 	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+
-+	switch (cpu_dai->id) {
-+	case PRIMARY_MI2S_RX:
-+		return sc7180_headset_init(rtd);
-+	case PRIMARY_MI2S_TX:
-+	case TERTIARY_MI2S_RX:
-+		return 0;
-+	case DISPLAY_PORT_RX:
-+		return sc7180_hdmi_init(rtd);
-+	default:
-+		dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__,
-+			cpu_dai->id);
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+static int sc7180_startup_realtek_codec(struct snd_soc_pcm_runtime *rtd)
-+{
- 	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
- 	int pll_id, pll_source, pll_in, pll_out, clk_id, ret;
- 
-@@ -155,8 +173,40 @@ static int sc7180_snd_startup(struct snd_pcm_substream *substream)
- 		clk_id = RT5682S_SCLK_S_PLL2;
- 		pll_out = RT5682_PLL1_FREQ;
- 		pll_in = DEFAULT_MCLK_RATE;
-+	} else {
-+		return 0;
-+	}
-+	snd_soc_dai_set_fmt(codec_dai,
-+			    SND_SOC_DAIFMT_BC_FC |
-+			    SND_SOC_DAIFMT_NB_NF |
-+			    SND_SOC_DAIFMT_I2S);
-+
-+	/* Configure PLL1 for codec */
-+	ret = snd_soc_dai_set_pll(codec_dai, pll_id, pll_source,
-+				  pll_in, pll_out);
-+	if (ret) {
-+		dev_err(rtd->dev, "can't set codec pll: %d\n", ret);
-+		return ret;
- 	}
- 
-+	/* Configure sysclk for codec */
-+	ret = snd_soc_dai_set_sysclk(codec_dai, clk_id, pll_out,
-+				     SND_SOC_CLOCK_IN);
-+	if (ret)
-+		dev_err(rtd->dev, "snd_soc_dai_set_sysclk err = %d\n",
-+			ret);
-+
-+	return ret;
-+}
-+
-+static int sc7180_snd_startup(struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_card *card = rtd->card;
-+	struct sc7180_snd_data *data = snd_soc_card_get_drvdata(card);
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+	int ret;
-+
- 	switch (cpu_dai->id) {
- 	case MI2S_PRIMARY:
- 		if (++data->pri_mi2s_clk_count == 1) {
-@@ -166,30 +216,66 @@ static int sc7180_snd_startup(struct snd_pcm_substream *substream)
- 					       SNDRV_PCM_STREAM_PLAYBACK);
- 		}
- 
-		snd_soc_dai_set_fmt(codec_dai,
-				    SND_SOC_DAIFMT_BC_FC |
-				    SND_SOC_DAIFMT_NB_NF |
-				    SND_SOC_DAIFMT_I2S);
-
-		/* Configure PLL1 for codec */
-		ret = snd_soc_dai_set_pll(codec_dai, pll_id, pll_source,
-					  pll_in, pll_out);
-		if (ret) {
-			dev_err(rtd->dev, "can't set codec pll: %d\n", ret);
-+		ret = sc7180_startup_realtek_codec(rtd);
-+		if (ret)
- 			return ret;
-+
-+		break;
-+	case MI2S_SECONDARY:
-+		break;
-+	case LPASS_DP_RX:
-+		break;
-+	default:
-+		dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__,
-+			cpu_dai->id);
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+static int sc7180_qdsp_snd_startup(struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_card *card = rtd->card;
-+	struct sc7180_snd_data *data = snd_soc_card_get_drvdata(card);
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+	int ret;
-+
-+	switch (cpu_dai->id) {
-+	case PRIMARY_MI2S_RX:
-+	case PRIMARY_MI2S_TX:
-+		if (++data->pri_mi2s_clk_count == 1) {
-+			snd_soc_dai_set_sysclk(cpu_dai,
-+					       Q6AFE_LPASS_CLK_ID_MCLK_1,
-+					       DEFAULT_MCLK_RATE,
-+					       SNDRV_PCM_STREAM_PLAYBACK);
-+			snd_soc_dai_set_sysclk(cpu_dai,
-+					       Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT,
-+					       MI2S_BCLK_RATE,
-+					       SNDRV_PCM_STREAM_PLAYBACK);
- 		}
- 
-		/* Configure sysclk for codec */
-		ret = snd_soc_dai_set_sysclk(codec_dai, clk_id, pll_out,
-					     SND_SOC_CLOCK_IN);
-+		snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_BP_FP);
-+
-+		ret = sc7180_startup_realtek_codec(rtd);
- 		if (ret)
-			dev_err(rtd->dev, "snd_soc_dai_set_sysclk err = %d\n",
-				ret);
-+			return ret;
- 
- 		break;
-	case MI2S_SECONDARY:
-+	case TERTIARY_MI2S_RX:
-+		snd_soc_dai_set_sysclk(cpu_dai,
-+			               Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT,
-+			               MI2S_BCLK_RATE,
-+				       SNDRV_PCM_STREAM_PLAYBACK);
-+
-+		snd_soc_dai_set_fmt(codec_dai,
-+				SND_SOC_DAIFMT_BC_FC |
-+				SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_I2S);
-+		snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_BP_FP);
- 		break;
-	case LPASS_DP_RX:
-+	case DISPLAY_PORT_RX:
- 		break;
- 	default:
- 		dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__,
-@@ -247,6 +333,42 @@ static void sc7180_snd_shutdown(struct snd_pcm_substream *substream)
- 	}
- }
- 
-+static void sc7180_qdsp_snd_shutdown(struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_card *card = rtd->card;
-+	struct sc7180_snd_data *data = snd_soc_card_get_drvdata(card);
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+
-+	switch (cpu_dai->id) {
-+	case PRIMARY_MI2S_RX:
-+	case PRIMARY_MI2S_TX:
-+		if (--data->pri_mi2s_clk_count == 0) {
-+			snd_soc_dai_set_sysclk(cpu_dai,
-+					       Q6AFE_LPASS_CLK_ID_MCLK_1,
-+					       0,
-+					       SNDRV_PCM_STREAM_PLAYBACK);
-+			snd_soc_dai_set_sysclk(cpu_dai,
-+					       Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT,
-+					       0,
-+					       SNDRV_PCM_STREAM_PLAYBACK);
-+		}
-+		break;
-+	case TERTIARY_MI2S_RX:
-+		snd_soc_dai_set_sysclk(cpu_dai,
-+			               Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT,
-+			               0,
-+				       SNDRV_PCM_STREAM_PLAYBACK);
-+		break;
-+	case DISPLAY_PORT_RX:
-+		break;
-+	default:
-+		dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__,
-+			cpu_dai->id);
-+		break;
-+	}
-+}
-+
- static int sc7180_adau7002_init(struct snd_soc_pcm_runtime *rtd)
- {
- 	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-@@ -295,11 +417,30 @@ static int sc7180_adau7002_snd_startup(struct snd_pcm_substream *substream)
- 	return 0;
- }
- 
-+static int sc7180_qdsp_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
-+				     struct snd_pcm_hw_params *params)
-+{
-+	struct snd_interval *rate = hw_param_interval(params,
-+					SNDRV_PCM_HW_PARAM_RATE);
-+	struct snd_interval *channels = hw_param_interval(params,
-+					SNDRV_PCM_HW_PARAM_CHANNELS);
-+
-+	rate->min = rate->max = 48000;
-+	channels->min = channels->max = 2;
-+
-+	return 0;
-+}
-+
- static const struct snd_soc_ops sc7180_ops = {
- 	.startup = sc7180_snd_startup,
- 	.shutdown = sc7180_snd_shutdown,
- };
- 
-+static const struct snd_soc_ops sc7180_qdsp_ops = {
-+	.startup = sc7180_qdsp_snd_startup,
-+	.shutdown = sc7180_qdsp_snd_shutdown,
-+};
-+
- static const struct snd_soc_ops sc7180_adau7002_ops = {
- 	.startup = sc7180_adau7002_snd_startup,
- };
-@@ -355,7 +496,7 @@ static int sc7180_snd_platform_probe(struct platform_device *pdev)
- 	struct snd_soc_dai_link *link;
- 	int ret;
- 	int i;
-	bool no_headphone = false;
-+	bool qdsp = false, no_headphone = false;
- 
- 	/* Allocate the private data */
- 	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
-@@ -391,6 +532,8 @@ static int sc7180_snd_platform_probe(struct platform_device *pdev)
- 		no_headphone = true;
- 		card->dapm_widgets = sc7180_adau7002_snd_widgets;
- 		card->num_dapm_widgets = ARRAY_SIZE(sc7180_adau7002_snd_widgets);
-+	} else if (of_device_is_compatible(dev->of_node, "qcom,sc7180-qdsp6-sndcard")) {
-+		qdsp = true;
- 	}
- 
- 	ret = qcom_snd_parse_of(card);
-@@ -401,6 +544,12 @@ static int sc7180_snd_platform_probe(struct platform_device *pdev)
- 		if (no_headphone) {
- 			link->ops = &sc7180_adau7002_ops;
- 			link->init = sc7180_adau7002_init;
-+		} else if (qdsp) {
-+			if (link->no_pcm == 1) {
-+				link->ops = &sc7180_qdsp_ops;
-+				link->be_hw_params_fixup = sc7180_qdsp_be_hw_params_fixup;
-+				link->init = sc7180_qdsp_init;
-+			}
- 		} else {
- 			link->ops = &sc7180_ops;
- 			link->init = sc7180_init;
-@@ -413,6 +562,7 @@ static int sc7180_snd_platform_probe(struct platform_device *pdev)
- static const struct of_device_id sc7180_snd_device_id[]  = {
- 	{.compatible = "google,sc7180-trogdor"},
- 	{.compatible = "google,sc7180-coachz"},
-+	{.compatible = "qcom,sc7180-qdsp6-sndcard"},
- 	{},
- };
- MODULE_DEVICE_TABLE(of, sc7180_snd_device_id);
-- 
-2.43.0
-
@@ -1,54 +0,0 @@
-From 389f71369f7a62199ff0af56ef9a23c1c86570e1 Mon Sep 17 00:00:00 2001
-From: David Wronek <davidwronek@gmail.com>
-Date: Thu, 24 Aug 2023 11:15:05 +0200
-Subject: [PATCH 13/17] arm64: dts: qcom: pm6150: Add resin and rtc nodes
-
-Add support for the RTC which is the same as on other PMICs and add the
-resin child node to the PM6150 PON device, both disabled by default.
-
-Signed-off-by: David Wronek <davidwronek@gmail.com>
-Tested-by: Nikita Travkin <nikita@trvn.ru>
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Link: https://lore.kernel.org/r/20230824091737.75813-3-davidwronek@gmail.com
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
---
- arch/arm64/boot/dts/qcom/pm6150.dtsi | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/pm6150.dtsi b/arch/arm64/boot/dts/qcom/pm6150.dtsi
-index 8a4972e6a24c..d1dccfdfb3cd 100644
--- a/arch/arm64/boot/dts/qcom/pm6150.dtsi
-+++ b/arch/arm64/boot/dts/qcom/pm6150.dtsi
-@@ -51,6 +51,14 @@ pm6150_pwrkey: pwrkey {
- 				bias-pull-up;
- 				linux,code = <KEY_POWER>;
- 			};
-+
-+			pm6150_resin: resin {
-+				compatible = "qcom,pm8941-resin";
-+				interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-+				debounce = <15625>;
-+				bias-pull-up;
-+				status = "disabled";
-+			};
- 		};
- 
- 		pm6150_temp: temp-alarm@2400 {
-@@ -86,6 +94,14 @@ pm6150_adc_tm: adc-tm@3500 {
- 			status = "disabled";
- 		};
- 
-+		pm6150_rtc: rtc@6000 {
-+			compatible = "qcom,pm8941-rtc";
-+			reg = <0x6000>, <0x6100>;
-+			reg-names = "rtc", "alarm";
-+			interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
-+			status = "disabled";
-+		};
-+
- 		pm6150_gpio: gpios@c000 {
- 			compatible = "qcom,pm6150-gpio", "qcom,spmi-gpio";
- 			reg = <0xc000>;
-- 
-2.43.0
-
@@ -1,34 +0,0 @@
-From f6bbe959dd47e534f2a006561be68cfb1bbf27c4 Mon Sep 17 00:00:00 2001
-From: Nikita Travkin <nikita@trvn.ru>
-Date: Tue, 5 Dec 2023 16:48:10 +0500
-Subject: [PATCH 14/17] arm64: dts: qcom: acer-aspire1: Enable RTC
-
-pm6150 has a read-only RTC that can be used to keep the time with some
-extra userspace tools. Enable it.
-
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Nikita Travkin <nikita@trvn.ru>
-Link: https://lore.kernel.org/r/20231205-aspire1-sound-v2-1-443b7ac0a06f@trvn.ru
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
---
- arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-index 2a80f4090085..ab8ec7958584 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-+++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-@@ -349,6 +349,10 @@ &pm6150_pon {
- 	status = "disabled";
- };
- 
-+&pm6150_rtc {
-+	status = "okay";
-+};
-+
- &qupv3_id_0 {
- 	status = "okay";
- };
-- 
-2.43.0
-
@@ -1,60 +0,0 @@
-From 28eac7fe663108b43c15d25566b03e8ccb71466c Mon Sep 17 00:00:00 2001
-From: Nikita Travkin <nikita@trvn.ru>
-Date: Tue, 5 Dec 2023 16:48:11 +0500
-Subject: [PATCH 15/17] arm64: dts: qcom: acer-aspire1: Correct audio codec
- definition
-
-When initially added, a mistake was made in the definition of the codec.
-
-Despite the fact that the DMIC line is connected on the side of the
-codec chip, and relevant passive components, including 0-ohm resistors
-connecting the dmics, are present, the dmic line is still cut in
-another place on the board, which was overlooked.
-
-Correct this by replacing the dmic configuration with a comment
-describing this hardware detail.
-
-While at it, also add missing regulators definitions. This is not a
-functional change as all the relevant regulators were already added via
-the other rail supplies.
-
-Fixes: 4a9f8f8f2ada ("arm64: dts: qcom: Add Acer Aspire 1")
-Signed-off-by: Nikita Travkin <nikita@trvn.ru>
-Link: https://lore.kernel.org/r/20231205-aspire1-sound-v2-2-443b7ac0a06f@trvn.ru
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
---
- .../arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-index ab8ec7958584..7bde69f39c8a 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-+++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-@@ -224,9 +224,22 @@ alc5682: codec@1a {
- 		AVDD-supply = <&vreg_l15a_1p8>;
- 		MICVDD-supply = <&reg_codec_3p3>;
- 		VBAT-supply = <&reg_codec_3p3>;
-+		DBVDD-supply = <&vreg_l15a_1p8>;
-+		LDO1-IN-supply = <&vreg_l15a_1p8>;
-+
-+		/*
-+		 * NOTE: The board has a path from this codec to the
-+		 * DMIC microphones in the lid, however some of the option
-+		 * resistors are absent and the microphones are connected
-+		 * to the SoC instead.
-+		 *
-+		 * If the resistors were to be changed by the user to
-+		 * connect the codec, the following could be used:
-+		 *
-+		 * realtek,dmic1-data-pin = <1>;
-+		 * realtek,dmic1-clk-pin = <1>;
-+		 */
- 
-		realtek,dmic1-data-pin = <1>;
-		realtek,dmic1-clk-pin = <1>;
- 		realtek,jd-src = <1>;
- 	};
- };
-- 
-2.43.0
-
@@ -1,212 +0,0 @@
-From d081eaf8adc96ae9ba68ffe3f69f3057ead4bc63 Mon Sep 17 00:00:00 2001
-From: Nikita Travkin <nikita@trvn.ru>
-Date: Tue, 5 Dec 2023 16:48:12 +0500
-Subject: [PATCH 16/17] arm64: dts: qcom: acer-aspire1: Add sound
-
-This laptop has two i2s speakers; an i2s audio codec for the headset
-jack; two DMIC microphones in the lid and the displayport audio channel.
-
-This commit adds the audio node that describes all of the above with the
-exception of the DMICs that require in-SoC digital codec to be brought
-up, which will be done later.
-
-Note that the displayport channel is connected here for completeness,
-but the displayport can't be used yet since the HPD signal is created by
-the embedded controller, which will be added later.
-
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Nikita Travkin <nikita@trvn.ru>
-Link: https://lore.kernel.org/r/20231205-aspire1-sound-v2-3-443b7ac0a06f@trvn.ru
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
---
- .../boot/dts/qcom/sc7180-acer-aspire1.dts     | 153 ++++++++++++++++++
- 1 file changed, 153 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-index 7bde69f39c8a..58f694d8e762 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-+++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-@@ -3,6 +3,7 @@
- /dts-v1/;
- 
- #include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/sound/qcom,q6asm.h>
- #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
- 
- #include "sc7180.dtsi"
-@@ -129,6 +130,113 @@ reg_lcm_3p3: panel-regulator {
- 		pinctrl-names = "default";
- 	};
- 
-+	sound: sound {
-+		compatible = "qcom,sc7180-qdsp6-sndcard";
-+		pinctrl-0 = <&pri_mi2s_active>, <&pri_mi2s_mclk_active>, <&ter_mi2s_active>;
-+		pinctrl-names = "default";
-+		model = "Acer-Aspire-1";
-+
-+		audio-routing =
-+			"Headphone Jack", "HPOL",
-+			"Headphone Jack", "HPOR";
-+
-+		multimedia1-dai-link {
-+			link-name = "MultiMedia1";
-+
-+			cpu {
-+				sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>;
-+			};
-+		};
-+
-+		multimedia2-dai-link {
-+			link-name = "MultiMedia2";
-+
-+			cpu {
-+				sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>;
-+			};
-+		};
-+
-+		multimedia3-dai-link {
-+			link-name = "MultiMedia3";
-+
-+			cpu {
-+				sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>;
-+			};
-+		};
-+
-+		multimedia4-dai-link {
-+			link-name = "MultiMedia4";
-+
-+			cpu {
-+				sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA4>;
-+			};
-+		};
-+
-+		primary-rx-dai-link {
-+			link-name = "Primary MI2S Playback";
-+
-+			cpu {
-+				sound-dai = <&q6afedai PRIMARY_MI2S_RX>;
-+			};
-+
-+			platform {
-+				sound-dai = <&q6routing>;
-+			};
-+
-+			codec {
-+				sound-dai = <&alc5682 0>;
-+			};
-+		};
-+
-+		primary-tx-dai-link {
-+			link-name = "Primary MI2S Capture";
-+
-+			cpu {
-+				sound-dai = <&q6afedai PRIMARY_MI2S_TX>;
-+			};
-+
-+			platform {
-+				sound-dai = <&q6routing>;
-+			};
-+
-+			codec {
-+				sound-dai = <&alc5682 0>;
-+			};
-+		};
-+
-+		tertiary-rx-dai-link {
-+			link-name = "Tertiary MI2S Playback";
-+
-+			cpu {
-+				sound-dai = <&q6afedai TERTIARY_MI2S_RX>;
-+			};
-+
-+			platform {
-+				sound-dai = <&q6routing>;
-+			};
-+
-+			codec {
-+				sound-dai = <&max98357a>;
-+			};
-+		};
-+
-+		displayport-rx-dai-link {
-+			link-name = "DisplayPort Playback";
-+
-+			cpu {
-+				sound-dai = <&q6afedai DISPLAY_PORT_RX>;
-+			};
-+
-+			platform {
-+				sound-dai = <&q6routing>;
-+			};
-+
-+			codec {
-+				sound-dai = <&mdss_dp>;
-+			};
-+		};
-+	};
-+
- 	reg_tp_3p3: touchpad-regulator {
- 		compatible = "regulator-fixed";
- 		regulator-name = "tp_3p3";
-@@ -366,6 +474,45 @@ &pm6150_rtc {
- 	status = "okay";
- };
- 
-+&q6afedai {
-+	dai@16 {
-+		reg = <PRIMARY_MI2S_RX>;
-+		qcom,sd-lines = <1>;
-+	};
-+
-+	dai@17 {
-+		reg = <PRIMARY_MI2S_TX>;
-+		qcom,sd-lines = <0>;
-+	};
-+
-+	dai@20 {
-+		reg = <TERTIARY_MI2S_RX>;
-+		qcom,sd-lines = <0>;
-+	};
-+
-+	dai@104 {
-+		reg = <DISPLAY_PORT_RX>;
-+	};
-+};
-+
-+&q6asmdai {
-+	dai@0 {
-+		reg = <0>;
-+	};
-+
-+	dai@1 {
-+		reg = <1>;
-+	};
-+
-+	dai@2 {
-+		reg = <2>;
-+	};
-+
-+	dai@3 {
-+		reg = <3>;
-+	};
-+};
-+
- &qupv3_id_0 {
- 	status = "okay";
- };
-@@ -374,6 +521,12 @@ &qupv3_id_1 {
- 	status = "okay";
- };
- 
-+&remoteproc_adsp {
-+	memory-region = <&adsp_mem>;
-+	firmware-name = "qcom/sc7180/acer/aspire1/qcadsp7180.mbn";
-+	status = "okay";
-+};
-+
- &remoteproc_mpss {
- 	firmware-name = "qcom/sc7180/acer/aspire1/qcmpss7180_nm.mbn";
- 	status = "okay";
-- 
-2.43.0
-
@@ -1,34 +0,0 @@
-From a69329189d779cadf5687ae294a6b62a714f7360 Mon Sep 17 00:00:00 2001
-From: Nikita Travkin <nikita@trvn.ru>
-Date: Wed, 20 Dec 2023 12:30:04 +0500
-Subject: [PATCH 17/17] HACK: arm64: dts: qcom: acer-aspire1: Enable
- DisplayPort block
-
-Signed-off-by: Nikita Travkin <nikita@trvn.ru>
---
- arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-index 58f694d8e762..bca950645a97 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-+++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-@@ -434,6 +434,15 @@ &mdss {
- 	status = "okay";
- };
- 
-+&mdss_dp {
-+	data-lanes = <0 1>;
-+
-+	vdda-1p2-supply = <&vreg_l3c_1p2>;
-+	vdda-0p9-supply = <&vreg_l4a_0p8>;
-+
-+	status = "okay";
-+};
-+
- &pm6150_adc {
- 	thermistor@4e {
- 		reg = <ADC5_AMUX_THM2_100K_PU>;
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-qcom-sc7180
 pkgver=6.1.39
-pkgrel=4
+pkgrel=3
 pkgdesc="Mainline kernel fork for Qualcomm Snapdragon 7c devices"
 arch="aarch64"
 _carch="arm64"
@@ -39,18 +39,6 @@ source="
 	0003-arm64-dts-qcom-sc7180-Don-t-enable-lpass-clocks-by-d.patch
 	0004-arm64-dts-qcom-sc7180-Drop-redundant-disable-in-mdp.patch
 	0005-arm64-dts-qcom-Add-Acer-Aspire-1.patch
-	0006-media-venus-core-Set-up-secure-memory-ranges-for-SC7.patch
-	0007-arm64-dts-qcom-sc7180-Split-up-TF-A-related-PSCI-con.patch
-	0008-remoteproc-qcom-pas-Add-sc7180-adsp.patch
-	0009-arm64-dts-qcom-sc7180-Add-tertiary-mi2s-pinctrl.patch
-	0010-arm64-dts-qcom-sc7180-Add-ADSP.patch
-	0011-ASoC-qcom-sc7180-Map-missing-jack-kcontrols.patch
-	0012-ASoC-qcom-sc7180-Add-support-for-qdsp6-baked-sound.patch
-	0013-arm64-dts-qcom-pm6150-Add-resin-and-rtc-nodes.patch
-	0014-arm64-dts-qcom-acer-aspire1-Enable-RTC.patch
-	0015-arm64-dts-qcom-acer-aspire1-Correct-audio-codec-defi.patch
-	0016-arm64-dts-qcom-acer-aspire1-Add-sound.patch
-	0017-HACK-arm64-dts-qcom-acer-aspire1-Enable-DisplayPort-.patch
 	$_config
 "
 builddir="$srcdir/linux-${_kernver//_/-}"
@@ -87,17 +75,5 @@ f1c85f9e7b2dbebba54eca7080589ee35be501854510fd54f1fb3db07b8cfb62276cb9359a40096a
 03b638baea7703227c398ba37824eeb17a96138aced4cc1e0769a265eb38788ac1fd150166a0af9e22f1364d053f20219b2b269310d01c32c4089682939021bf  0003-arm64-dts-qcom-sc7180-Don-t-enable-lpass-clocks-by-d.patch
 82761a3c53167dfb02091fb5305dca67b52872db3ecb14a42d782ba1346f046160d47a379fd88f0e3cb7ee91aa35a2eebe89304edb618df3895e2d469c9c8863  0004-arm64-dts-qcom-sc7180-Drop-redundant-disable-in-mdp.patch
 639784302e28afc562fc6d9673b12fbce49f11b5e2400ed5c460d5e157e7196092f33e1c67a1ee6bf8ad5b4dbb81f2f0263439662a1b68ea49c9201f63afe153  0005-arm64-dts-qcom-Add-Acer-Aspire-1.patch
-b09b67143e1adc26cb24954a31f3633aaf9624354ba27e69af685503a6621c6c7bad0b5b9c08535548e3e2885ccba7798542b97c4d217ab970ee504ba250595d  0006-media-venus-core-Set-up-secure-memory-ranges-for-SC7.patch
-04d746c6b5595097eec2a4bf37df06266a29080bedf7708bd54eb7b98a0b9a6d5581aef45070799b7d10ba94cd11d0ceb09486547e24bf2a597964e9e5566bc1  0007-arm64-dts-qcom-sc7180-Split-up-TF-A-related-PSCI-con.patch
-3f9c5b34f6869a9332ca8f260b385d0d7a5c4453d3fe682d864f53d44dceee9bd6bb370e75a60ce61c87b4224347f8cc8647c9d03f2bc2293d8e53ef327e2cc5  0008-remoteproc-qcom-pas-Add-sc7180-adsp.patch
-fe389611f991ba9de9e4662b2ed35a6790bbc18bb99fdc12eb281e5a4d5559ada3952a4024145007e9b8fbd3ed5fb862f56ad27f0ff36874decf24090d995f57  0009-arm64-dts-qcom-sc7180-Add-tertiary-mi2s-pinctrl.patch
-5fa7a4914ecd6e4ea47dce438cc1100f2747b082c71477859745147df801aede57ef6f1c54680a2c6ca85b61b791faa77210bd216bbe849681b2c558b6c6f152  0010-arm64-dts-qcom-sc7180-Add-ADSP.patch
-57c6f29b445ecd92f5fb1d5ca0a2783bccc1fbd3b1e51016db84370b75214fd70c832207f7c59cc00814db686d0ce03f33013138378c25aa18b8646148a296ac  0011-ASoC-qcom-sc7180-Map-missing-jack-kcontrols.patch
-08f1e646e1a387f1c5d01c954c87bdebd6fb13aa555eb3430331ffcfae0d6b61697ea4d35fb33b01bda801c92e9308f3a73ddf5b83a3074c009b2cce468f4d42  0012-ASoC-qcom-sc7180-Add-support-for-qdsp6-baked-sound.patch
-5e7dabdca52cf329b9a7fe77e6781cce07febda84592a93ea435b94e2707b6a8f3ae63a144070f5e203de4cd2608428cf9ec0c59fc2284bdd5b25bc995064264  0013-arm64-dts-qcom-pm6150-Add-resin-and-rtc-nodes.patch
-5c9d7bd7a97b704f512ea398c183778e7aba04d513f14c55dc70ba7a3677613805241f48409ec3af08f62d96c23bd197e0ead0a42c877ad91f7bc32c00b1b606  0014-arm64-dts-qcom-acer-aspire1-Enable-RTC.patch
-19441571468c89576da2087bfcfb8eaca253c67b41bd201ba123dafa33e5e6f424c9719b8fddf61cfce4d27f1b138718f200931eafc5edab5cb4da5b225ba410  0015-arm64-dts-qcom-acer-aspire1-Correct-audio-codec-defi.patch
-d6ecbd07481bf9852d330f1fbe004e0f70a45251956a37b730e4cbb3b7e3c03b34c9979749ab8857d39171382e87159cc54125fad7a0a02a33d4b502892fce9a  0016-arm64-dts-qcom-acer-aspire1-Add-sound.patch
-43cc38c2074a474a4386ab070bcc7b966527a607bc0adb345ce6d13f79b7714e46747ed2624831ae6ed48cf3b4ef387e4cc84247c3b7d13e69a7d1e64f7efe6f  0017-HACK-arm64-dts-qcom-acer-aspire1-Enable-DisplayPort-.patch
 9c664ab3d753f5ea7b65c77e026fcdb62e4f8f624941a7f64acc5960e6ef72f4616ebb7cb52dbb014884e4383ce3797dae4e2af829b80b06304158b5a7d1ea7e  config-postmarketos-qcom-sc7180.aarch64
 "
@@ -2,9 +2,9 @@

 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
-pkgver=6.7.0
-pkgrel=0
-pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
+pkgver=6.4.2
+pkgrel=1
+pkgdesc="Mainline Kernel fork for SM6350 devices"
 arch="aarch64"
 _carch="arm64"
 url="https://github.com/z3ntu/linux"
@@ -17,14 +17,14 @@ makedepends="bash bison findutils flex installkernel openssl-dev perl"

 _repo="linux"
 _config="config-$_flavor.$arch"
-_tag="v$pkgver-sm6350"
+_commit="f33e98821f41bc160a6985355c4a2d1dc5223afa"

 # Source
 source="
-	https://github.com/z3ntu/$_repo/archive/$_tag/$_repo-$_tag.tar.gz
+	$_repo-$_commit.tar.gz::https://github.com/z3ntu/$_repo/archive/$_commit/$_repo-$_commit.tar.gz
 	$_config
 "
-builddir="$srcdir/$_repo-$pkgver-sm6350"
+builddir="$srcdir/$_repo-$_commit"

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

 sha512sums="
-2129b3fbf2ac585130ef53c768597fe7d4372b3f1fbbcafeae4ed781d2643884735d349aae72c885a510f28179fb37d5c1075c75e8f72676b8ab4600ededaba8  linux-v6.7.0-sm6350.tar.gz
-0c1969970c48e9e589cc27896606bef0af5e389a0ee606b3f4468e844ea098f1f443edba8bfaa7d3edaaf877eb827bc148fbe6bae77dd3890980c9ebd10df3df  config-postmarketos-qcom-sm6350.aarch64
+310907bca81377fd4753cf9365ffa5e7eeef13fb0d14c99487f14a8284a717fcf70aa360c7612aa6970498f7241f4606d1ebcef0b3f2477d147b51af983a92ac  linux-f33e98821f41bc160a6985355c4a2d1dc5223afa.tar.gz
+5999fbbc61d789b639a530105298b31308b31886143317bb033634b58f10151676518949f18318d63bbf188f52958be5df4fa7dbd1ab204431a50464870897f6  config-postmarketos-qcom-sm6350.aarch64
 "
@@ -1,7 +1,7 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=soc-qcom-msm8953
 pkgdesc="Common package for Qualcomm MSM8953 devices"
-pkgver=5
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -14,7 +14,7 @@ subpackages="
 	$pkgname-ucm
 "

-_ucm_commit="8e86a324acb259021b2b657cd3284a41ba1d39ff"
+_ucm_commit="01b9629916bd51e47481b97a29a0078bb6a72aec"
 source="
 	$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8953-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz
 	90-feedbackd-pm8xxx-vib.rules
@@ -54,7 +54,7 @@ modem() {
 }

 sha512sums="
-62297173c94075d6cdca6df664b82b1450359faf9806122749541196a84871b1c93f0ec1b70fe5ba18a39362a172e8ebb9eff109b56410a29a3a7e23059495fc  soc-qcom-msm8953-8e86a324acb259021b2b657cd3284a41ba1d39ff.tar.gz
+03423f1247eafeb46f2c5e8e1c7bf29b3f6302d10f8acf8be962e34ecf1d6d812acf9d15147f47397a00d1661052aa45276155bc40ce9a8734076497d8b75142  soc-qcom-msm8953-01b9629916bd51e47481b97a29a0078bb6a72aec.tar.gz
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8xxx-vib.rules
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 23cff3b1796fc61fb494cf6ad7e25ca968dd6eb55ccd17d303c354d7a1638b25d7f152feb973b130d74cfcea2cb6aed45dfe3843ae491ffad1440fcf35389284  00-firmware.files
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=soc-qcom-sc7180
 pkgdesc="Common package for Qualcomm Snapdragon 7cx devices"
-pkgver=2
+pkgver=1.1
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -9,7 +9,6 @@ arch="aarch64"
 options="!check !archcheck !tracedeps"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-woa:nonfree_firmware_woa
 	$pkgname-vulkan
 "
 source="00-sc7180-nonstrict-iommu.sh"
@@ -28,20 +27,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

-nonfree_firmware_woa() {
-	pkgdesc="Modem, WiFi firmware"
-	depends="
-		$pkgname-nonfree-firmware
-		pd-mapper
-		pd-mapper-openrc
-		tqftpserv
-		tqftpserv-openrc
-	"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	mkdir "$subpkgdir"
-}
-
-
 vulkan() {
 	pkgdesc="Vulkan support for freedreno"
 	install_if="$pkgname=$pkgver-r$pkgrel vulkan-loader"
@@ -1,3 +0,0 @@
-#!/bin/sh
-rc-update add tqftpserv boot
-rc-update add pd-mapper boot
@@ -1 +0,0 @@
-soc-qcom-sc7180-nonfree-firmware-woa.post-install
@@ -2,8 +2,8 @@
 # Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=18
-pkgrel=0
+pkgver=17
+pkgrel=1
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -23,7 +23,7 @@ subpackages="
 	$pkgname-wireplumber
 "

-_ucm_commit="c5a680c08b39d4a665479c9bd30481a137b60cc4"
+_ucm_commit="9ed12836b269764c4a853411d38ccb6abb70b383"
 source="
 	10-initramfs-sdm845.files
 	51-qcom-sdm845.lua
@@ -132,7 +132,7 @@ sha512sums="
 a2eed80c1aa6bc2225aacd95888dbda7f13171008bf6433e1152be7b5148d03cad7bc1de081c64a3131e9fac12f75984f22be92e0f6162d524ce4c2db3bb82ba  51-qcom-sdm845.lua
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
-2094e0e24d82262becdf411d52078939aaf215b8a13eecead564e715891fa2c5cae38353347aa17fe41d58baa53a2819fbf065871aa1c49296e3b53b983e7526  alsa-ucm-conf-c5a680c08b39d4a665479c9bd30481a137b60cc4.tar.gz
+e55545b0b319bb0cb7e8c6ca961828f7e8c389f97b45492e0c432b9bbd5d3158359828e852ceac68cbead4f850c19e06ac565dac2dcae11d40486ba641e3e7ec  alsa-ucm-conf-9ed12836b269764c4a853411d38ccb6abb70b383.tar.gz
 6fb4c0bd8b7ed534d855a6732ccff783960e3cfa0e0cc7effcbb93afa00798dec15361a37a3200081bc114c8d266b7a0851cc4e819ad36eabdb47a50c72620d9  call_audio_idle_suspend_workaround.confd
 5a58475b6e2ee1d655f3f23d8dc19e1cb2f32f1dfff3b9a9337d9c5baad1ec24bfaec0fb9cc03f00e5a291bee27c6b8bffbc65157e2bee5d65ef6d1adcb0910b  call_audio_idle_suspend_workaround.initd
 aa5cdb138a3cdd0b15d2bbb60c7f67ae0280ddc7d0488cfe2fc44680095a43c1cdacc54d70a689f2117538e9bf1e42758d8c3ac542c9cb8e8dc6d6f3161b7577  call_audio_idle_suspend_workaround.sh
@@ -4,7 +4,7 @@
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=device-purism-librem5
 pkgver=1.51
-pkgrel=1
+pkgrel=0
 _confver=64
 _purismrel=1
 # <librem5-base ver>.<purism release>
@@ -17,7 +17,6 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf
 	bluez
-	bm818-tools
 	gnss-share
 	i2c-tools
 	iw
@@ -83,7 +83,7 @@ package() {
 }

 sha512sums="
-d192e12dee5dcb7792e2d78e97324fe17cb962e83f31ab7955a716624d1dea650e309a172448e2b6bc21c42ec7629ed7b9a6d083e1c8775598b69d6448e71ab2  linux-postmarketos-allwinner-orange-pi-6.6-20231128-2239.tar.gz
+cbe6be65087f086e3e4eca0f8c13496af910f8481f086a7a7acebb6edc7c92aa9bdf9828d64a532ecf3cecd213e8e9cc9c95786a6230507e40ad67afbd06f356  linux-postmarketos-allwinner-orange-pi-6.6-20231128-2239.tar.gz
 4da887f87dde1a3732ff663455e0e6f98df95936d55845d72991cacbc8c1d9dd489e53ac11b59f7355d24eba42f128ed8997460830b86bae44ede85f04857ec8  config-postmarketos-allwinner.aarch64
 682e62c6d98a9f74ed7bd569d7193f2b2fd87b150d5dc215963c5faafdd901706992626642d52a7bb026981f8036116c8b53062e1383bbcbd108ebb4a3c276d1  config-postmarketos-allwinner.armv7
 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367  0001-dts-add-dontbeevil-pinephone-devkit.patch
@@ -3,7 +3,7 @@
 # Co-Maintainer: Alistair Francis <alistair@alistair23.me>
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=linux-purism-librem5
-pkgver=6.6.6
+pkgver=6.6.3
 pkgrel=0
 # NOTE: Don't forget to rebase the config! See prepare() for instructions.
 _purismrel=1
@@ -83,6 +83,6 @@ package() {
 }

 sha512sums="
-5beee3b13b1ae54c88644407d3bfa2ff6b858a15e75a93154534c4e08b724d8f798c8bac1e342ff2501dbda89e51dbeade52df6ee57d167bfb6c81fc816ad6cb  linux-purism-librem5-6.6.6pureos1.tar.gz
-cf10149cf60b93bfc86325f7f299e207c1e682ef0f864d5c9caa43ecdb554d3eb04c1bda1b3320c207ae853f552f11b1e816a03bb971446c0f42981a5df27537  config-purism-librem5.aarch64
+dec223ce55e246e64457f340924089633fdf3fc76e9f0f6e6cb09b9b22c1e56badb90fcafa6beb57522274e9461ef015820b0d49b11f795dd0b64bfe7f5925a3  linux-purism-librem5-6.6.3pureos1.tar.gz
+1de4b309e6be924e057f0aca9d571628a6944b59d2543ce945d1dd2130e320f9c2a2622a5afd1392f32b8d90410f44cf4faaf552825e2221dc8b9c59b2ea57fb  config-purism-librem5.aarch64
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.6 Kernel Configuration
+# Linux/arm64 6.6.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-acer-aspire1
 pkgdesc="Acer Aspire 1"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,21 +12,13 @@ options="!check !archcheck pmb:strict"
 depends="
 	linux-postmarketos-qcom-sc7180
 	postmarketos-base
-	soc-qcom-sc7180
+	soc-qcom-sc8180x
 "
 makedepends="devicepkg-dev grub grub-efi"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-ucm
-"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	modules-initfs
-	ucm/sc7180.conf
-	ucm/Acer-Aspire-1/init.conf
-	ucm/Acer-Aspire-1/HiFi.conf
-	ucm/Acer-Aspire-1/Acer-Aspire-1.conf
-	ucm/Acer-Aspire-1/DP.conf
 "

 build() {
@@ -66,24 +58,6 @@ package() {
 		-t "$pkgdir"/boot/EFI/Boot
 }

-ucm() {
-	pkgdesc="UCM files for Acer Aspire 1"
-	install_if="$pkgname=$pkgver-r$pkgrel alsa-ucm-conf"
-
-	install -Dm644 -t "$subpkgdir"/usr/share/alsa/ucm2/Qualcomm/sc7180/ \
-		"$srcdir"/sc7180.conf
-
-	install -Dm644 -t "$subpkgdir"/usr/share/alsa/ucm2/Qualcomm/sc7180/Acer-Aspire-1/ \
-		"$srcdir"/init.conf \
-		"$srcdir"/HiFi.conf \
-		"$srcdir"/Acer-Aspire-1.conf \
-		"$srcdir"/DP.conf
-
-	mkdir -p "$subpkgdir"/usr/share/alsa/ucm2/conf.d/SC7180/
-	ln -s /usr/share/alsa/ucm2/Qualcomm/sc7180/sc7180.conf \
-		"$subpkgdir"/usr/share/alsa/ucm2/conf.d/SC7180/SC7180.conf
-}
-
 nonfree_firmware() {
 	pkgdesc="Modem, WiFi, Bluetooth and GPU Firmware"
 	depends="
@@ -91,7 +65,7 @@ nonfree_firmware() {
 		firmware-qcom-adreno-a630
 		linux-firmware-ath10k
 		linux-firmware-qca
-		soc-qcom-sc7180-nonfree-firmware-woa
+		soc-qcom-sc8180x-nonfree-firmware
 	"
 	mkdir "$subpkgdir"
 }
@@ -99,9 +73,4 @@ nonfree_firmware() {
 sha512sums="
 d1464b00c217c39fc7cfa446de802886114c2bc54b9c6b93fea4d3a139f5e51b605c879541b457dbfe0e3bca226dae216d5ecbd5ede4263533406042ae9615c6  deviceinfo
 99b3c6fee1e4088ad0246170b6884c5f342893efa4d4846c4e9fa47fbf58f2dc655b8379f465e7d690621630804634533392254fc4305fea6d292a9d5eb4795a  modules-initfs
-0626518d52fb56b80115e333030abe409fb5ca13aa7c13387e3f41e7d34c3b7c7da3ff06dd7062b79b5472f93119100bffa98f32f05f530623ccca7282777302  sc7180.conf
-ee33efa68a091f47ecaf51fc05f43fb7d5c62ec3eeaacb917dc1438edc4636eaba52c336645bf8a555b68b366a7dc40baf55895595ac7ac66cdeaa7ede86a72f  init.conf
-aa02be162bf7d17396c19f457a73b887b23ac3aaa43543532c2f94d45d5ecfe600a4ae52d6dc43ccfd33ca3fa817533187fb895623b68e3f65150a6db0adc418  HiFi.conf
-a39d5c3d0e80a008b69b736cfe0a121b45d1db72a1026b4ff7dbe9442fe7094e5599188bb6846382be6147bad4f5cc53bbd58d988c0d463f776cc57227cfb0a2  Acer-Aspire-1.conf
-08c6b1bd8685bb47cfebe3f3cc38f2cb6f04c95498dc1fe2b4dbff08a563cf51b5933c20a6d3cae021af80afe61aa32ce7550687eec71a89bd1ae8791ae4c5fb  DP.conf
 "
@@ -1,30 +0,0 @@
-Syntax 4
-
-SectionUseCase."HiFi" {
-	File "/Qualcomm/sc7180/Acer-Aspire-1/HiFi.conf"
-	Comment "HiFi quality Music."
-}
-
-# HACK: Kernel will return -22 if the display is not
-# connected. This produces a bunch of errors in dmesg
-# and PA refuses the profile right after.
-# The condition guards the profile to at least supress
-# those errors.
-#If."DP present" {
-#	Condition {
-#		Type String
-#		String1 "${sys:/class/drm/card0-USB-1/status}"
-#		String2 "connected"
-#	}
-#
-#	True {
-#		SectionUseCase."HDMI" {
-#			File "/Qualcomm/sc7180/Acer-Aspire-1/DP.conf"
-#			Comment "DisplayPort output."
-#		}
-#	}
-#}
-
-Include.card-init.File "/lib/card-init.conf"
-Include.ctl-remap.File "/lib/ctl-remap.conf"
-Include.init.File "/Qualcomm/sc7180/Acer-Aspire-1/init.conf"
@@ -1,26 +0,0 @@
-SectionVerb {
-	EnableSequence [
-		cset "name='DISPLAY_PORT_RX Audio Mixer MultiMedia4' 1"
-	]
-
-	DisableSequence [
-		cset "name='DISPLAY_PORT_RX Audio Mixer MultiMedia4' 0"
-	]
-
-	Value {
-		TQ "HiFi"
-	}
-}
-
-SectionDevice."DisplayPort" {
-	Comment "DisplayPort"
-
-	Value {
-		PlaybackChannels 2
-		PlaybackPCM "hw:${CardId},3"
-		PlaybackPriority 200
-		PlaybackMixerElem "DisplayPort"
-		PlaybackVolume "DisplayPort Playback Volume"
-		JackControl "HDMI Jack"
-	}
-}
@@ -1,114 +0,0 @@
-# Use case configuration for ALC5682+MAX98357A on SC7180
-
-SectionVerb {
-	EnableSequence [
-		cset "name='TERT_MI2S_RX Audio Mixer MultiMedia1' 1"
-		cset "name='PRI_MI2S_RX Audio Mixer MultiMedia2' 1"
-		cset "name='MultiMedia3 Mixer PRI_MI2S_TX' 1"
-		cset "name='DISPLAY_PORT_RX Audio Mixer MultiMedia4' 1"
-#		cset "name='MultiMedia5 Mixer VA_CODEC_DMA_TX_0' 1"
-	]
-
-	DisableSequence [
-		cset "name='TERT_MI2S_RX Audio Mixer MultiMedia1' 0"
-		cset "name='PRI_MI2S_RX Audio Mixer MultiMedia2' 0"
-		cset "name='MultiMedia3 Mixer PRI_MI2S_TX' 0"
-		cset "name='DISPLAY_PORT_RX Audio Mixer MultiMedia4' 0"
-#		cset "name='MultiMedia5 Mixer VA_CODEC_DMA_TX_0' 0"
-	]
-
-	Value {
-		TQ "HiFi"
-	}
-}
-
-SectionDevice."Speaker" {
-	Comment "Speaker"
-
-	Value {
-		PlaybackChannels 2
-		PlaybackPCM "hw:${CardId},0"
-		PlaybackPriority 100
-		PlaybackMixerElem "Speaker"
-		PlaybackVolume "Speaker Playback Volume"
-	}
-}
-
-SectionDevice."Headphones" {
-	Comment "Headphones"
-
-	EnableSequence [
-		cset "name='HPOL Playback Switch' 1"
-		cset "name='HPOR Playback Switch' 1"
-		cset "name='Stereo1 DAC MIXL DAC L1 Switch' 1"
-		cset "name='Stereo1 DAC MIXR DAC R1 Switch' 1"
-	]
-
-	DisableSequence [
-		cset "name='HPOL Playback Switch' 0"
-		cset "name='HPOR Playback Switch' 0"
-		cset "name='Stereo1 DAC MIXL DAC L1 Switch' 0"
-		cset "name='Stereo1 DAC MIXR DAC R1 Switch' 0"
-	]
-
-	Value {
-		PlaybackPCM "hw:${CardId},1"
-		PlaybackPriority 200
-		PlaybackMasterElem "DAC1"
-		PlaybackMixerElem "Headphone"
-		PlaybackVolume "Headphone Playback Volume"
-		JackControl "Headphone Jack"
-	}
-}
-
-#SectionDevice."Mic" {
-#	Comment "Internal Microphone"
-#
-#	EnableSequence [
-#		cset "name='VA DEC2 MUX' VA_DMIC"
-#		cset "name='VA DMIC MUX0' DMIC2"
-#		cset "name='VA_AIF1_CAP Mixer DEC2' 1"
-#		cset "name='VA_DEC2 Volume' 100"
-#	]
-#
-#	DisableSequence [
-#		cset "name='VA DMIC MUX0' ZERO"
-#		cset "name='VA_DEC2 Volume' 0"
-#		cset "name='VA_AIF1_CAP Mixer DEC2' 0"
-#	]
-#
-#	Value {
-#		CaptureChannels 2
-#		CapturePCM "hw:${CardId},4"
-#		CapturePriority 100
-#		CaptureMixerElem "ADC2"
-#	}
-#}
-
-SectionDevice."Headset" {
-	Comment "Headset Microphone"
-
-	EnableSequence [
-		cset "name='IF1 01 ADC Swap Mux' 2"
-		cset "name='Stereo1 ADC L1 Mux' 1"
-		cset "name='Stereo1 ADC R1 Mux' 1"
-		cset "name='Stereo1 ADC MIXL ADC1 Switch' 1"
-		cset "name='Stereo1 ADC MIXR ADC1 Switch' 1"
-	]
-
-	DisableSequence [
-		cset "name='Stereo1 ADC L1 Mux' 0"
-		cset "name='Stereo1 ADC R1 Mux' 0"
-		cset "name='Stereo1 ADC MIXL ADC1 Switch' 0"
-		cset "name='Stereo1 ADC MIXR ADC1 Switch' 0"
-	]
-
-	Value {
-		CaptureChannels 1
-		CapturePCM "hw:${CardId},2"
-		CapturePriority 200
-		CaptureMixerElem "STO1 ADC"
-		CaptureVolume "STO1 ADC Capture Volume"
-		JackControl "Headset Mic Jack"
-	}
-}
@@ -1,17 +0,0 @@
-BootSequence [
-	# Headphone
-	cset "name='HPOL Playback Switch' 0"
-	cset "name='HPOR Playback Switch' 0"
-	cset "name='Stereo1 DAC MIXL DAC L1 Switch' 0"
-	cset "name='Stereo1 DAC MIXR DAC R1 Switch' 0"
-
-	# Headset mic
-	cset "name='Stereo1 ADC L Mux' 0"
-	cset "name='STO1 ADC Capture Switch' on"
-	cset "name='RECMIX1L CBJ Switch' 1"
-	cset "name='CBJ Boost Volume' 3"
-	cset "name='Stereo1 ADC L1 Mux' 0"
-	cset "name='Stereo1 ADC R1 Mux' 0"
-	cset "name='Stereo1 ADC MIXL ADC1 Switch' 0"
-	cset "name='Stereo1 ADC MIXR ADC1 Switch' 0"
-]
@@ -1,11 +0,0 @@
-Syntax 4
-
-If.Aspire1 {
-	Condition {
-		Type RegexMatch
-		String "${sys:devices/virtual/dmi/id/chassis_vendor}-${sys:devices/virtual/dmi/id/product_family}"
-		Regex "Acer.*Aspire 1.*"
-	}
-	True.Include.Aspire1.File "/Qualcomm/sc7180/Acer-Aspire-1/Acer-Aspire-1.conf"
-	False.Error "SC7180 - ${sys:devices/virtual/dmi/id/board_vendor}-${sys:devices/virtual/dmi/id/product_family} model not supported"
-}
@@ -1,68 +0,0 @@
-# Maintainer: Clayton Craft <clayton@craftyguy.net>
-pkgname=device-generic-x86_64
-pkgdesc="Generic x86_64 system, with EFI"
-pkgver=9
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="x86_64"
-options="!check !archcheck"
-depends="
-	alsa-ucm-conf
-	postmarketos-base
-	systemd-boot
-"
-makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-initfs
-"
-install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages="
-	$pkgname-kernel-edge:kernel_edge
-	$pkgname-kernel-lts:kernel_lts
-	$pkgname-mesa
-"
-_pmb_recommends="
-	oem-intel
-	oem-amd
-"
-provides="device-tablet-x64uefi=$pkgver-r$pkgrel device-tablet-x86uefi=$pkgver-r$pkgrel"
-replaces="device-tablet-x64uefi device-tablet-x86uefi"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-mesa() {
-	install_if="$pkgname=$pkgver-r$pkgrel mesa-gl"
-	provides="device-tablet-x64uefi-mesa=$pkgver-r$pkgrel device-tablet-x86uefi-mesa=$pkgver-r$pkgrel"
-	replaces="device-tablet-x64uefi-mesa device-tablet-x86uefi-mesa"
-	depends="mesa-dri-gallium"
-	mkdir "$subpkgdir"
-}
-
-kernel_edge() {
-	pkgdesc="Alpine Edge kernel"
-	provides="device-tablet-x64uefi-kernel-edge=$pkgver-r$pkgrel device-tablet-x86uefi-kernel-edge=$pkgver-r$pkgrel"
-	replaces="device-tablet-x64uefi-kernel-edge device-tablet-x86uefi-kernel-edge"
-	depends="linux-edge"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_lts() {
-	pkgdesc="Alpine LTS kernel"
-	provides="device-tablet-x64uefi-kernel-lts=$pkgver-r$pkgrel device-tablet-x86uefi-kernel-lts=$pkgver-r$pkgrel"
-	replaces="device-tablet-x64uefi-kernel-lts device-tablet-x86uefi-kernel-lts"
-	depends="linux-lts"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-sha512sums="
-33f0450413c7b364390fdc715578b41389bced5ff69f04a2128155f5ad828ed0e1cc17a20b610eccf4bd99560e21be91e362faaa72e9decad4623f8669e8ab7a  deviceinfo
-d65ca12564ef032507c19359643794a14579fd1d065777f9042d40d38aad4d40d99c10aae9a3acd7799f4ad95651b6ca9d83335501d08869dc391f3050df4d1f  modules-initfs
-"
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Only display this message if none of the `oem-*` packages are installed
-if ! grep -Ex "oem-\b(\?|amd|intel)" /etc/apk/world 2>/dev/null; then
-	echo "* NOTE: This package no longer automatically installs OEM-specific drivers and firmware."
-	echo "* You will likely need to install one or both of these manually, depending on your hardware."
-	echo "* For AMD: apk add oem-amd"
-	echo "* For Intel: apk add oem-intel"
-fi
@@ -1 +0,0 @@
-device-generic-x86_64.post-install
@@ -1,37 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: markochk <markochk@proton.me>
-pkgname=device-huawei-berlin
-pkgdesc="Huawei Honor 6X"
-pkgver=0.1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	linux-huawei-berlin
-	mkbootimg
-	msm-fb-refresher
-	postmarketos-base
-"
-makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="Wifi firmware"
-	depends="firmware-huawei-berlin hisi-wlan"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-21fc9dbd9c7da1549e9204e0512a3fa5b55348f671d40a7d4d1e22577605c48e1867bf0a96d637cbe2bb48b6b1dfcd9c113c8a3fde727fb7483e5e242d1d81b6  deviceinfo
-"
@@ -1,30 +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="Huawei Honor 6X"
-deviceinfo_manufacturer="Huawei"
-deviceinfo_codename="huawei-berlin"
-deviceinfo_year="2016"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="loglevel=4 coherent_pool=512K page_tracker=on slub_min_objects=12 unmovable_isolate1=2:192M,3:224M,4:256M printktimer=0xfff0a000,0x534,0x538 androidboot.selinux=enforcing buildvariant=user"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_mtk_mkimage="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_header_version="0"
-deviceinfo_flash_offset_base="0x00478000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x07b88000"
-deviceinfo_flash_offset_second="0x00e88000"
-deviceinfo_flash_offset_tags="0x07988000"
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-jolla-sbj
 pkgdesc="Jolla phone"
-pkgver=1
-pkgrel=0
+pkgver=0.3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -69,7 +69,7 @@ nonfree_firmware() {

 sha512sums="
 19e2730f8bbf811f9a5849c1e5e677013c0c88ef2b843dac7ca743176dd9c8d5449c6b4a1f8fd8f4055f7753d9123fad2ada8e22ae40b240967176de585cf241  deviceinfo
-501fbd47a2302ba9320fcdba81c4d6b806d2ded3e0fa70ab486fc0ff6501216f702d4724ef2878df2d7deef5eb1f66b42a04981804e7cfe3b4dc6dbee2be0ce5  load-wlan-module
+22339e8b1c854e740034fe305d8447a88f7be98f8f2ef86b7e9ea6e373a30643993d95865c820df6c3598605d3390eb93a859c7a423f04de54a3b06a69adcb55  load-wlan-module
 a8cfde9dd3bc96d990038443e8d10a551f13536f017992ae23545d2f1e09b0f729e5cfd1f94f52a2a335335172f082925b91c980695a27f76f636343de795898  wcnss-wlan
 829c8c8699188b6d0347a947abdb66f44096ac3a35094fb4d574b8debb6cb410f1f403321fed2cf82678fc7f52cb156959124aa6c15f3ef728b7237d62240e7e  100-charging.rules
 e6241b7cebe2f970fb6d24ecd18edc55e92e73307594e6dda985fc9b0a2f5039313bb835b7969faf1d6aba9aed2cf97d4d7f24744e5d7528d3b7402b0dd72693  led-charging-sbj.sh
@@ -5,7 +5,7 @@ description="Loading wlan module"
 depend()
 {
 	need wcnss-wlan
-	before wlan
+	before wpa_supplicant
 }

 start()
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=3
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -37,7 +37,6 @@ nonfree_firmware() {
 	pkgdesc="Firmware for Bluetooth, Modem, WiFi, etc."
 	depends="
 		bootmac
-		firmware-lenovo-21bx
 		linux-firmware-ath11k
 		linux-firmware-qca
 		linux-firmware-qcom
@@ -57,7 +56,7 @@ vulkan() {
 }

 sha512sums="
-1ea027b43696d4e627b7eb481ba1c559ecf740c0c3a0b8244b79e5c9ce45c31a7606f8f1257fdd669e7073cb8cdfc8158b124f8f691c74057f8bbb663934b202  deviceinfo
-5e91aebdd5aa84eef2660c5cbecd27b1c3662f1707538d53764a74dc1e6cbac451b1041b9aaab92f087d44630036b10e5155a993dd4b2e54cba81637ddb47593  modules-initfs
-82f7719285434d8c7a5268ddc21d513bb3f3788eb3dd2df099e1c245add9d19719047b003a47edb077e095ebe09d9601b1312c001578e7dfa4ed61d72098ef74  firmware.files
+8c8e03e6061e72305442b27f3f6e0d096d4d7257ee3e2a9edbf1d87e0baf43a70417784465cad480d7bb557b00f012293e1a748c436937587ba5c007834274dc  deviceinfo
+84767961200e6c04928c34365d9c1daa7da90214690666f87e844f4a42d8f2abc551a4f353196babbabe6b3b4c0e754a2175e7a79d92d842804d6a31ef09410c  modules-initfs
+38da7bcdd603335feed1de8b477a289c5f9765ca8ce566b4ee144b49c4763ce41050cf29696ad38f4254b0190a48948f16f936857693d2b30196341e81b0233f  firmware.files
 "
@@ -15,7 +15,8 @@ deviceinfo_gpu_accelerated="true"
 deviceinfo_chassis="laptop"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
-deviceinfo_kernel_cmdline="console=null"
+# most parameters from: https://github.com/jhovold/linux/wiki/X13s#kernel-command-line
+deviceinfo_kernel_cmdline="console=null iommu.passthrough=0 iommu.strict=0 pcie_aspm.policy=powersupersave clk_ignore_unused arm64.nopauth efi=noruntime"

 # Bootloader related
 deviceinfo_flash_method="none"
@@ -4,16 +4,17 @@

 # Bluetooth
 /lib/firmware/qca/hpbtfw21.tlv
-# TODO: replace this if/when the fixed fw makes its way into linux-firmware-qca
-#/lib/firmware/qca/hpnv21.bin
-/lib/firmware/postmarketos/qca/hpnv21.bin
+/lib/firmware/qca/hpnv21.bin
+# TODO: not available yet in linux-firmware:
+#/lib/firmware/qca/hpnv21.8c

 # GPU
 /lib/firmware/qcom/a660_gmu.bin
 /lib/firmware/qcom/a660_sqe.fw

 # HW Video Decoding
-/lib/firmware/qcom/sc8280xp/LENOVO/21BX/qcvss8280.mbn
+# TODO: not available yet in linux-firmware:
+#/lib/firmware/qcom/sc8280xp/LENOVO/21BX/qcvss8280.mbn

 # remoteproc
 /lib/firmware/qcom/sc8280xp/LENOVO/21BX/adspr.jsn
@@ -3,8 +3,10 @@ nvme
 phy_qcom_qmp_pcie
 pcie_qcom

-# Keyboard, mouse, some on-board devices
+# Keyboard and mouse
 i2c_hid_of
+
+# Keyboard, mouse, some on-board devices
 i2c_qcom_geni

 # PWM, backlight
@@ -20,8 +22,6 @@ gpio_sbu_mux
 phy_qcom_qmp_combo

 # Display
-gpucc_sc8280xp
-dispcc_sc8280xp
+msm
 panel_edp
 phy_qcom_edp
-msm
@@ -1,45 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-linksys-jamaica
-pkgdesc="Linksys EA9350 V3"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="armv7"
-options="!check !archcheck"
-depends="
-	dtc
-	linux-linksys-jamaica
-	postmarketos-base
-	u-boot-tools
-"
-makedepends="devicepkg-dev"
-source="
-	boot-image.its
-	initfs-hook.sh
-	deviceinfo
-"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-	mkdir -p "$pkgdir/usr/share/u-boot/jamaica"
-	install -D -m644 "$srcdir/boot-image.its" \
-		"$pkgdir/usr/share/u-boot/jamaica"
-}
-
-nonfree_firmware() {
-	pkgdesc="Linksys EA9350 firmware"
-	depends="firmware-linksys-jamaica"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-c5c0f00a3da2e75b3670444e47ff6893597e7afb3ebc24abf90debc608e72d6cd1071c9435ffc7d64e44ec574c35862286662d882150ddaa33c6ea65181385ad  boot-image.its
-a172a3d613fd55b95f54b891f58a3f4f6289873a861f3c21186bcc5d85166a124960e578f475f419188c5ae7b084a16a7b8a1176e1f150c5ba65f1f554d29227  deviceinfo
-401f734389592e11fc9e6bb215f8fd708d27028a68bb770ddd5697a65df38552dd57c94a1edd95e0954e5458a80291895f1aa47dd21fe3e558dfb16aa49d21f8  initfs-hook.sh
-"
@@ -1,45 +0,0 @@
-/dts-v1/;
-
-/ {
-        description = "a";
-        #address-cells = <1>;
-
-        images {
-                kernel {
-                        description = "Kernel";
-                        data = /incbin/("vmlinuz");
-                        type = "kernel";
-                        arch = "arm";
-                        os = "linux";
-                        compression = "none";
-                        load = <0x41208000>;
-                        entry = <0x41208000>;
-                };
-                fdt {
-                        description = "DTB";
-                        data = /incbin/("/boot/dtbs/ipq5018-linksys-jamaica.dtb");
-                        type = "flat_dt";
-                        arch = "arm";
-                        compression = "none";
-                };
-		initrd {
-			description = "Initramfs image";
-			data = /incbin/("initramfs");
-			type = "ramdisk";
-			arch = "arm";
-			os = "linux";
-		};
-
-        };
-
-        configurations {
-                default = "standard";
-                standard {
-                        description = "Standard Boot";
-                        kernel = "kernel";
-                        fdt = "fdt";
-			ramdisk = "initrd";
-                };
-        };
-
-};    
@@ -1,22 +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="Linksys EA9350 V3"
-deviceinfo_manufacturer="Linksys"
-deviceinfo_codename="linksys-jamaica"
-deviceinfo_year="2019"
-deviceinfo_arch="armv7"
-deviceinfo_dtb="ipq5018-linksys-jamaica"
-deviceinfo_uboot_boardname="jamaica"
-
-# Device related
-deviceinfo_chassis="embedded"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_gpu_accelerated="false"
-
-# Bootloader related
-deviceinfo_kernel_cmdline="bootopt=64S3,32N2,32N2"
-deviceinfo_generate_uboot_fit_images="true"
-deviceinfo_boot_filesystem="fat32"
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Enable USB Power
-echo 482 > /sys/class/gpio/export
-echo "out" >/sys/class/gpio/gpio482/direction
-echo 0 >  /sys/class/gpio/gpio482/value
-# Wait 5 seconds to let the kernel detect the usb stick
-sleep 5
@@ -3,7 +3,7 @@
 pkgname=device-microsoft-surface-rt
 pkgdesc="Microsoft Surface RT"
 pkgver=6
-pkgrel=7
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -11,6 +11,7 @@ arch="armv7"
 options="!check !archcheck pmb:strict"
 depends="postmarketos-base
 	linux-postmarketos-grate
+	libvdpau-tegra
 	alsa-ucm-conf
 "
 makedepends="devicepkg-dev grub grub-efi"
@@ -67,7 +68,7 @@ nonfree_firmware() {

 x11() {
 	install_if="$pkgname xorg-server"
-	depends="xf86-video-opentegra libvdpau-tegra"
+	depends="xf86-video-opentegra"
 	mkdir "$subpkgdir"
 }

@@ -6,14 +6,15 @@

 pkgname=device-nvidia-tegra-armv7
 pkgdesc="NVIDIA Tegra ARMv7"
-pkgver=1.1
-pkgrel=1
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
 	alsa-ucm-conf
+	libvdpau-tegra
 	linux-postmarketos-grate
 	postmarketos-base
 "
@@ -40,11 +41,11 @@ nonfree_firmware() {

 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
-	depends="xf86-video-opentegra libvdpau-tegra"
+	depends="xf86-video-opentegra"
 	mkdir "$subpkgdir"
 }

 sha512sums="
-e8d7c637130642a5ee5438e7f401c1870ecd1dcdca0305ab73fabf3d8548db5f054aeeacaf48abc46189bc1efdcbb5549e8afed263880e07b4932aee418041fc  deviceinfo
+c10ccac99172735315dff76f098a37d7f96d505480c3afd0e4299a9dd131eefdcddade60c6bb0db9c2519e5d860ff9e389733a6e648b19c2198c26c3377d011e  deviceinfo
 8ea2030fb0c1ae181778b86dc36ed71a904dd51e1fb08114c2a124a693fc7b464cfbb14efa8422db716fb9a647afa367df094abcc14f1ccc51af8b9063de8847  modules-initfs
 "
@@ -7,7 +7,7 @@ deviceinfo_name="NVIDIA Tegra ARMv7"
 deviceinfo_manufacturer="NVIDIA"
 deviceinfo_codename="nvidia-tegra-armv7"
 deviceinfo_year="2011"
-deviceinfo_dtb="tegra*"
+deviceinfo_dtb="nvidia/*"
 deviceinfo_arch="armv7"

 # Device related
@@ -2,12 +2,16 @@
 pkgname=device-ouya-ouya
 pkgver=1
 pkgdesc="Ouya"
-pkgrel=27
+pkgrel=26
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
 options="!check !archcheck"
-depends="mkbootimg postmarketos-base"
+depends="
+	libvdpau-tegra
+	mkbootimg
+	postmarketos-base
+	"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -54,7 +58,7 @@ kernel_mainline() {

 x11() {
 	install_if="$pkgname xorg-server"
-	depends="xf86-video-opentegra libvdpau-tegra"
+	depends="xf86-video-opentegra"
 	mkdir "$subpkgdir"
 }

@@ -1,13 +1,13 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-coreprimevelte
 pkgdesc="Samsung Galaxy Core Prime VE LTE"
-pkgver=0.4
+pkgver=0.3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="linux-samsung-coreprimevelte postmarketos-base postmarketos-update-kernel mkbootimg u-boot-tools pxa-mkbootimg"
+depends="linux-samsung-coreprimevelte postmarketos-base mkbootimg u-boot-tools pxa-mkbootimg"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo"
@@ -27,5 +27,5 @@ nonfree_firmware() {
 }

 sha512sums="
-e9ed10e30e09b31f9f4cb148f3d0d2cef252f6c6a40161828d5bc7c8150772746d09e79c4d94614f2e2ce192f135e224cc0a9c61f1bdbd6cde2bc026018744af  deviceinfo
+5c4cdbb26db2718f7e4f019eae96de6bab66ec93a6e0eae034b09d1035c8299bd3fbb8a71aed5205032122c41e4c7299026d95adaaf9f2801ff1051b0ef29d74  deviceinfo
 "
@@ -24,7 +24,6 @@ deviceinfo_bootimg_qcdt="true"
 deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_bootimg_pxa="true"
-deviceinfo_flash_kernel_on_update="true"
 deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
@@ -1,31 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-gta7litewifi
-pkgdesc="Samsung Galaxy Tab A7 Lite"
-pkgver=0.2
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	linux-samsung-gta7litewifi
-	mkbootimg
-	postmarketos-base
-	msm-fb-refresher
-"
-makedepends="devicepkg-dev"
-source="
-	deviceinfo
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-sha512sums="
-2008c6bf8567f72f0dd8bc93d807fe9857a1ea16ebb3f26f5a886fa6b487379579e373adb537cc28439ce39c6a88dc89be8ffbb22d168c977b6bbaf7ae579d34  deviceinfo
-"
@@ -1,35 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy Tab A7 Lite"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-gta7litewifi"
-deviceinfo_year="2021"
-deviceinfo_dtb="mediatek/mt6765"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_chassis="tablet"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="800"
-deviceinfo_screen_height="1340"
-
-# Bootloader related
-deviceinfo_flash_method="mtkclient"
-deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 androidboot.tag=TabA7lite_Huaqin_BSP_20210408174009 loop.max_part=7"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_mtk_mkimage="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_header_version="2"
-deviceinfo_append_dtb="false"
-deviceinfo_flash_offset_dtb="0x07808000"
-deviceinfo_flash_offset_base="0x40078000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x11a88000"
-deviceinfo_flash_offset_second="0xbff88000"
-deviceinfo_flash_offset_tags="0x07808000"
@@ -2,7 +2,7 @@
 pkgname=device-samsung-i927
 pkgdesc="Samsung Captivate Glide"
 pkgver=0.3
-pkgrel=16
+pkgrel=15
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -12,7 +12,8 @@ depends="postmarketos-base
 	mkbootimg
 	alsa-utils
 	setxkbmap
-	pm-utils"
+	pm-utils
+	libvdpau-tegra"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-x11"
 source="deviceinfo
@@ -65,7 +66,7 @@ nonfree_firmware() {

 x11() {
 	install_if="$pkgname xorg-server"
-	depends="xf86-video-opentegra libvdpau-tegra"
+	depends="xf86-video-opentegra"
 	mkdir "$subpkgdir"
 }

@@ -1,9 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: AppleCross <ijiki16@freeuni.edu.ge>
 pkgname=device-samsung-logands
 pkgdesc="Samsung Galaxy Ace 3 Duos"
-pkgver=3.5.0
-pkgrel=0
+pkgver=3.4.5
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -12,17 +11,10 @@ depends="
 	linux-samsung-logands
 	mkbootimg
 	postmarketos-base
-	postmarketos-base-downstream
 	msm-fb-refresher
 "
 makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
-source="
-	deviceinfo
-	modules-load.conf
-"
+source="deviceinfo"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -32,13 +24,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }

-nonfree_firmware() {
-	pkgdesc="WiFi firmware"
-	depends="firmware-samsung-logands"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
-56e035a7185c241c03c6b9a3669b45cb8695e98d3f3b7f6a3a3aa02d35e2fb4b8dbc7d7884f0413113bd3a31c386aaa6fa3d366d043b059652fb6e7a281e4574  deviceinfo
-d7ab8040186524169440cb8264757943d47015f1ebfa1decc416d8bda7c2de8cfebef1b714421f86f37e23b6004482d6cb9b7f1ca83da9a73d11e5fd38b105f7  modules-load.conf
+231a4ff31c4c3fd8182f81647e3d8e7fa07c51cecfdb01a506d8511f2c63a627c9c1b85f4198341479a806891040177fd9de14691645b14c8debad2fd2ef111c  deviceinfo
 "
@@ -31,8 +31,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_heimdall_partition_kernel="KERNEL"
 deviceinfo_flash_heimdall_partition_system="system"
-deviceinfo_flash_sparse="true"
-# Samsung Electronics Co., Ltd
-deviceinfo_usb_idVendor="0x04e8"
-# Galaxy (MTP)
-deviceinfo_usb_idProduct="0x6860"
@@ -1,5 +0,0 @@
-# This file contains the names of kernel modules that should be loaded
-# at boot time, one per line. Lines beginning with "#" are ignored.
-
-# WiFi module
-dhd
@@ -2,7 +2,7 @@
 pkgname=device-samsung-p4wifi
 pkgdesc="Galaxy Tab 10.1"
 pkgver=0.5
-pkgrel=7
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -10,7 +10,8 @@ options="!check !archcheck"
 depends="postmarketos-base
 	linux-postmarketos-grate
 	mkbootimg
-	alsa-utils"
+	alsa-utils
+	libvdpau-tegra"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-x11"
 source="
@@ -48,7 +49,7 @@ nonfree_firmware() {

 x11() {
 	install_if="$pkgname xorg-server"
-	depends="xf86-video-opentegra libvdpau-tegra"
+	depends="xf86-video-opentegra"
 	mkdir "$subpkgdir"
 }

@@ -0,0 +1,108 @@
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-tablet-x64uefi
+pkgdesc="Various tablets with atom CPU"
+pkgver=0.4
+pkgrel=6
+url="https://postmarketos.org"
+license="MIT"
+arch="x86_64"
+# pmb:strict: avoid grub-related install error during build with pmbootstrap
+options="!check !archcheck pmb:strict"
+depends="
+	postmarketos-base
+	sof-firmware
+	"
+makedepends="
+	devicepkg-dev
+	grub
+	grub-efi
+	"
+subpackages="
+	$pkgname-libva
+	$pkgname-kernel-lts:kernel_lts
+	$pkgname-kernel-edge:kernel_edge
+	$pkgname-vulkan
+	"
+source="
+	deviceinfo
+	modules-initfs
+	grub_early.cfg
+	grub_edge.cfg
+	grub_lts.cfg
+	"
+
+build() {
+	devicepkg_build $startdir $pkgname
+
+	grub-mkimage \
+		--config="$srcdir/grub_early.cfg" \
+		--prefix="" \
+		--output="bootx64.efi" \
+		--format="x86_64-efi" \
+		--compression="xz" \
+		\
+		all_video \
+		cat \
+		configfile \
+		disk \
+		echo \
+		efi_gop \
+		fat \
+		gzio \
+		help \
+		iso9660 \
+		linux \
+		ls \
+		normal \
+		part_gpt \
+		part_msdos \
+		search \
+		search_label \
+		test \
+		true
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/bootx64.efi \
+		"$pkgdir"/boot/EFI/Boot/bootx64.efi
+}
+
+libva() {
+	install_if="$pkgname=$pkgver-r$pkgrel libva"
+	depends="intel-media-driver libva-intel-driver mesa-va-gallium"
+	mkdir "$subpkgdir"
+}
+
+kernel_edge() {
+	pkgdesc="Alpine Edge kernel"
+	depends="linux-edge"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+
+	install -Dm644 "$srcdir"/grub_edge.cfg \
+		"$pkgdir"/boot/grub/grub.cfg
+}
+
+kernel_lts() {
+	pkgdesc="Alpine LTS kernel"
+	depends="linux-lts"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+
+	install -Dm644 "$srcdir"/grub_lts.cfg \
+		"$pkgdir"/boot/grub/grub.cfg
+}
+
+vulkan() {
+	install_if="$pkgname vulkan-loader"
+	depends="mesa-vulkan-intel"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+1035baaccf774d6db6166b3f13b7fe4ac709dc681c7e846c67d1394fcd30753430dac8751ddce5dd79c9ba1a1c3ad11dd47559b7fd13ea7b5d75aa30b8b9a7a4  deviceinfo
+9606a2f61bfd9e0a2ea04fbe45e25093b702fd5b5cccf9f4f50768ee3b501251d8d3e1605485e5ec8f485b4bff7e44fe20d488f80736837654a9951391a97789  modules-initfs
+0f9357d4eea089628fbceb1e3e96d21a3f4329aeb6743158a6f877f967ef274506404eba949d5f01b7e1adea149f9a3aef992a5e8cd4181f93ab00909b1c5ecd  grub_early.cfg
+1fcae6891028bc07051e6e6faf9dd3ec2304c6165f9df05198f28a7fa2ba85c1dd8d07b72a5122d9628b67a2b0096ac180a9a2de0f391f9ce850c07dc79ac857  grub_edge.cfg
+e15beaf385a350a7c36be249cf9495e4622f7888c8def6ac47359ebd2ef2c994f954abec8ccb16b402269f949e6f6016d41711e6596f46ba3dad240f84ba163f  grub_lts.cfg
+"
@@ -1,23 +1,20 @@
 # Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
+# Please use double quotes only. You can source this file in shell scripts.

 deviceinfo_format_version="0"
-deviceinfo_name="generic x86_64 system"
-deviceinfo_manufacturer="generic"
-deviceinfo_codename="generic-x86_64"
-deviceinfo_year="1999"
+deviceinfo_name="Various tablets with atom CPU"
+deviceinfo_manufacturer="Various"
+deviceinfo_codename="tablet-x64uefi"
 deviceinfo_arch="x86_64"
+deviceinfo_gpu_accelerated="true"

 # Device related
 deviceinfo_chassis="tablet"
 deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
-deviceinfo_gpu_accelerated="true"
+deviceinfo_screen_width="800"
+deviceinfo_screen_height="600"

 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="PMOS_FORCE_PARTITION_RESIZE"
-deviceinfo_partition_type="gpt"
-deviceinfo_boot_filesystem="fat32"
-deviceinfo_generate_systemd_boot="true"
+deviceinfo_boot_filesystem="fat16"
@@ -0,0 +1,2 @@
+search --no-floppy --set=root --label "pmOS_boot"
+set prefix=($root)/grub
@@ -0,0 +1,6 @@
+timeout=0
+
+menuentry "postmarketOS" {
+	linux ($root)/vmlinuz-edge console=tty0 PMOS_NO_OUTPUT_REDIRECT
+	initrd ($root)/initramfs
+}
Author	SHA1	Message	Date
Joel Selvaraj	af96127d2f	device-oneplus-fajita: start hexagonrpcd on boot and configure accelerometer hexagonrpcd is necessary to provide access to the filesystem for the SDSP. Also, OP6T accelerometer is mounted differently than the screen, adjust it with a mount matrix. This way, screen rotations follow the actual screen rotation by the user.	2023-12-11 23:23:09 -08:00
Joel Selvaraj	78dd43c947	device-oneplus-enchilada: start hexagonrpcd on boot and configure accelerometer hexagonrpcd is necessary to provide access to the filesystem for the SDSP. Also, OP6 accelerometer is mounted differently than the screen, adjust it with a mount matrix. This way, screen rotations follow the actual screen rotation by the user.	2023-12-11 23:22:45 -08:00
Joel Selvaraj	74f48cf427	firmware-oneplus-sdm845: install sensor firmware files Sensor registry and DSP libraries are required for the SDSP	2023-12-11 23:22:18 -08:00
Dylan Van Assche	5014264961	device-shift-axolotl: start hexagonrpcd on boot Necessary to provide access to the filesystem for the SDSP	2023-12-11 23:22:18 -08:00
Dylan Van Assche	19defe325c	device-shift-axolotl: add accelerometer mount matrix SHIFT6mq accelerometer is mounted differently than the screen, adjust it with a mount matrix. This way, screen rotations follow the actual screen rotation by the user.	2023-12-11 23:22:18 -08:00
Dylan Van Assche	b68163f5e1	firmware-shift-sdm845: install sensor firmware files Sensor registry and DSP libraries are required for the SDSP	2023-12-11 23:02:27 -08:00
				`@@ -1 +0,0 @@`
				`soc-qcom-sc7180-nonfree-firmware-woa.post-install`