systemd/systemd: lower systemd-resolved provider_priority

Currently we do not package the configurations needed to use systemd-resolved as a replacement for openresolv. Without this patch current systems that have wireguard-tools installed will automatically pull systemd-resolved. See https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/80058/diffs
linux-postmarketos-mediatek-mt8173: upgrade to 6.13.5 (MR 6262)
2025-02-28 01:23:22 -05:00 · 2025-02-27 23:39:19 +01:00 · 2025-02-27 12:06:55 -08:00 · 2025-02-27 09:57:13 -08:00 · 2025-02-27 09:48:03 -08:00 · 2025-02-27 17:00:24 +00:00
305 changed files with 12335 additions and 9865 deletions
@@ -43,7 +43,7 @@ update_linux_next() {
 	# shellcheck source=/dev/null
 	pkgver=$(. device/testing/linux-next/APKBUILD; echo "$pkgver")

-	curl -s "https://gitlab.com/linux-kernel/linux-next/-/tags?format=atom" | grep -oP "(?<=<title>)[^<]+" | tail -n +2 > /tmp/tags
+	curl -s https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/refs/tags/ | grep -oE "<a href='.*'>(.*)</a>.*\.tar\.gz</a>" | awk -F'[<>]' '{print $3}' > /tmp/tags

 	latest=$(grep -v "v" < /tmp/tags | head -n1)
 	if [ -z "$latest" ]; then
@@ -115,13 +115,27 @@ if __name__ == "__main__":
        # To do this automatically, run 'pmbootstrap config auto_zap_misconfigured_chroots yes'.
        common.run_pmbootstrap(["config", "auto_zap_misconfigured_chroots", "yes"])

-        verify_only = common.commit_message_has_string("[ci:skip-build]")
-        if verify_only:
-            # [ci:skip-build]: verify checksums
-            print("WARNING: not building changed packages for extra-repos/systemd: ([ci:skip-build])!")
-            print("verifying checksums: " + ", ".join(systemd_pkgs))
-            verify_checksums(systemd_pkgs, arch)
+        # filter out packages that can't be built for arch
+        # (Iterate over copy of `systemd_pkgs`, because we modify it in this loop)
+        for package in systemd_pkgs.copy():
+            apkbuild_path = pmb.helpers.pmaports.find(package, True, True, with_extra_repos="enabled")
+            apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
+            if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
+                print(f"(extra-repos/systemd) {package}: not enabled for {arch}, skipping")
+                systemd_pkgs.remove(package)
+
+        # No packages: skip build
+        if len(systemd_pkgs) == 0:
+            print(f"no packages changed, which can be built for {arch}")
+
        else:
-            # Build packages
-            print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(systemd_pkgs)}")
-            build_strict(systemd_pkgs, arch)
+            verify_only = common.commit_message_has_string("[ci:skip-build]")
+            if verify_only:
+                # [ci:skip-build]: verify checksums
+                print("WARNING: not building changed packages for extra-repos/systemd: ([ci:skip-build])!")
+                print("verifying checksums: " + ", ".join(systemd_pkgs))
+                verify_checksums(systemd_pkgs, arch)
+            else:
+                # Build packages
+                print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(systemd_pkgs)}")
+                build_strict(systemd_pkgs, arch)
@@ -24,7 +24,7 @@ sh_files="
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
-	./device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.sh
+	./device/community/soc-qcom/call_audio_idle_suspend_workaround.sh

 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')
@@ -14,9 +14,6 @@ import pmb.parse._apkbuild
 from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob, pkgrepo_relative_path
 from pmb.core.arch import Arch

-# Cache for codeowners_parse
-codeowners_parsed = {}
-
 # Don't complain if these nicknames are the only maintainers of an APKBUILD,
 # because they are actually a group of people
 gitlab_groups = [
@@ -102,72 +99,12 @@ def test_aports_device_kernel():
                               f" <https://postmarketos.org/devicepkg>): {path}")


-def codeowners_parse():
-    global codeowners_parsed
-
-    pattern_prev = None
-    aports = pkgrepo_default_path()
-
-    with open(aports / "CODEOWNERS") as h:
-        for line in h:
-            line = line.rstrip()
-            if not line or line.startswith("#"):
-                continue
-
-            pattern_nicks = line.split()
-            assert len(pattern_nicks) > 1, f"CODEOWNERS line without nicks: {line}"
-
-            pattern = pattern_nicks[0]
-            if pattern.endswith("/"):
-                pattern += "*"
-
-            nicks = []
-            for word in pattern_nicks[1:]:
-                if word.startswith("@"):
-                    nicks += [word]
-            codeowners_parsed[pattern] = nicks
-
-            if pattern_prev:
-                assert pattern_prev <= pattern, "CODEOWNERS: please order entries alphabetically"
-            pattern_prev = pattern
-
-
-def require_enough_codeowners_entries(path, maintainers):
-    """
-    :param path: full path to an APKBUILD (e.g. /home/user/…/APKBUILD)
-    :param maintainers: list of one or more maintainers
-    """
-
-    _, path = pkgrepo_relative_path(path)
-
-    nicks = set()
-    for pattern, pattern_nicks in codeowners_parsed.items():
-        if fnmatch.fnmatch(path, pattern):
-            for nick in pattern_nicks:
-                nicks.add(nick)
-
-    print(f"{path}:")
-    print(f"  APKBUILD: {maintainers}")
-    print(f"  CODEOWNERS: {nicks}")
-
-    if len(nicks) < len(maintainers):
-        for nick in nicks:
-            if nick in gitlab_groups:
-                print(f"  -> {nick} is a group")
-                return
-
-    assert len(nicks) >= len(maintainers), \
-        f"{path}: make sure that each maintainer is listed in CODEOWNERS!"
-
-
 # @pytest.mark.xfail # Not all aports have been updated yet
 def test_aports_maintained():
    """
    Ensure that aports in /device/{main,community} have "Maintainer:" and
-    "Co-Maintainer:" (only required for main) listed in their APKBUILDs. Also
-    check that at least as many are listed in CODEOWNERS.
+    "Co-Maintainer:" (only required for main) listed in their APKBUILDs.
    """
-    codeowners_parse()

    for path in pkgrepo_iglob("device/main/*/APKBUILD"):
        if 'firmware-' in path.parent.name:
@@ -175,14 +112,12 @@ def test_aports_maintained():
        maintainers = pmb.parse._apkbuild.maintainers(path)
        assert maintainers and len(maintainers) >= 2, \
            f"{path} in main needs at least 1 Maintainer and 1 Co-Maintainer"
-        require_enough_codeowners_entries(path, maintainers)

    for path in pkgrepo_iglob("device/community/*/APKBUILD"):
        if 'firmware-' in path.parent.name:
            continue
        maintainers = pmb.parse._apkbuild.maintainers(path)
        assert maintainers, f"{path} in community needs at least 1 Maintainer"
-        require_enough_codeowners_entries(path, maintainers)


 def test_aports_unmaintained():
@@ -25,6 +25,7 @@ def test_aports_firmware():
        "firmware-samsung-maguro",  # Depends on firmware-aosp-broadcom-wlan
        "firmware-xiaomi-ferrari",  # Depends on soc-qcom-msm8916
        "firmware-xiaomi-willow",  # Doesn't build, source link is dead (pma#1212)
+        "firmware-samsung-i9105p", # Depends on firmware-aosp-broadcom-wlan
    ]

    for path in pkgrepo_iglob("**/firmware-*/APKBUILD", recursive=True):
@@ -34,8 +34,9 @@ device/*/*-qcom-msm8916/			@Minecrell @TravMurav
 device/*/*-qcom-msm8953/			@barni2000 @alikates @vipaoL @jiaxyga
 device/*/*-qcom-sdm670/				@flamingradian
 device/*/*-qcom-sdm845/				@sdm845-mainline
-device/*/*-qcom-sm6350/				@z3ntu
+device/*/*-qcom-sm7150/				@Adrian @jiaxyga @ungeskriptet
 device/*/*-qcom-sm8250/				@jianhua
+device/*/*-qcom/					@calebccff
 device/*/*-samsung-a3/				@Mis012 @TravMurav @Minecrell
 device/*/*-samsung-a5/				@Minecrell @minlexx
 device/*/*-samsung-a51/				@manoedinata
@@ -58,10 +59,12 @@ device/*/*-videostrong-kii-pro/			@funderscore
 device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
 device/*/*-xiaomi-beryllium/			@joelselvaraj
 device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
+device/*/*-xiaomi-davinci/			@Adrian @ArianK16a
 device/*/*-xiaomi-elish/			@jianhua
 device/*/*-xiaomi-markw/			@vipaoL
 device/*/*-xiaomi-mido/				@barni2000
 device/*/*-xiaomi-scorpio/			@Tooniis
+device/*/*-xiaomi-surya/			@jiaxyga @ungeskriptet
 device/*/*-xiaomi-tissot/			@jiaxyga @barni2000
 device/*/*-xiaomi-vince/			@M0Rf30
 device/*/*-xiaomi-wt88047/			@Minecrell
@@ -69,7 +72,6 @@ device/*/*-xiaomi-ysl/				@barni2000
 device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
 device/*/alsa-ucm-conf-qcom-sdm670/		@flamingradian
 device/*/device-apple-n61/			@JustSoup321
-device/*/device-fairphone-*/			@z3ntu
 device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
 device/*/device-google-nyan-big/		@jenneron
 device/*/device-google-nyan-blaze/		@jenneron
@@ -89,7 +91,7 @@ device/*/device-postmarketos-trailblazer/	@calebccff
 device/*/device-qcom-msm8909/			@wonderfulShrineMaidenOfParadise
 device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
 device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
-device/*/device-qemu-riscv64/			@Minecrell @z3ntu
+device/*/device-qemu-riscv64/			@Minecrell
 device/*/device-qualcomm-sdm845/		@calebccff
 device/*/device-raspberry-pi3/			@fossdd
 device/*/device-samsung-chagallwifi/		@Grimler
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.37.0
-pkgrel=13
+pkgrel=14

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

 sha512sums="
-74d5b024b94912ca13f14db4fef97b2de5aa8a86058a4d5fd877bd8e9235a20bff2dad358402d6f9044854ae2c0c4a701614b4aed17450edc6b6f10c19b8d208  busybox-static-1.37.0-r13-aarch64-edge.apk
+8f1f521eceb24a5f66e18e022b1151e96b40378051aaed911dc22e68dbffc5998c8f2bac3935423371c7e707f8931e97873c91c39d56dc2e34292567b3caceaf  busybox-static-1.37.0-r14-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.37.0
-pkgrel=13
+pkgrel=14

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

 sha512sums="
-7466d5181a005ad43c171d83c20fb4aee4ca3b5c915b7b244d9cadbf97cbc111611aa3f7b778d088323ed8549e51f0c96987aee344d992bb1540b8136d25983c  busybox-static-1.37.0-r13-armhf-edge.apk
+ce7dfd41a149faed98ae5ae08695223b57e8104a47c9c4c0e956a8c7cbd7fbc6b53b247f2c0f0633d72aa0aba8688f6ecfdd9784722b655f3c29dc1a2557f3e1  busybox-static-1.37.0-r14-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.37.0
-pkgrel=13
+pkgrel=14

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

 sha512sums="
-c24b2e00e3efe79eb153c8318433b29518d2740e72d2c42c1e3758a0d1aa90cfc72ee8b8e3e40cbca165726f37f302566ca815a996fb9120d12618564cad74a6  busybox-static-1.37.0-r13-armv7-edge.apk
+2f7003d0de894299a0260efd97bddfabd8d14d0e4b624445a77367036ad33c7ad65a85ee758969e671599ded5ee5674bda755c570ca4d9e95bba9c02b5788b8f  busybox-static-1.37.0-r14-armv7-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-0f874d6c7be3a69a69553d99c4b50ede6e3b92811052c13a36d8dd35955817f437f77e185d624804526d36e8cc6e99be4eedf8c2d3bcf09340068b1e41da5a49  musl-1.2.5-r9-aarch64-edge.apk
-2b85e131b5b8829a02ca5d6ab9bf3e897468834e6db9e5d54127037b5951f5c3ca06964d225d7d4376637ae77467c4001cbcc7f179705a6a206587ac8d7cd266  musl-dev-1.2.5-r9-aarch64-edge.apk
+8276aa0ce7368b87bf97f37d600639d475c059b984061125c6b648d2fecb838d87c8de9f19af32bad5862845c05368ccec0b328af3beb0fedc89a7ec0fb3babb  musl-1.2.5-r10-aarch64-edge.apk
+2da7a285fee8a1f2386d4a75cbf3c75cfbbaf88c617d50af0e0440fcd5d9825183772bb13f55f885137d6519c606791d3a8c576c5202818b2289f0db4c98720d  musl-dev-1.2.5-r10-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-10f462174d0fa0caaa4e4b767848b2d3a89c70617aca562cf0cd310ee2119eee8638b9eb2909a0756ee8e8952236624c1bacaac314b2d1146cf1c47b4c9b409d  musl-1.2.5-r9-armhf-edge.apk
-b9305bbe13d94de869d354f3657f59f1e08e897c2b6b0d0419a1dc384f00160dbf56df52b75196f238bcee62dd2e7e613755a91ee6e28776f6df38e5e9203de1  musl-dev-1.2.5-r9-armhf-edge.apk
+18e90cbe16c8084cbf8d91b36decde0d520778946258d4c84908e639741843d21b7e9e610f007e5126dcc6a3ba2289a862bc18cfd9b21d3bc64161483a5704cf  musl-1.2.5-r10-armhf-edge.apk
+7b46a6eb791beb511d9d40c5de3fc08d9b2fbf82b0538dfb171cdafd16d719687d3bb55e718a0f1eefcd0a8342d81fcb258928a3209ab1a874015054f5ffe501  musl-dev-1.2.5-r10-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-874994ef577a9651b444ddab90f8ac248b7b2ef8c4b0b7dda38d4ff2200e76a737e9dc27b63da5e7fd4022d18829badcdf99969cc52752d710ec598460cbe03d  musl-1.2.5-r9-armv7-edge.apk
-945a53e8ac24889bcc1bee2b9235fa743c6f653ca0f1611176797ae242eb26c19d3521ead290e9a759ffff38135073c6d2677879c891499c3a50f7f23ab0cead  musl-dev-1.2.5-r9-armv7-edge.apk
+cfd51c4655b612815af1e888228244640a4516dd8edd7a75131d6634c96d8ea6028e780b3c3e870dd22c4f89788f9f12594b4900a8df287161059687f1630857  musl-1.2.5-r10-armv7-edge.apk
+88f482c389479817700a5b2c8609bae9d152303b92b1a9c7bd464aa990975b7bd0990c7b185d6c66ecd0c3c0c5f7579fc52a618d4393e511e112c8992d682693  musl-dev-1.2.5-r10-armv7-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-eb1e36d35decc8df6c383845e73a703bb5e0f322ca4ba8c346a54652f6d3c9c46d1eef901031ccfaa3a52a132963a67f35f791480f5918c091f3141775e1b1b9  musl-1.2.5-r9-riscv64-edge.apk
-0cfa1711bc803674fb6504ed7466d73c2e35b735cbd78a5348bafd48973ed89afb877d966202d822f5e7d1064e99c1cc8452672478e3c6f30bac611328462c57  musl-dev-1.2.5-r9-riscv64-edge.apk
+4c76e3c4e94ab96d49c51ad01205e846280f851cff06b8c6ab8269d2ac99bbede29da9600fa60130c266d95da21bccdb00ad4b18123964774835e8014611e53e  musl-1.2.5-r10-riscv64-edge.apk
+27e6923fb43b1cd87b15e42edec6c658b7983b4e8c001bb67f5fc79cb124a46af92440e75676460eb3bed3a7acdd5ad142f03ba7dd040aae056431b8cc56818d  musl-dev-1.2.5-r10-riscv64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-809a21a20c1c0558c717b566c2fa53af05bb5eab0ca44bc1616b746f89fb4bf9ea05a733a6f4d6b674cd8d531c2734d3d44e38460c4939ac8e24423c91ad8e57  musl-1.2.5-r9-x86-edge.apk
-be193ac93468095cbecd9fbc84ee16b9fc2f5e7f5181b6759669cb180cdd31daf1b094eb9585e1ddc9b27be7cedc931a51eaca09c1dce191826f8b6f1c15587d  musl-dev-1.2.5-r9-x86-edge.apk
+7d53c9b8d328860e09e5e5835be9632e9ee6effb6ce4203817b12139a1c4c69ac71495bb575e696b16e9a1dde830729af1b5b4d9308bf2e4be0995f2d7e2843b  musl-1.2.5-r10-x86-edge.apk
+5d048109d3360c526216a6f47446c5e9315fed76ae24bc8238d08dcac80edd22ac3de9ae4fda8fc42fd2c70c676e8673811eddb991bf08ea500bf4ccd10e2a3e  musl-dev-1.2.5-r10-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-b762a06e161cfbdf3a62c155dd6b0d11d81b81543a2381b7ea0ccd56320f9ed14c52a19dd76033594cfefd3b5da20517a2fda3a7c94d7e43c0f378912237b62f  musl-1.2.5-r9-x86_64-edge.apk
-396a982f454b377df901bc465ec5e5ba8b91c2e9e9b6cd52ae28f83f4b5fbd673e7c79657ffa94d0d164e80d77dac813c5b7c51914fabcae3167d0bbc182b01a  musl-dev-1.2.5-r9-x86_64-edge.apk
+5d8ee4ca49019bf728f855cd296e36ac8ba9c16dc85f56c7b8bb6804788656584464ed9828f1eb5a14c1da1ca77906fae9d93174c44d03e003b6e1c2d1f445a6  musl-1.2.5-r10-x86_64-edge.apk
+788290a474910e15611f8a9165470fd5a633a579ca3a6f89f5f550864303949dedb286c6f0108db5490e8e05d0ce0dcfd749555b63b624ea8fcaffd9a0b201b9  musl-dev-1.2.5-r10-x86_64-edge.apk
 "
@@ -0,0 +1,26 @@
+# Maintainer: Danila Tikhonov <danila@jiaxyga.com>
+# Co-Maintainer: Jens Reidel <adrian@travitia.xyz>
+
+pkgname=alsa-ucm-conf-qcom-sm7150
+pkgver=1.2.11_git20240810
+pkgrel=0
+pkgdesc="ALSA UCM configuration for SM7150 devices"
+url="https://github.com/sm7150-mainline/alsa-ucm-conf"
+arch="aarch64"
+license="BSD-3-Clause"
+provides="alsa-ucm-conf"
+provider_priority=1
+_commit="dedbb209ed983a869b7aaceb883f8896c82d2296"
+source="$pkgname-$_commit.tar.gz::https://github.com/sm7150-mainline/alsa-ucm-conf/archive/$_commit.tar.gz"
+options="!check"
+builddir="$srcdir/alsa-ucm-conf-$_commit"
+
+package() {
+	# install audio config files
+	mkdir -p "$pkgdir"/usr/share/alsa
+	cp -r ucm2 "$pkgdir"/usr/share/alsa/
+}
+
+sha512sums="
+4c873c3e5b372f7075a38b8fd33723b47cf0ed2013b5ddccec64a4edc587d2f121eb80b930fa6d1ce98dd9ad55043eb1e3e152f1451f4491bc667353548acee7  alsa-ucm-conf-qcom-sm7150-dedbb209ed983a869b7aaceb883f8896c82d2296.tar.gz
+"
@@ -0,0 +1,27 @@
+# Maintainer: Caleb Connolly (kalube) <caleb@connolly.tech>
+# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+pkgname=alsa-ucm-conf-sdm845
+pkgver=1
+pkgrel=0
+pkgdesc="ALSA UCM configuration for Qualcomm SDM845 devices"
+url="https://postmarketos.org"
+arch="aarch64"
+license="BSD-3-Clause"
+provides="alsa-ucm-conf"
+provider_priority=1
+replaces="soc-qcom-sdm845-ucm"
+_commit="70d89261a7d30273fba9c6e67a072699f9f88151"
+source="$pkgname-$_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_commit/alsa-ucm-conf-$_commit.tar.gz"
+options="!check"
+builddir="$srcdir/$pkgname-$_commit"
+
+package() {
+	# install audio config files
+	mkdir -p "$pkgdir"/usr/share/alsa
+	cp -r "$srcdir/alsa-ucm-conf-$_commit"/ucm2 \
+		"$pkgdir"/usr/share/alsa/
+}
+
+sha512sums="
+f6d03f3b03f944b29b588464e2e26f4f4cc185368714f9e623c1211174ea172efb81a765980c9a289112f5bf8c5c4aafdfd87c0094890069fc3d7c73b29456bc  alsa-ucm-conf-sdm845-70d89261a7d30273fba9c6e67a072699f9f88151.tar.gz
+"
@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,7 +19,7 @@ depends="
 	firmware-fairphone-fp4-modem
 	firmware-fairphone-fp4-wlan
 	firmware-qcom-adreno-a630
-	hexagonrpcd
+	hexagonrpcd>=0.3.2-r3
 	hexagonrpcd-openrc
 	linux-firmware-ath10k
 	linux-postmarketos-qcom-sm6350
@@ -38,7 +38,6 @@ depends="
 	tqftpserv-openrc
 "
 makedepends="devicepkg-dev"
-replaces="hexagonrpcd-openrc"
 subpackages="$pkgname-openrc"
 source="
 	81-libssc-fairphone-fp4.rules
@@ -60,12 +59,13 @@ package() {
 	install -Dm644 "$srcdir"/90-feedbackd-aw8695.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-aw8695.rules
 	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$pkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 }

 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="hexagonrpcd-openrc"

 	mkdir -p "$subpkgdir"
 }
@@ -2,8 +2,8 @@
 # Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=16
-pkgrel=0
+pkgver=17
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -12,6 +12,7 @@ depends="
 	alsa-ucm-conf
 	postmarketos-base
 	systemd-boot
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
@@ -70,6 +71,6 @@ kernel_lts() {

 sha512sums="
 e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb  deviceinfo
-e464ef0ad4a4c34d2d53f69c4612b612ea878a77c9efdef69b0f842edf701036c8218809fd63aac286d6a08ae07f39e568199fc3e38d145e716c1723e7215019  modules-initfs
+7f0e1dab2eaf0616220a06a658245a297f2627f1b6a492ccf3bb9922c5b40aa6fd320c4ec5f909557bfc9b38985ef6bc58a67dd87fc46e0d9d35addbcfb2683d  modules-initfs
 9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881  30-gpu-i915-firmware.files
 "
@@ -12,6 +12,7 @@ mbcache
 mmc_block
 mmc_core
 nvme
+psmouse
 scsi_mod
 sd
 sd_mod
@@ -2,8 +2,8 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
-pkgver=7
-pkgrel=2
+pkgver=9
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,18 +19,17 @@ depends="
 	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-modem
-	soc-qcom-sdm845-nonfree-firmware
-	soc-qcom-sdm845-qbootctl
+	soc-qcom
+	soc-qcom-modem
+	soc-qcom-qbootctl
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr-msm.conf
 	81-libssc-google-sargo.rules
 	90-feedbackd-drv2624.rules
 	deviceinfo
-	hexagonrpcd-adsp-sensorspd.confd
+	hexagonrpcd.confd
 	modules-initfs
 	no-hexagonrpcd-on-suspend.sh
 	q6voiced.conf
@@ -42,20 +41,14 @@ build() {
 }

 package() {
-	replaces="
-		hexagonrpcd-nonfree-firmware
-		hexagonrpcd-nonfree-firmware-openrc
-		hexagonrpcd-openrc
-		 "
+	replaces="$pkgname-nonfree-firmware"
 	devicepkg_package $startdir $pkgname

 	install -Dm644 "$srcdir"/90-feedbackd-drv2624.rules \
 		-t "$pkgdir"/usr/lib/udev/rules.d
-	install -Dm644 "$srcdir"/10-unl0kr-msm.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr-msm.conf
 	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
-	install -Dm644 "$srcdir"/hexagonrpcd-adsp-sensorspd.confd \
-		"$pkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 	install -Dm644 "$srcdir"/81-libssc-google-sargo.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-google-sargo.rules

@@ -69,6 +62,7 @@ openrc() {
 	# Enable HexagonRPCD by default, but not if the user installed this
 	# package then disabled it.
 	install="$subpkgname.post-install"
+	depends="hexagonrpcd-openrc"

 	# The FastRPC service is only enabled when non-free firmware is installed.
 	install -Dm755 "$srcdir"/no-hexagonrpcd-on-suspend.sh \
@@ -76,11 +70,10 @@ openrc() {
 }

 sha512sums="
-f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr-msm.conf
 089ce0acba4e1d789e337bedfca7570796a6416e7230ae9b8fc6b625747a40dbb064b1a707877cd6b7bdc73844c6571316e2ec0746a77060f13d98c52fdbfc00  81-libssc-google-sargo.rules
 016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
 ad032b1a35cfcd4fc0c8df988430ee97b711e785b86cca68b7552b23a9a2e2b6b97c327e3415a575db47ad6c1f86ded18df5553acaae63010057d89b8c16135e  deviceinfo
-b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd-adsp-sensorspd.confd
+b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd.confd
 3213a3586c25cef843a47e2446179ff73acad6421826a64bedb6b9800d30673503d0ea6b3fcc8cfbdcdcaf0926755a489323fce9d14d4411799e6988144b3518  modules-initfs
 2972005a9cf6ca57061965075593dddfa8ee479bc6c21cd41851b1a14768cb1cddbd31a17975ae17adc36d40d294ccbc6bf83defbd69fc7b363f638d8564fbbc  no-hexagonrpcd-on-suspend.sh
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-veyron
 pkgdesc="Google Veyron Chromebooks"
-pkgver=7
+pkgver=8
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -53,6 +53,6 @@ nonfree_firmware() {


 sha512sums="
-abeebda841ae33d50008b891b4a29ccf4a7cf7be240b5913b701409e8621aa7210f685543b8ab7a9778b311359a197b4429af2b559716fa130d3af8447bef61d  deviceinfo
+d6a214d98ef6502ebed97dd2b774d9d7de1ac969d6d17513f413234e9698bd860248345520eb15f6b54fb0e06a793ba974f8548d397c9a72db31ecd506038008  deviceinfo
 be3e804fa538d9d377c637094dcf95e503e8a156fa71676a9e78abc0e290595dfdaa70b5642df721ebcdd3daa04d14e0c61d9bab6f78cb1dbd669404abc3a56d  modules-initfs
 "
@@ -27,3 +27,4 @@ deviceinfo_cgpt_kpart_size="32768"
 deviceinfo_depthcharge_board="veyron"
 deviceinfo_generate_depthcharge_image="true"
 deviceinfo_generate_extlinux_config="true"
+deviceinfo_create_initfs_extra="true"
@@ -2,7 +2,7 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=39
+pkgver=41
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
@@ -218,7 +218,7 @@ ff51909873160c2d4c6f0c0119b6d4a02751df29f571b8596b4bc8b04ce2541913c11a583b0e5dab
 344ec50cee2a4d864debad12810a83070ab8257f9f07dcfa9be3eea1d8b26f3ab4fbe322fe05a384152b40fc5e1481df51d191624c7062186dd70f95a0784ea8  bq27k-options.conf
 c5b8e03ca9f720a794f2593a3e938640cbd91ac44dd761079bbf4614a0d288a9d7b72de8ed2493c062dc9f37be580bea529f454d2335f55b7a9f4d14024b42a9  bq27k-monitor.sh
 e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef  device-nokia-n900.start
-40aaeb44941a988ab8ec58d331bc6cd42c4a23c6b6e8fc302f9216a38b46baab38d0a0137606a5b7959a51326983c03d684615c5ba9c58b0e36314ec8c49cfbb  deviceinfo
+34b41ddd4d0312cc632087d19ca881f7c75b885e3e977add1b20ad414901f075f3fca12bdfe2ba9b3f24baf1e99f8279f61887db4c4b70b4cb4bac76f358bc99  deviceinfo
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
 d7d1599a9952fd02d3cfbeaa6b3307251e765f98a9eb723237c94f585831cc8f11d9d30dbc0352e3b008224dec12b820cf86fa28a5e5ac303cfd03d80b8872f5  config-checker
 a8152e94262629e11abdd8809d187c3b7ed1866a6128fb1f435e17e72120536ac8114262e66df6decb2627743027f2b923ddbe8a94e3e844099b6fad02ec252b  i3blocks.conf
@@ -239,7 +239,7 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
 862ebc7cd2d7a1b3d41b10701b8418308c89eb0732eb99c42ec1091d48e08db9421727f67a3272b7309549798d59afb1b8d7d2fa48d1447b208fcb2329472d4d  modules.blocklist
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
 134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
-7eed68f7eab450e9c68534af9182065f1a8ea98e882adeae11da9db48dc6fbf4b4c440e38e1308b52074952bfa1496c88b5595e2ca03529785a92ec04d8c6baf  uboot-script.cmd
+42f916d87dd305111028992a1107bf6fe108bebbd782ae8edd065e76505db2b3a75e57515970c3e40cb0d1b7e83097a1bba92785be13df7c3fd80959a8d9c5c1  uboot-script.cmd
 465b9a0d2b46d0981c64b47cb1f656c2456a90b91b1751a2efad10af38a96030dd99108b1fd76ce31bf1ea0f236d55bed38b114d6bd712f09f8968de034c946c  10-nokia-modem.rules
 1acc441b9f83dc91fd65fa3f89b8205bfd72a465286bc181b4e7e92dd4b8c0bc5c20a18dab46ff3ee8ae70940efd7d767b3dfb920edb4c74377bd418b838693d  15-bq27k.rules
 03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
@@ -15,8 +15,6 @@ deviceinfo_arch="armv7"
 deviceinfo_keyboard="true"
 deviceinfo_keymaps="us/rx51_us ch/rx51_ch it/rx51_it fi/rx51_fi se/rx51_se"
 deviceinfo_external_storage="true"
-deviceinfo_screen_width="800"
-deviceinfo_screen_height="480"
 deviceinfo_swap_size_recommended="1024"

 # Bootloader related
@@ -2,7 +2,7 @@ setenv mmcnum 0
 setenv mmcpart 1
 setenv mmctype ext2
 setenv setup_omap_atag 1
-setenv bootargs init=/init.sh rw console=tty0
+setenv bootargs init=/init.sh rw console=tty0 PMOS_FORCE_PARTITION_RESIZE
 setenv mmckernfile /uImage
 setenv mmcinitrdfile /uInitrd
 setenv mmcscriptfile
@@ -1,2 +0,0 @@
-[quirks]
-fbdev_force_refresh=true
@@ -3,27 +3,26 @@

 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=14
-pkgrel=5
+pkgver=15
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
 	firmware-oneplus-sdm845>=9
-	hexagonrpcd
+	hexagonrpcd>=0.3.2-r3
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-modem
-	soc-qcom-sdm845-nonfree-firmware
-	soc-qcom-sdm845-qbootctl
-	soc-qcom-sdm845-ucm
+	alsa-ucm-conf-sdm845
+	soc-qcom
+	soc-qcom-modem
+	soc-qcom-qbootctl
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr.conf
 	deviceinfo
 	hexagonrpcd.confd
 	modules-initfs
@@ -40,20 +39,18 @@ package() {
 	replaces="$pkgname-nonfree-firmware"
 	devicepkg_package $startdir $pkgname

-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
 	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules \
 		-t "$pkgdir"/usr/lib/udev/rules.d/
 	install -Dm644 "$srcdir"/q6voiced.conf \
 		"$pkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$pkgdir"/etc/conf.d/hexagonrpcd-sdsp
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }

 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	replaces="hexagonrpcd-openrc $pkgname-nonfree-firmware-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="hexagonrpcd-openrc"
 	mkdir -p "$subpkgdir"
 }

@@ -66,7 +63,6 @@ pmtest() {
 }

 sha512sums="
-e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
 83fc698ebeda6245abc2a653eeff97b3b996d06dd7731386a07d102937f9b005c7277e0dece05ff359d9ff109a1d9ed7791fc510b146354df179804aadb5642c  deviceinfo
 c8d3026e9f803ea823e35f83dab66fa8545e99af9655576476c194567113084d78200feab46f84983a2dad608ca55c0a4a66e36406c6d64023c0aec59307d146  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
@@ -1,2 +0,0 @@
-[quirks]
-fbdev_force_refresh=true
@@ -3,8 +3,8 @@

 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=14
-pkgrel=3
+pkgver=15
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,13 +13,13 @@ depends="
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-ucm
-	soc-qcom-sdm845-qbootctl
+	alsa-ucm-conf-sdm845
+	soc-qcom
+	soc-qcom-qbootctl
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr.conf
 	deviceinfo
 	hexagonrpcd.confd
 	modules-initfs
@@ -39,29 +39,28 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname

-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
 }

 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
 	depends="
 		firmware-oneplus-sdm845>=9
-		hexagonrpcd
-		soc-qcom-sdm845-nonfree-firmware
-		soc-qcom-sdm845-modem
+		hexagonrpcd>=0.3.2-r3
+		soc-qcom-modem
 	"

 	install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$subpkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }

 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	replaces="hexagonrpcd-openrc"
+	depends="hexagonrpcd-openrc"

-	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
+	mkdir -p "$subpkgdir"
 }

 pmtest() {
@@ -73,7 +72,6 @@ pmtest() {
 }

 sha512sums="
-e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
 07e3d79715befccd1e7393908c06f88ac8468d1ce6cb96138e3a04e6f8274889db169f5daf05b04b633bcc9e85d11ea5c2017b84bc0ae86a8fad80b05794d0d8  deviceinfo
 6b5308471fcbb938ac00d6e9a3f8e61073bda1d608f2edf1a2aba4b256dd3f76b1ccee0873dcaa8dc4a8db304d433360a56fe447d70f57ba068428b75ddea236  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
@@ -5,7 +5,7 @@
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
 pkgver=15
-pkgrel=2
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,9 +15,9 @@ depends="
 	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-ucm
-	soc-qcom-sdm845-qbootctl
+	alsa-ucm-conf-sdm845
+	soc-qcom
+	soc-qcom-qbootctl
 	fwupd>=1.8.6
 "
 makedepends="devicepkg-dev postmarketos-test"
@@ -46,21 +46,23 @@ nonfree_firmware() {
 	pkgdesc="Modem, GPU and WiFi Firmware, also needed for osk-sdl"
 	depends="
 		firmware-shift-sdm845>=20230815-r2
+		hexagonrpcd>=0.3.2-r3
 		hexagonrpcd
-		soc-qcom-sdm845-nonfree-firmware
-		soc-qcom-sdm845-modem
+		soc-qcom-modem
 	"

 	install -Dm644 "$srcdir"/81-libssc-shift-axolotl.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$subpkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }

 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
-	replaces="hexagonrpcd-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="hexagonrpcd-openrc"

-	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
+	mkdir -p "$subpkgdir"
 }

 pmtest() {
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
 pkgver=12
-pkgrel=1
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,8 +11,8 @@ options="!check !archcheck"
 depends="
 	postmarketos-base
 	mkbootimg
-	soc-qcom-sdm845
-	soc-qcom-sdm845-ucm
+	alsa-ucm-conf-sdm845
+	soc-qcom
 "
 makedepends="devicepkg-dev"
 subpackages="
@@ -43,22 +43,24 @@ nonfree_firmware() {
 	pkgdesc="GPU, venus, modem and sensor firmware"
 	depends="
 		firmware-xiaomi-beryllium
-		soc-qcom-sdm845-nonfree-firmware
-		soc-qcom-sdm845-modem
+		hexagonrpcd>=0.3.2-r3
+		soc-qcom-modem
 		hexagonrpcd
 	"

 	install -Dm644 81-libssc-xiaomi-beryllium.rules \
 		"$subpkgdir"/etc/udev/rules.d/81-libssc-xiaomi-beryllium.rules
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$subpkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }

 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	replaces="hexagonrpcd-openrc"
+	depends="hexagonrpcd-openrc"

-	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
+	mkdir -p "$subpkgdir"
 }

 kernel_tianma() {
@@ -1,55 +1,44 @@
 # Maintainer: Jens Reidel <adrian@travitia.xyz>
+# Co-Maintainer: Arian Kulmer <arian.kulmer@web.de>
 # Reference: <https://postmarketos.org/devicepkg>

 pkgname=device-xiaomi-davinci
 pkgdesc="Xiaomi Mi 9T / Redmi K20"
-pkgver=3
-pkgrel=0
+pkgver=4
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-xiaomi-davinci
 	linux-postmarketos-qcom-sm7150
 	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sm7150
-	soc-qcom-sm7150-unl0kr-quirk
+	soc-qcom-sm7150>=2-r1
+	soc-qcom-sm7150-libssc-180-degrees
 "
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
+	hexagonrpcd.confd
 	modules-initfs
 "

-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
-
 build() {
 	devicepkg_build $startdir $pkgname
 }

 package() {
 	devicepkg_package $startdir $pkgname
-}

-nonfree_firmware() {
-	pkgdesc="Firmware for GPU, Audio, Modem, WiFi, etc."
-	depends="
-		firmware-xiaomi-davinci-adsp
-		firmware-xiaomi-davinci-cdsp
-		firmware-xiaomi-davinci-ipa
-		firmware-xiaomi-davinci-modem
-		firmware-xiaomi-davinci-venus
-		firmware-xiaomi-davinci-wlan
-		soc-qcom-sm7150-nonfree-firmware
-		"
-	mkdir "$subpkgdir"
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 }

 sha512sums="
 2350ec38791799ab0cd0ec12256669e421ad716870956c08885b14dac5bfd05b170314175671cb35bdb9f58a5737e35824be0007ccf0a1f7f671d033d1c948ee  deviceinfo
-474485963fb4ff97982894be2e024de09e6b3e7b324aceebde0480200998cfa92d68415752d59802bb63aebf7f2a343415d281938f2e308e5066ba08f3d79606  modules-initfs
+4c76b02069f12b4bca5ed76174bcb9d32055df6a458a4c7f6147ebaac70acd9cbe33a0741d3cb631168c3e24ba9b8c81f1a810ca0aae40528ffa622a3e1c6ea2  hexagonrpcd.confd
+2acf9e2a4a38c36866c8f31adfe83517f0773e35936920127e2cf49d43b24af67701deef81ffa610605caccbd560574f531e155f20da7126a27529ad8f70fd37  modules-initfs
 "
@@ -0,0 +1,2 @@
+# Xiaomi Mi 9T / Redmi K20 specific hexagonrpcd firmware directory
+hexagonrpcd_fw_dir="/usr/share/qcom/sm7150/Xiaomi/davinci"
@@ -0,0 +1,2 @@
+gtx8
+panel_samsung_ams639rq08
@@ -3,14 +3,15 @@
 pkgname=device-xiaomi-elish
 pkgdesc="Xiaomi Mi Pad 5 Pro"
 pkgver=5
-pkgrel=0
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	alsa-ucm-conf
 	bootmac
-	hexagonrpcd
+	hexagonrpcd>=0.3.2-r3
 	make-dynpart-mappings
 	mesa-vulkan-freedreno
 	mkbootimg
@@ -19,7 +20,6 @@ depends="
 	swclock-offset
 "
 makedepends="devicepkg-dev"
-replaces="hexagonrpcd-openrc"
 source="
 	81-libssc-xiaomi-elish.rules
 	alsa-ucm-conf/elish.conf
@@ -56,6 +56,9 @@ package() {

 	install -Dm644 "$srcdir"/81-libssc-xiaomi-elish.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-xiaomi-elish.rules
+
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }

 kernel_boe() {
@@ -91,9 +94,9 @@ nonfree_firmware() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="hexagonrpcd-openrc"

-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
+	mkdir -p "$subpkgdir"
 }

 sha512sums="
@@ -0,0 +1,59 @@
+# Maintainer: Danila Tikhonov <danila@jiaxyga.com>
+# Co-Maintainer: David Wronek <david@mainlining.org>
+# Reference: <https://postmarketos.org/devicepkg>
+
+pkgname=device-xiaomi-surya
+pkgdesc="Xiaomi POCO X3 NFC"
+pkgver=8
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	firmware-xiaomi-surya
+	make-dynpart-mappings
+	mkbootimg
+	postmarketos-base
+	soc-qcom-sm7150>=2-r1
+	soc-qcom-sm7150-libssc-180-degrees
+"
+makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-kernel-huaxing:kernel_huaxing
+	$pkgname-kernel-tianma:kernel_tianma
+"
+source="
+	deviceinfo
+	hexagonrpcd.confd
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
+}
+
+kernel_huaxing() {
+	pkgdesc="Huaxing Panel. To know which panel your device use and the status of the port, Visit the Xiaomi POCO X3 NFC wiki page: https://wiki.postmarketos.org/wiki/Xiaomi_POCO_X3_NFC_(xiaomi-surya)"
+	depends="linux-postmarketos-qcom-sm7150"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_tianma() {
+	pkgdesc="Tianma Panel. To know which panel your device use and the status of the port, Visit the Xiaomi POCO X3 NFC wiki page: https://wiki.postmarketos.org/wiki/Xiaomi_POCO_X3_NFC_(xiaomi-surya)"
+	depends="linux-postmarketos-qcom-sm7150"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+sha512sums="
+09cca64d70ab5b9350d4ca645d8f868906b5a9e90d7fd75bf7b9769b7b9ba18f98526675af2cf01b6369c1f36abf8ce47aea9fde6195927bb7735b151cf51bba  deviceinfo
+09fa0696c5d6bba9640fb74d2e5bf1200aab54a7282f3957c02a1c38a7e9d6d3d9d2d278c48d24678c7573382e1a3df6470fd6d1ca4b153dc8d4033eb5a4ea4a  hexagonrpcd.confd
+c280be70a5cd2a58d9129531987841f3915de741289deec5d3d81417848cc6fcd93bee13f7e14abc2abf6269280ff07a43fb60d06c3b639f160363caccc8a437  modules-initfs
+"
@@ -7,7 +7,8 @@ deviceinfo_name="Xiaomi POCO X3 NFC"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-surya"
 deviceinfo_year="2020"
-deviceinfo_dtb="qcom/sm7150-xiaomi-surya"
+deviceinfo_dtb_huaxing="qcom/sm7150-xiaomi-surya-huaxing"
+deviceinfo_dtb_tianma="qcom/sm7150-xiaomi-surya-tianma"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
 deviceinfo_flash_kernel_on_update="true"
@@ -0,0 +1,2 @@
+# Xiaomi POCO X3 (NFC) specific hexagonrpcd firmware directory
+hexagonrpcd_fw_dir="/usr/share/qcom/sm7150/Xiaomi/surya"
@@ -0,0 +1,4 @@
+nt36xxx_spi_ts
+panel_huaxing_nt36672c
+panel_tianma_nt36672c
+qcom_wled
@@ -1,3 +1,4 @@
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=firmware-fairphone-fp4
 pkgver=20240313
 pkgrel=1
@@ -0,0 +1,24 @@
+# Maintainer: Jens Reidel <adrian@travitia.xyz>
+# Co-Maintainer: Arian Kulmer <arian.kulmer@web.de>
+
+pkgname=firmware-xiaomi-davinci
+pkgver=2
+pkgrel=0
+pkgdesc="Firmware for Xiaomi Mi 9T / Redmi K20"
+url="https://github.com/sm7150-mainline/firmware-xiaomi-davinci"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+_commit="d2db810c4a040cc71a6c67d0500158ed29fee678"
+source="$pkgname-$_commit.tar.gz::$url/archive/$_commit/$pkgname-$_commit.tar.gz"
+builddir="$srcdir/$pkgname-$_commit"
+
+package() {
+	mkdir -p "$pkgdir"
+
+	find . -type f -exec install -Dm644 {} "$pkgdir"/{} \;
+}
+
+sha512sums="
+bdd2227424e7e9b1c33e7b07d71c0271b0a5f67fc4faf5114279e6c8203ee39cbba9253702bd2dbebd8d20ed159aa4ce26c01603d790441a91761061c6bd7ae8  firmware-xiaomi-davinci-d2db810c4a040cc71a6c67d0500158ed29fee678.tar.gz
+"
@@ -0,0 +1,31 @@
+# Maintainer: Danila Tikhonov <danila@jiaxyga.com>
+# Co-Maintainer: David Wronek <davidwronek@gmail.com>
+
+pkgname=firmware-xiaomi-surya
+pkgver=2
+pkgrel=0
+pkgdesc="Firmware for Xiaomi POCO X3 NFC"
+url="https://github.com/sm7150-mainline/firmware-xiaomi-surya"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+_commit="d480e0cf4136c5c763bdc90d15ac94a1600d5aae"
+source="
+	$pkgname-$_commit.tar.gz::$url/archive/$_commit/$pkgname-$_commit.tar.gz
+	30-touchscreen-firmware.files
+"
+builddir="$srcdir/$pkgname-$_commit"
+
+package() {
+	mkdir -p "$pkgdir"
+
+	find . -type f -exec install -Dm644 {} "$pkgdir"/{} \;
+
+	install -Dm644 "$srcdir/30-touchscreen-firmware.files" \
+		"$pkgdir/usr/share/mkinitfs/files/30-touchscreen-firmware.files"
+}
+
+sha512sums="
+592dd5084465da1a9527dd0e3372f65c057454bbe03344607d123c1b62c882b335c2408e0b376f9a7d7e1948420176279215d202522503ee34aebf85342271b0  firmware-xiaomi-surya-d480e0cf4136c5c763bdc90d15ac94a1600d5aae.tar.gz
+da17c49b62a6320a868e34c5ebbbfdecbf80eed714e8a87daacfc5eb8a1d3dd171e13af0d1f7a8ccb6ebf0a6d859a1c3b8173bbe791ce78fadd7b6d1579ec472  30-touchscreen-firmware.files
+"
@@ -1,4 +1,4 @@
-From b7d36ebc48e833b5a3b10d6b8b8a84237a3c21ef Mon Sep 17 00:00:00 2001
+From c075e9114298bf9372653797cb4979826d743606 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Sat, 20 Apr 2019 01:19:48 +0200
 Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
@@ -532,5 +532,5 @@ index 000000000000..15a91f2d6202
 +	status = "disabled";
 +};
 -- 
-2.47.0
+2.48.1

@@ -1,4 +1,4 @@
-From a7d843454722a7c1459d3fde217242a9cb994415 Mon Sep 17 00:00:00 2001
+From da7dd9c1a895155148223c8add0b473517ffef6d Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:42:01 +0200
 Subject: [PATCH] dts: add pinetab-dev (old display panel)
@@ -57,5 +57,5 @@ index 000000000000..1e287f2fb9f3
 +	};
 +};
 -- 
-2.47.0
+2.48.1

@@ -1,4 +1,4 @@
-From 56f964722cb1e3cac06b62c458bc7816ed082cf6 Mon Sep 17 00:00:00 2001
+From eecd48370a60c69a3809c34996bbd13159841771 Mon Sep 17 00:00:00 2001
 From: Oliver Smith <ollieparanoid@postmarketos.org>
 Date: Tue, 20 Oct 2020 11:11:48 +0200
 Subject: [PATCH] dts: pinetab: add missing ohci1
@@ -28,5 +28,5 @@ index 419fe19b4a6f..e30034a1553b 100644
 	status = "okay";
 };
 -- 
-2.47.0
+2.48.1

@@ -1,4 +1,4 @@
-From 4637cf894ab29f1aadfe4649eeb2771fa0b087b1 Mon Sep 17 00:00:00 2001
+From 9ee0df20aa3e84bcec21f9807b8c60800366bcb2 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:44:51 +0200
 Subject: [PATCH] dts: pinetab: make audio routing consistent with pinephone
@@ -31,5 +31,5 @@ index e30034a1553b..b2a3c0f97ce1 100644
 			"ADCR", "Right ADC",
 			"Internal Microphone Left", "MBIAS",
 -- 
-2.47.0
+2.48.1

@@ -1,4 +1,4 @@
-From e8c11d3b0599a3fa5b4e26ef2e29e14c44d7639d Mon Sep 17 00:00:00 2001
+From 79d85f9fb8db684e8d941ed792b83cfcda8675d7 Mon Sep 17 00:00:00 2001
 From: Clayton Craft <clayton@craftyguy.net>
 Date: Wed, 16 Dec 2020 20:16:14 -0800
 Subject: [PATCH] dts: pinephone: drop modem-power node
@@ -139,7 +139,7 @@ index ec4927dfe9dc..57b651d695af 100644
 +	gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
 +};
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index dcd392fe6027..24b7f01fd901 100644
+index 231dca430e40..f9881b9923af 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
@@ -310,6 +310,17 @@ ec25_codec: ec25-codec {
@@ -169,5 +169,5 @@ index dcd392fe6027..24b7f01fd901 100644
 		regulator-max-microvolt = <3500000>;
 		gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
 -- 
-2.47.0
+2.48.1

@@ -1,4 +1,4 @@
-From 799dbd43278fffca8fbeaa54fdf84f338a02e58a Mon Sep 17 00:00:00 2001
+From 27b6053c340b2f733d891567d6829f60cf55095a Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:27:30 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
@@ -8,7 +8,7 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
 1 file changed, 27 insertions(+)

 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 86735430462f..9cc62595a355 100644
+index 222c170dde8b..a6d4a28b8e2d 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -2389,6 +2389,30 @@ static const struct panel_desc hannstar_hsd101pww2 = {
@@ -42,7 +42,7 @@ index 86735430462f..9cc62595a355 100644
 static const struct drm_display_mode hitachi_tx23d38vm0caa_mode = {
 	.clock = 33333,
 	.hdisplay = 800,
-@@ -4790,6 +4814,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4815,6 +4839,9 @@ static const struct of_device_id platform_of_match[] = {
 	}, {
 		.compatible = "hit,tx23d38vm0caa",
 		.data = &hitachi_tx23d38vm0caa
@@ -53,5 +53,5 @@ index 86735430462f..9cc62595a355 100644
 		.compatible = "innolux,at043tn24",
 		.data = &innolux_at043tn24,
 -- 
-2.47.0
+2.48.1

@@ -1,4 +1,4 @@
-From 9e37c946105f89b7c0dd828cc46d6d8e2a1206fa Mon Sep 17 00:00:00 2001
+From ed60f6aa0e0dd95bb4243ffb7fdc41661730a00d Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:29:37 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
@@ -10,7 +10,7 @@ Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
 create mode 100644 arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts

 diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index 54b156fca9bf..77593039273c 100644
+index 1356e9553bd6..5131a1329d63 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
@@ -111,6 +111,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
@@ -131,5 +131,5 @@ index 000000000000..4fcba20ffe48
 +	status = "okay";
 +};
 -- 
-2.47.0
+2.48.1

@@ -1,4 +1,4 @@
-From fa3aa6991720dff1e52620c4a33d324abdfffb5f Mon Sep 17 00:00:00 2001
+From 2fb141b57bf77c012e1d5ca1c39061375d5af2a1 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:11:22 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
@@ -8,7 +8,7 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
 1 file changed, 27 insertions(+)

 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 9cc62595a355..d3422731d598 100644
+index a6d4a28b8e2d..a2083d9c2552 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -2309,6 +2309,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
@@ -42,7 +42,7 @@ index 9cc62595a355..d3422731d598 100644
 static const struct display_timing hannstar_hsd070pww1_timing = {
 	.pixelclock = { 64300000, 71100000, 82000000 },
 	.hactive = { 1280, 1280, 1280 },
-@@ -4802,6 +4826,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4827,6 +4851,9 @@ static const struct of_device_id platform_of_match[] = {
 	}, {
 		.compatible = "giantplus,gpm940b0",
 		.data = &giantplus_gpm940b0,
@@ -53,5 +53,5 @@ index 9cc62595a355..d3422731d598 100644
 		.compatible = "hannstar,hsd070pww1",
 		.data = &hannstar_hsd070pww1,
 -- 
-2.47.0
+2.48.1

@@ -1,4 +1,4 @@
-From 82fcf9e97dbfc4ef5b4b69f0068c9f2182ebffe6 Mon Sep 17 00:00:00 2001
+From b81cff557b31142dc99e0c9dfb9c1f46325f46ca Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:18:58 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
@@ -10,7 +10,7 @@ Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
 create mode 100644 arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts

 diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index 77593039273c..ddc3b0deab8c 100644
+index 5131a1329d63..d2b111a88f1c 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
@@ -36,6 +36,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
@@ -274,5 +274,5 @@ index 000000000000..5f17902410c1
 +	status = "okay";
 +};
 -- 
-2.47.0
+2.48.1

@@ -1,4 +1,4 @@
-From abc29ce426228e7e7d8dcbcffc974c9e413db8ef Mon Sep 17 00:00:00 2001
+From 5d5544e3a06ad42e3677d19ce42eaf81d7196739 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Sat, 24 Aug 2019 01:36:44 +0200
 Subject: [PATCH] eMMC workaround
@@ -9,7 +9,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
 1 file changed, 5 insertions(+), 3 deletions(-)

 diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
-index 67895787138a..810fdc409984 100644
+index 30b596562281..c9b44a5ae1c0 100644
 --- a/drivers/mmc/host/sunxi-mmc.c
 +++ b/drivers/mmc/host/sunxi-mmc.c
@@ -1436,15 +1436,17 @@ static int sunxi_mmc_probe(struct platform_device *pdev)
@@ -34,5 +34,5 @@ index 67895787138a..810fdc409984 100644
 
 	ret = mmc_of_parse(mmc);
 -- 
-2.47.0
+2.48.1

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

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-index 332a9fe83ccd..6e53dadf543e 100644
+index d1f5daf63484..54f27ecff324 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
@@ -145,7 +145,7 @@ hdmi_out_con: endpoint {
@@ -34,5 +34,5 @@ index 332a9fe83ccd..6e53dadf543e 100644
 };
 
 -- 
-2.47.0
+2.48.1

@@ -3,9 +3,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=6.12.8_git20250104
-pkgrel=1
-_tag="orange-pi-6.12-20250104-1626"
+pkgver=6.13.2_git20250209
+pkgrel=0
+_tag="orange-pi-6.13-20250209-2341"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -79,18 +79,18 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
 }
 sha512sums="
-d9cd2978adf7f759515091bb3d933fc7299ceac8cba2d811d9645ad7c1b873fdb2e3fd60c022083a6e5922cec344e5e8db1cf68ca904d4f193cf22017b3120eb  linux-postmarketos-allwinner-orange-pi-6.12-20250104-1626.tar.gz
-2d52f3d3ddf6313701b199a0269b5e37d102cb40ccea720e8b947fe0c7fd9bfcf9435090dfcae2d55add825d49e4bf45c0b251ab082467a7b7e8fd1283b60641  config-postmarketos-allwinner.aarch64
-2519790ecbddc5e0e4c3babebd148e09fa76449a399c7671a35e718ebbff4a287812431b8bbdf64d4c95e4df43ebbdd8acbb909ec5c94395a329df0a27489f0b  config-postmarketos-allwinner.armv7
-3390171525fb75506ba54b4115df9b63b427799a80be55c9ddb457da4cbf389ef7ca581c2d92a820be7c198a4460b40c417e2585fc4eb8e58080cf81a6301ef9  0001-dts-add-dontbeevil-pinephone-devkit.patch
-4c8f53eca5d9569b594528c2d15d397b937049bace60457c6686762a5a6ed223945d8d37afa298ae158a62aeda373a79224ff93c951631c3c6ce999b3951577e  0002-dts-add-pinetab-dev-old-display-panel.patch
-a72ed92e86e736963a119c7509c2b8228e54ae6e4618e12b12a49a80484364d7613b17702654efcf42563947cb35d9ccb507a6a6bac8e33916899709a5d465b8  0003-dts-pinetab-add-missing-ohci1.patch
-d6d1c48a758415532b4cb29311c811d74196854cb034f64bfd23d5831b76cc51d655448243d98de9307fd1051fece8510ccdbea8d98fa8079f4e655c1ebd574f  0004-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
-7083ee60d374b549c43b09cb41c724c383b47d9595025ddcc6400e77f7549b5fccc42ccb386016717c710971e40f02762108739b3e5dd7c6243783431b185bbf  0005-dts-pinephone-drop-modem-power-node.patch
-e8b85f085cd14259ce7d1a93e8f41cbe72fad4127b939cc2892d49b50c87ee1ad6fa5f1558f6b927eddbca8cfa411d51f198d4499f277f3d192b34f0f34f6982  0006-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
-b5abdb1e063df81a4dbffa5a00c45463fba165599b88fff3eb778885c8dcefa48e53d40186f37593f1033d8316661abb73f7cbbabdcd501cc0d8f8e4337023ec  0007-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
-ba3082f7e4132ef06c3fa2b2f6249d1f8dc668b44415aa5a6b3a753c9a062ec9be8c7cf2d2d9ea7319c4e7f7747107b44a9665bcd87e075220f46026373127b6  0008-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
-eea7c4bd29c6663cf1efb337420fbfe1b46d7562fe487ea810f23429f691147df4e663763872f16144d55571bd853b1955aac794af1465253787df10c881bc8c  0009-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
-e39002aed5a3ff9a2b1e5d7b245cce92f6c4653523516ab22014261727d6fb971d5f8fedbaa988b84023ce2f35e78a832549616803d2170fc42ac5a28d5f1e38  0010-eMMC-workaround.patch
-86fed6beca29cb1003301fc34f8c2c9a9efac25d48e4dbda3e487c0be6dd44ba3ec6cd2c67c25b9a89d0e07dfa20f29bfe287bd5b59929dcba84da886c6020f9  0011-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+e9d6476a087b0174bc424051d5094801221ad69892adb3b37eeef084b39023781efaf26aa1e7d2bc477fb3422efd392a4f59371b8d08bf21c177aadc9c2bd7a3  linux-postmarketos-allwinner-orange-pi-6.13-20250209-2341.tar.gz
+b8d7eaf20a24d96bebe47f69f2a2013e0ad1bf4557e500b674c3adcb36b417ffbbe6988cfe1d4a660713cd26fa2e4fad1a44ceb695c7f62eb85d5e419c55ef2a  config-postmarketos-allwinner.aarch64
+f812930d20065b1b6e7b067d894f42afecc350420f94e5eb63fbef6e533e2e5ded99bd6e393119930a5c6ab0e933b925748bea6587666c0f6c4d328701a5db05  config-postmarketos-allwinner.armv7
+8e798cfeea93853454076469bf837f6045ee37fcce06fc97633acc2e7a6e50d0b2a28ea7e93029f1d7dc4fb1af735a78742519369501f914515c13dfd4abdff1  0001-dts-add-dontbeevil-pinephone-devkit.patch
+ecb29bd3d1c496a5885a5474329a721e01c0782890d6a36cc79594a8e4337e170bbfddee464f909449ff483ab81bdf1a22e660218ec8776aff174666bec86ed2  0002-dts-add-pinetab-dev-old-display-panel.patch
+869a00cdbec6fb7e6881f52f9db1334deb843644c0bd5689278a84d93296f6dfd2cfab2a404471cfd4e475d0351b61752a2d07c430a3611271562e3f69a659da  0003-dts-pinetab-add-missing-ohci1.patch
+a0026a054b0d5f90feedbe4c4c817e00f5963eef175c6f136ff15d053154983a83ab0f0753e28277cc5c34e73eb33872f64060121f0b06595a011c9c2647c757  0004-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+21931481c5244836343e114f28301e9862e0b4c7ced36b377c3447995b228673f5497473629be5408d38861b6f3f7f3b4d8cb2cc89ab9df9200998e1fb131592  0005-dts-pinephone-drop-modem-power-node.patch
+0fe9463ae3a89acb4b43e2413b674b537e84d0d05ff3bb8bac2231880dd7a5899a9ef49bd8dced9faf93284a511f81b955ecda208abadafb2acf4c850104684a  0006-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+d783289002ba16b3a0115fe21b8cd8601d2363eb905293b5afcc18541bef1a698ac26a9b514054490d92e93111ca14b9bd5ed8390f13b4f4136ca0afedd8b7a8  0007-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+a5358b61c94dd1c4d2bbb84080b9d3607fdb66bf8f9f61d9d43eb5fb26029f2f3f4a1c80a2e0c0ad26adfa8ce72b6fd250785efaa049331976cbffee20d87572  0008-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+1c1eeddd18be8deb6e8c4a02cfb1cf0e56ffb29055743c77423c70f87c9b989214d3054696bd0a360a47ce0f5a241d30b6f3f8fce56dc3f5c79baf7e93bff3c1  0009-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+85ad0b34c1b27fcf8664c0419eabf3d81f9d922b778755ecbbb622c18b31879a13e4377cdc6c86f5b52545377e8f9e9e8a1744ea76b8db3d3b56568a5b6d86e5  0010-eMMC-workaround.patch
+9b3b440e59cd981ee80c479ebae3f789256485506aa84a0247a0fb5ceb0005ffe3172609c8d4106daeddee3487c505565a6924e720f5de5cf0803b08a40f5a63  0011-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.8 Kernel Configuration
+# Linux/arm64 6.13.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -520,13 +520,21 @@ CONFIG_ARM64_MTE=y
 CONFIG_ARM64_EPAN=y
 # end of ARMv8.7 architectural features

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

+#
+# v9.4 architectural features
+#
+# end of v9.4 architectural features
+
 CONFIG_ARM64_SVE=y
 # CONFIG_ARM64_PSEUDO_NMI is not set
 CONFIG_RELOCATABLE=y
@@ -626,6 +634,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 # CPU frequency scaling drivers
 #
 CONFIG_CPUFREQ_DT=y
+# CONFIG_CPUFREQ_VIRT is not set
 CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=y
 CONFIG_ARM_SCPI_CPUFREQ=y
@@ -649,7 +658,6 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
-CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
 CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
 CONFIG_HAVE_NMI=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -743,6 +751,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_HAS_CC_PLATFORM=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -750,6 +759,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
 CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
+CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
 CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y

 #
@@ -1377,6 +1387,7 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_NF_DEFRAG_IPV6=y
 # CONFIG_NF_TABLES_BRIDGE is not set
 # CONFIG_NF_CONNTRACK_BRIDGE is not set
+# CONFIG_BRIDGE_NF_EBTABLES_LEGACY is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
@@ -1782,12 +1793,6 @@ CONFIG_PPKB_POWER_MANAGER=m
 # CONFIG_EEPROM_EE1004 is not set
 # end of EEPROM support

-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
 # CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_ALTERA_STAPL is not set
@@ -2753,6 +2758,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_LOGICVC is not set
 CONFIG_GPIO_MB86S7X=y
 CONFIG_GPIO_PL061=y
+# CONFIG_GPIO_POLARFIRE_SOC is not set
 # CONFIG_GPIO_SIFIVE is not set
 # CONFIG_GPIO_SYSCON is not set
 CONFIG_GPIO_XGENE=y
@@ -2795,6 +2801,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
 #
 # USB GPIO expanders
 #
+# CONFIG_GPIO_MPSSE is not set
 # end of USB GPIO expanders

 #
@@ -2925,6 +2932,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HS3001 is not set
 # CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_ISL28022 is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_POWERZ is not set
@@ -2987,6 +2995,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_NCT6683 is not set
 # CONFIG_SENSORS_NCT6775 is not set
 # CONFIG_SENSORS_NCT6775_I2C is not set
+# CONFIG_SENSORS_NCT7363 is not set
 # CONFIG_SENSORS_NCT7802 is not set
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
@@ -3535,6 +3544,7 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
 #
 # Raspberry Pi media platform drivers
 #
+# CONFIG_VIDEO_RP1_CFE is not set

 #
 # Renesas media platform drivers
@@ -3825,8 +3835,18 @@ CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_PANIC is not set
+CONFIG_DRM_CLIENT=y
+CONFIG_DRM_CLIENT_LIB=y
+CONFIG_DRM_CLIENT_SELECTION=y
+CONFIG_DRM_CLIENT_SETUP=y
+
+#
+# Supported DRM clients
+#
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
+# end of Supported DRM clients
+
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_DISPLAY_HELPER=y
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
@@ -3927,6 +3947,9 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_AMS581VF01 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_AMS639RQ08 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS427AP24 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
@@ -3936,6 +3959,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA8 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
@@ -3976,6 +4000,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_ITE_IT6263 is not set
 # CONFIG_DRM_ITE_IT6505 is not set
 # CONFIG_DRM_LONTIUM_LT8912B is not set
 # CONFIG_DRM_LONTIUM_LT9211 is not set
@@ -4000,6 +4025,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_TOSHIBA_TC358768 is not set
 # CONFIG_DRM_TOSHIBA_TC358775 is not set
 # CONFIG_DRM_TI_DLPC3433 is not set
+# CONFIG_DRM_TI_TDP158 is not set
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI83 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
@@ -4031,6 +4057,7 @@ CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 # CONFIG_TINYDRM_ILI9486 is not set
 # CONFIG_TINYDRM_MI0283QT is not set
 # CONFIG_TINYDRM_REPAPER is not set
+# CONFIG_TINYDRM_SHARP_MEMORY is not set
 # CONFIG_TINYDRM_ST7586 is not set
 # CONFIG_TINYDRM_ST7735R is not set
 # CONFIG_DRM_PL111 is not set
@@ -4220,8 +4247,15 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y

 # CONFIG_SND_SOC_CHV3_I2S is not set
 # CONFIG_SND_I2S_HI6210_I2S is not set
+
+#
+# SoC Audio for Loongson CPUs
+#
+# end of SoC Audio for Loongson CPUs
+
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
+CONFIG_SND_SOC_SDCA_OPTIONAL=m
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set

 #
@@ -4255,6 +4289,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_AC97_CODEC is not set
 # CONFIG_SND_SOC_ADAU1372_I2C is not set
 # CONFIG_SND_SOC_ADAU1372_SPI is not set
+# CONFIG_SND_SOC_ADAU1373 is not set
 # CONFIG_SND_SOC_ADAU1701 is not set
 # CONFIG_SND_SOC_ADAU1761_I2C is not set
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
@@ -4276,6 +4311,7 @@ CONFIG_SND_SOC_AK4613=m
 # CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_AW88395 is not set
 # CONFIG_SND_SOC_AW88261 is not set
+# CONFIG_SND_SOC_AW88081 is not set
 # CONFIG_SND_SOC_AW87390 is not set
 # CONFIG_SND_SOC_AW88399 is not set
 # CONFIG_SND_SOC_BD28623 is not set
@@ -4298,6 +4334,7 @@ CONFIG_SND_SOC_BT_SCO=m
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
 # CONFIG_SND_SOC_CS42L83 is not set
+# CONFIG_SND_SOC_CS42L84 is not set
 # CONFIG_SND_SOC_CS4234 is not set
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -4318,6 +4355,7 @@ CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
+# CONFIG_SND_SOC_ES8323 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_ES8328_SPI is not set
@@ -4364,6 +4402,7 @@ CONFIG_SND_SOC_EC25=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
 # CONFIG_SND_SOC_SMA1303 is not set
+# CONFIG_SND_SOC_SMA1307 is not set
 # CONFIG_SND_SOC_SPDIF is not set
 # CONFIG_SND_SOC_SRC4XXX_I2C is not set
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -4402,6 +4441,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_TSCS42XX is not set
 # CONFIG_SND_SOC_TSCS454 is not set
 # CONFIG_SND_SOC_UDA1334 is not set
+# CONFIG_SND_SOC_UDA1342 is not set
 # CONFIG_SND_SOC_WM8510 is not set
 # CONFIG_SND_SOC_WM8523 is not set
 # CONFIG_SND_SOC_WM8524 is not set
@@ -4440,6 +4480,8 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 # CONFIG_SND_SOC_NAU8824 is not set
+# CONFIG_SND_SOC_NTP8918 is not set
+# CONFIG_SND_SOC_NTP8835 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
 # CONFIG_SND_SOC_LPASS_VA_MACRO is not set
@@ -4504,6 +4546,7 @@ CONFIG_HID_VIVALDI=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
+# CONFIG_HID_KYSONA is not set
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_VIEWSONIC=m
@@ -4961,6 +5004,7 @@ CONFIG_TYPEC_ANX7688=m
 # CONFIG_TYPEC_MUX_IT5205 is not set
 # CONFIG_TYPEC_MUX_NB7VPQ904M is not set
 # CONFIG_TYPEC_MUX_PTN36502 is not set
+# CONFIG_TYPEC_MUX_TUSB1046 is not set
 # CONFIG_TYPEC_MUX_WCD939X_USBSS is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support

@@ -5327,10 +5371,7 @@ CONFIG_VHOST_MENU=y
 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 CONFIG_STAGING=y
-# CONFIG_RTLLIB is not set
 CONFIG_RTL8723BS=m
-# CONFIG_R8712U is not set
-# CONFIG_VT6656 is not set
 # CONFIG_BES2600 is not set

 #
@@ -5380,10 +5421,9 @@ CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=y
 # CONFIG_VIDEO_SUN6I_ISP is not set
 # CONFIG_STAGING_MEDIA_DEPRECATED is not set
-# CONFIG_LTE_GDM724X is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_XIL_AXIS_FIFO is not set
-# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_GPIB is not set
 CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
@@ -5712,8 +5752,10 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_AD7476 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7625 is not set
 # CONFIG_AD7766 is not set
 # CONFIG_AD7768_1 is not set
+# CONFIG_AD7779 is not set
 # CONFIG_AD7780 is not set
 # CONFIG_AD7791 is not set
 # CONFIG_AD7793 is not set
@@ -5727,6 +5769,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_AXP288_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_GEHC_PMC_ADC is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
@@ -5857,6 +5900,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # Digital to analog converters
 #
+# CONFIG_AD3552R_HS is not set
 # CONFIG_AD3552R is not set
 # CONFIG_AD5064 is not set
 # CONFIG_AD5360 is not set
@@ -5881,6 +5925,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5791 is not set
 # CONFIG_AD7293 is not set
 # CONFIG_AD7303 is not set
+# CONFIG_AD8460 is not set
 # CONFIG_AD8801 is not set
 # CONFIG_DPOT_DAC is not set
 # CONFIG_DS4424 is not set
@@ -5993,6 +6038,8 @@ CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_ADIS16480 is not set
 # CONFIG_BMI160_I2C is not set
 # CONFIG_BMI160_SPI is not set
+# CONFIG_BMI270_I2C is not set
+# CONFIG_BMI270_SPI is not set
 # CONFIG_BMI323_I2C is not set
 # CONFIG_BMI323_SPI is not set
 # CONFIG_BOSCH_BNO055_SERIAL is not set
@@ -6005,6 +6052,7 @@ CONFIG_HID_SENSOR_HUMIDITY=m
 CONFIG_INV_MPU6050_IIO=m
 CONFIG_INV_MPU6050_I2C=m
 # CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_SMI240 is not set
 # CONFIG_IIO_ST_LSM6DSX is not set
 # CONFIG_IIO_ST_LSM9DS0 is not set
 # end of Inertial measurement units
@@ -6064,6 +6112,7 @@ CONFIG_STK3310=m
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
+# CONFIG_VEML3235 is not set
 # CONFIG_VEML6030 is not set
 # CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
@@ -6079,6 +6128,7 @@ CONFIG_AF8133J=m
 # CONFIG_AK8974 is not set
 # CONFIG_AK8975 is not set
 # CONFIG_AK09911 is not set
+# CONFIG_ALS31300 is not set
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
@@ -6265,6 +6315,7 @@ CONFIG_RESET_SUNXI=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 # CONFIG_PHY_CAN_TRANSCEIVER is not set
+# CONFIG_PHY_NXP_PTN3222 is not set
 CONFIG_PHY_SUN4I_USB=y
 CONFIG_PHY_SUN6I_MIPI_DPHY=y
 # CONFIG_PHY_SUN9I_USB is not set
@@ -6382,7 +6433,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_XFS_FS=m
 CONFIG_XFS_SUPPORT_V4=y
@@ -6400,6 +6450,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_EXPERIMENTAL is not set
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_F2FS_FS=m
@@ -7068,6 +7119,7 @@ CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
+CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
 CONFIG_SWIOTLB=y
 # CONFIG_SWIOTLB_DYNAMIC is not set
 CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
@@ -7119,6 +7171,7 @@ CONFIG_SBITMAP=y

 CONFIG_GENERIC_IOREMAP=y
 CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_UNION_FIND=y

 #
 # Kernel hacking
@@ -7270,6 +7323,7 @@ CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FUNCTION_GRAPH_RETVAL is not set
+# CONFIG_FUNCTION_GRAPH_RETADDR is not set
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.12.8 Kernel Configuration
+# Linux/arm 6.13.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -549,6 +549,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 # CPU frequency scaling drivers
 #
 CONFIG_CPUFREQ_DT=y
+# CONFIG_CPUFREQ_VIRT is not set
 CONFIG_CPUFREQ_DT_PLATDEV=y
 # CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set
 # end of CPU Frequency scaling
@@ -1174,6 +1175,7 @@ CONFIG_IP_NF_MANGLE=y
 # CONFIG_IP_NF_TARGET_ECN is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_ARPFILTER is not set
 # end of IP: Netfilter Configuration

@@ -1215,6 +1217,7 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_NF_DEFRAG_IPV6=y
 # CONFIG_NF_TABLES_BRIDGE is not set
 # CONFIG_NF_CONNTRACK_BRIDGE is not set
+# CONFIG_BRIDGE_NF_EBTABLES_LEGACY is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
@@ -1376,8 +1379,6 @@ CONFIG_CFG80211_DEFAULT_PS=y
 CONFIG_CFG80211_DEBUGFS=y
 CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
-CONFIG_LIB80211=m
-# CONFIG_LIB80211_DEBUG is not set
 CONFIG_MAC80211=m
 CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_MINSTREL=y
@@ -1600,12 +1601,6 @@ CONFIG_BLK_DEV_NBD=m
 # CONFIG_EEPROM_EE1004 is not set
 # end of EEPROM support

-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
 # CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_ALTERA_STAPL is not set
@@ -2188,6 +2183,8 @@ CONFIG_RTW88_8822CU=m
 CONFIG_RTW88_8723DU=m
 # CONFIG_RTW88_8821CS is not set
 CONFIG_RTW88_8821CU=m
+# CONFIG_RTW88_8821AU is not set
+# CONFIG_RTW88_8812AU is not set
 # CONFIG_RTW88_DEBUG is not set
 # CONFIG_RTW88_DEBUGFS is not set
 # CONFIG_RTW89 is not set
@@ -2740,6 +2737,7 @@ CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_LOGICVC is not set
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MPC8XXX is not set
+# CONFIG_GPIO_POLARFIRE_SOC is not set
 # CONFIG_GPIO_SIFIVE is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_XILINX is not set
@@ -2782,6 +2780,7 @@ CONFIG_GPIO_CDEV_V1=y
 #
 # USB GPIO expanders
 #
+# CONFIG_GPIO_MPSSE is not set
 # end of USB GPIO expanders

 #
@@ -2899,6 +2898,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HS3001 is not set
 # CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_ISL28022 is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_POWERZ is not set
@@ -2960,6 +2960,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_NTC_THERMISTOR is not set
 # CONFIG_SENSORS_NCT6683 is not set
 # CONFIG_SENSORS_NCT6775_I2C is not set
+# CONFIG_SENSORS_NCT7363 is not set
 # CONFIG_SENSORS_NCT7802 is not set
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
@@ -3445,6 +3446,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 #
 # Raspberry Pi media platform drivers
 #
+# CONFIG_VIDEO_RP1_CFE is not set

 #
 # Renesas media platform drivers
@@ -3549,8 +3551,18 @@ CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_PANIC is not set
+CONFIG_DRM_CLIENT=y
+CONFIG_DRM_CLIENT_LIB=y
+CONFIG_DRM_CLIENT_SELECTION=y
+CONFIG_DRM_CLIENT_SETUP=y
+
+#
+# Supported DRM clients
+#
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
+# end of Supported DRM clients
+
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_DISPLAY_HELPER=y
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
@@ -3659,6 +3671,9 @@ CONFIG_DRM_PANEL_LVDS=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_AMS581VF01 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_AMS639RQ08 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS427AP24 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
@@ -3668,6 +3683,7 @@ CONFIG_DRM_PANEL_LVDS=y
 # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA8 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
@@ -3708,6 +3724,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_ITE_IT6263 is not set
 # CONFIG_DRM_ITE_IT6505 is not set
 # CONFIG_DRM_LONTIUM_LT8912B is not set
 # CONFIG_DRM_LONTIUM_LT9211 is not set
@@ -3732,6 +3749,7 @@ CONFIG_DRM_SIMPLE_BRIDGE=y
 # CONFIG_DRM_TOSHIBA_TC358768 is not set
 # CONFIG_DRM_TOSHIBA_TC358775 is not set
 # CONFIG_DRM_TI_DLPC3433 is not set
+# CONFIG_DRM_TI_TDP158 is not set
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI83 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
@@ -3762,6 +3780,7 @@ CONFIG_DRM_DW_HDMI=y
 # CONFIG_TINYDRM_ILI9486 is not set
 # CONFIG_TINYDRM_MI0283QT is not set
 # CONFIG_TINYDRM_REPAPER is not set
+# CONFIG_TINYDRM_SHARP_MEMORY is not set
 # CONFIG_TINYDRM_ST7586 is not set
 # CONFIG_TINYDRM_ST7735R is not set
 # CONFIG_DRM_PL111 is not set
@@ -3947,8 +3966,15 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y

 # CONFIG_SND_SOC_CHV3_I2S is not set
 # CONFIG_SND_I2S_HI6210_I2S is not set
+
+#
+# SoC Audio for Loongson CPUs
+#
+# end of SoC Audio for Loongson CPUs
+
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
+CONFIG_SND_SOC_SDCA_OPTIONAL=y
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set

 #
@@ -3982,6 +4008,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AC97_CODEC is not set
 # CONFIG_SND_SOC_ADAU1372_I2C is not set
 # CONFIG_SND_SOC_ADAU1372_SPI is not set
+# CONFIG_SND_SOC_ADAU1373 is not set
 # CONFIG_SND_SOC_ADAU1701 is not set
 # CONFIG_SND_SOC_ADAU1761_I2C is not set
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
@@ -4003,6 +4030,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_AW88395 is not set
 # CONFIG_SND_SOC_AW88261 is not set
+# CONFIG_SND_SOC_AW88081 is not set
 # CONFIG_SND_SOC_AW87390 is not set
 # CONFIG_SND_SOC_AW88399 is not set
 # CONFIG_SND_SOC_BD28623 is not set
@@ -4025,6 +4053,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
 # CONFIG_SND_SOC_CS42L83 is not set
+# CONFIG_SND_SOC_CS42L84 is not set
 # CONFIG_SND_SOC_CS4234 is not set
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -4044,6 +4073,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
+# CONFIG_SND_SOC_ES8323 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_ES8328_SPI is not set
@@ -4089,6 +4119,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
 # CONFIG_SND_SOC_SMA1303 is not set
+# CONFIG_SND_SOC_SMA1307 is not set
 # CONFIG_SND_SOC_SPDIF is not set
 # CONFIG_SND_SOC_SRC4XXX_I2C is not set
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -4127,6 +4158,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_TSCS42XX is not set
 # CONFIG_SND_SOC_TSCS454 is not set
 # CONFIG_SND_SOC_UDA1334 is not set
+# CONFIG_SND_SOC_UDA1342 is not set
 # CONFIG_SND_SOC_WM8510 is not set
 # CONFIG_SND_SOC_WM8523 is not set
 # CONFIG_SND_SOC_WM8524 is not set
@@ -4165,6 +4197,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 # CONFIG_SND_SOC_NAU8824 is not set
+# CONFIG_SND_SOC_NTP8918 is not set
+# CONFIG_SND_SOC_NTP8835 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
 # CONFIG_SND_SOC_LPASS_VA_MACRO is not set
@@ -4228,6 +4262,7 @@ CONFIG_HID_VIVALDI=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
+# CONFIG_HID_KYSONA is not set
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_VIEWSONIC=m
@@ -4621,6 +4656,7 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_MUX_IT5205 is not set
 # CONFIG_TYPEC_MUX_NB7VPQ904M is not set
 # CONFIG_TYPEC_MUX_PTN36502 is not set
+# CONFIG_TYPEC_MUX_TUSB1046 is not set
 # CONFIG_TYPEC_MUX_WCD939X_USBSS is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support

@@ -4939,13 +4975,7 @@ CONFIG_VHOST_MENU=y
 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 CONFIG_STAGING=y
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8723BS=m
-CONFIG_R8712U=m
-# CONFIG_VT6656 is not set
 # CONFIG_BES2600 is not set

 #
@@ -4995,10 +5025,9 @@ CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=y
 # CONFIG_VIDEO_SUN6I_ISP is not set
 # CONFIG_STAGING_MEDIA_DEPRECATED is not set
-# CONFIG_LTE_GDM724X is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_XIL_AXIS_FIFO is not set
-# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_GPIB is not set
 CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
@@ -5293,8 +5322,10 @@ CONFIG_MMA7660=m
 # CONFIG_AD7476 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7625 is not set
 # CONFIG_AD7766 is not set
 # CONFIG_AD7768_1 is not set
+# CONFIG_AD7779 is not set
 # CONFIG_AD7780 is not set
 # CONFIG_AD7791 is not set
 # CONFIG_AD7793 is not set
@@ -5308,6 +5339,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_AXP288_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_GEHC_PMC_ADC is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
@@ -5428,6 +5460,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 #
 # Digital to analog converters
 #
+# CONFIG_AD3552R_HS is not set
 # CONFIG_AD3552R is not set
 # CONFIG_AD5064 is not set
 # CONFIG_AD5360 is not set
@@ -5452,6 +5485,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # CONFIG_AD5791 is not set
 # CONFIG_AD7293 is not set
 # CONFIG_AD7303 is not set
+# CONFIG_AD8460 is not set
 # CONFIG_AD8801 is not set
 # CONFIG_DPOT_DAC is not set
 # CONFIG_DS4424 is not set
@@ -5562,6 +5596,8 @@ CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_ADIS16480 is not set
 # CONFIG_BMI160_I2C is not set
 # CONFIG_BMI160_SPI is not set
+# CONFIG_BMI270_I2C is not set
+# CONFIG_BMI270_SPI is not set
 # CONFIG_BMI323_I2C is not set
 # CONFIG_BMI323_SPI is not set
 # CONFIG_BOSCH_BNO055_I2C is not set
@@ -5572,6 +5608,7 @@ CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_INV_ICM42600_SPI is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_SMI240 is not set
 # CONFIG_IIO_ST_LSM6DSX is not set
 # CONFIG_IIO_ST_LSM9DS0 is not set
 # end of Inertial measurement units
@@ -5631,6 +5668,7 @@ CONFIG_HID_SENSOR_PROX=m
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
+# CONFIG_VEML3235 is not set
 # CONFIG_VEML6030 is not set
 # CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
@@ -5646,6 +5684,7 @@ CONFIG_HID_SENSOR_PROX=m
 # CONFIG_AK8974 is not set
 # CONFIG_AK8975 is not set
 # CONFIG_AK09911 is not set
+# CONFIG_ALS31300 is not set
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
@@ -5827,6 +5866,7 @@ CONFIG_RESET_SUNXI=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 # CONFIG_PHY_CAN_TRANSCEIVER is not set
+# CONFIG_PHY_NXP_PTN3222 is not set
 CONFIG_PHY_SUN4I_USB=y
 CONFIG_PHY_SUN6I_MIPI_DPHY=y
 CONFIG_PHY_SUN9I_USB=y
@@ -5933,7 +5973,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_XFS_FS=m
 CONFIG_XFS_SUPPORT_V4=y
@@ -5951,6 +5990,7 @@ CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_EXPERIMENTAL is not set
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_F2FS_FS=m
@@ -6605,6 +6645,7 @@ CONFIG_SBITMAP=y
 # end of Library routines

 CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_UNION_FIND=y

 #
 # Kernel hacking
@@ -6741,6 +6782,7 @@ CONFIG_FTRACE=y
 # CONFIG_BOOTTIME_TRACING is not set
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_FUNCTION_GRAPH_RETADDR is not set
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_FUNCTION_PROFILER is not set
@@ -1,8 +1,8 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.13
-pkgrel=1
+pkgver=6.13.5
+pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -66,7 +66,7 @@ package() {
 }

 sha512sums="
-1137e6440132b0958f89165440e99208f82b204e7245ae69dc9c808df97d13ce8f58136db92407e0e93394fa7f6283ec7a34597c6e92a5b6d9025e0960357957  linux-6.13.tar.xz
-f3715bd51a8edfd6255b80f7a53c5569255a958d3c61461d4354e99d4d63ddfcafc41967b887274473515027e929ff59093bd3f3a086355a7a9f4178e8c894e3  config-postmarketos-mediatek-mt8173.aarch64
+654c03973dc57c6e4fd66e2b5639ebeaaab2737a1702b7235572b4b88bebd67b80e7e3c364e76f1b29c66e046c3109e8052bff1ec6f79f4afcad387624680d00  linux-6.13.5.tar.xz
+acd8d6baf266ea6c622adbcbaf19341a8b4067260752a5025284d3facddc6181bc79b0c5aa8923489fddf7d54b7c27851426257a3e68bb81f74dff320655d8f5  config-postmarketos-mediatek-mt8173.aarch64
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.13.0 Kernel Configuration
+# Linux/arm64 6.13.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1955,7 +1955,6 @@ CONFIG_EFI_EARLYCON=y
 # end of EFI (Extensible Firmware Interface) Support

 # CONFIG_TEE_STMM_EFI is not set
-# CONFIG_IMX_SCMI_MISC_DRV is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set

@@ -2440,6 +2439,7 @@ CONFIG_PATA_OF_PLATFORM=y
 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
 # CONFIG_MD_RAID10 is not set
@@ -6697,7 +6697,6 @@ CONFIG_CROS_EC_TYPEC=m
 # CONFIG_CROS_HPS_I2C is not set
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CROS_USBPD_NOTIFY=y
-# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_SURFACE_PLATFORMS=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
@@ -7743,7 +7742,6 @@ CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
-# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 CONFIG_MST_IRQ=y
@@ -2,8 +2,8 @@

 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
-pkgver=6.12.4
-pkgrel=2
+pkgver=6.13.1
+pkgrel=0
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -54,6 +54,6 @@ package() {
 }

 sha512sums="
-18be2a74a9f934c5e3e01bbdc7d620de878b577b95d36e1232589e0b61f01429b0ae3e5a6667aff1d5796d7ac72068783b36c74aac3136bec932f83ce25d5535  linux-v6.12.4-sm6350.tar.gz
-30b325e87b521a427d75fb0b6ecfa9140b44ded1c94d3331e0c3b8193b7f24377b3fa73ef3ae2a98e09281e458649d56ef2bead534ebabee332ccdda602b8ffd  config-postmarketos-qcom-sm6350.aarch64
+e65b605d560d2a42ba74189dffb4fbb065303d79dcb7720fa73f3c4b113c6799057e7c47090fb992047d1737245721bb0198d87155dc48beda9d69217bf86aa9  linux-v6.13.1-sm6350.tar.gz
+c18cad961834d1b886393b67573c2172f978bb2fadda01fe72c12bfdea93e494f28fab8d5d83a7b963490f9fbd37096a28955bd3a37b634a22f3211cfdbfd367  config-postmarketos-qcom-sm6350.aarch64
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.4 Kernel Configuration
+# Linux/arm64 6.13.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -396,6 +396,7 @@ CONFIG_CAVIUM_ERRATUM_23144=y
 # CONFIG_CAVIUM_TX2_ERRATUM_219 is not set
 # CONFIG_FUJITSU_ERRATUM_010001 is not set
 CONFIG_HISILICON_ERRATUM_161600802=y
+CONFIG_HISILICON_ERRATUM_162100801=y
 CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
@@ -513,13 +514,21 @@ CONFIG_ARM64_MTE=y
 CONFIG_ARM64_EPAN=y
 # end of ARMv8.7 architectural features

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

+#
+# v9.4 architectural features
+#
+# end of v9.4 architectural features
+
 CONFIG_ARM64_SVE=y
 # CONFIG_ARM64_PSEUDO_NMI is not set
 CONFIG_RELOCATABLE=y
@@ -613,6 +622,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 # CPU frequency scaling drivers
 #
 CONFIG_CPUFREQ_DT=y
+# CONFIG_CPUFREQ_VIRT is not set
 CONFIG_CPUFREQ_DT_PLATDEV=y
 # CONFIG_ARM_QCOM_CPUFREQ_NVMEM is not set
 CONFIG_ARM_QCOM_CPUFREQ_HW=y
@@ -639,7 +649,6 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
-CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
 CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
 CONFIG_HAVE_NMI=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -734,6 +743,7 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_HAS_CC_PLATFORM=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -741,6 +751,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
 CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
+CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
 CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y

 #
@@ -1313,6 +1324,7 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_IP_NF_TARGET_ECN is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_ARPFILTER is not set
 # end of IP: Netfilter Configuration

@@ -1353,6 +1365,7 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_NF_DEFRAG_IPV6=m
 # CONFIG_NF_TABLES_BRIDGE is not set
 # CONFIG_NF_CONNTRACK_BRIDGE is not set
+# CONFIG_BRIDGE_NF_EBTABLES_LEGACY is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
@@ -1662,7 +1675,6 @@ CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
 # ARM SCMI NXP i.MX Vendor Protocols
 #
 # CONFIG_IMX_SCMI_BBM_EXT is not set
-# CONFIG_IMX_SCMI_MISC_EXT is not set
 # end of ARM SCMI NXP i.MX Vendor Protocols

 # CONFIG_ARM_SCMI_POWER_CONTROL is not set
@@ -1695,6 +1707,7 @@ CONFIG_EFI_EARLYCON=y
 # end of EFI (Extensible Firmware Interface) Support

 # CONFIG_TEE_STMM_EFI is not set
+# CONFIG_IMX_SCMI_MISC_DRV is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set

@@ -1808,12 +1821,6 @@ CONFIG_QCOM_FASTRPC=m
 # CONFIG_EEPROM_EE1004 is not set
 # end of EEPROM support

-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
 # CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_ALTERA_STAPL is not set
@@ -2729,6 +2736,7 @@ CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_IPQ5018 is not set
 # CONFIG_PINCTRL_IPQ5332 is not set
+# CONFIG_PINCTRL_IPQ5424 is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL_IPQ6018 is not set
 # CONFIG_PINCTRL_IPQ9574 is not set
@@ -2741,8 +2749,11 @@ CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_MSM8998 is not set
 # CONFIG_PINCTRL_QCM2290 is not set
 # CONFIG_PINCTRL_QCS404 is not set
+# CONFIG_PINCTRL_QCS615 is not set
+# CONFIG_PINCTRL_QCS8300 is not set
 # CONFIG_PINCTRL_QDU1000 is not set
 # CONFIG_PINCTRL_SA8775P is not set
+# CONFIG_PINCTRL_SAR2130P is not set
 # CONFIG_PINCTRL_SC7180 is not set
 # CONFIG_PINCTRL_SC7280 is not set
 # CONFIG_PINCTRL_SC8180X is not set
@@ -2763,6 +2774,7 @@ CONFIG_PINCTRL_SM6350=y
 # CONFIG_PINCTRL_SM8450 is not set
 # CONFIG_PINCTRL_SM8550 is not set
 # CONFIG_PINCTRL_SM8650 is not set
+# CONFIG_PINCTRL_SM8750 is not set
 # CONFIG_PINCTRL_X1E80100 is not set
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
@@ -2796,6 +2808,7 @@ CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_LOGICVC is not set
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_POLARFIRE_SOC is not set
 # CONFIG_GPIO_SIFIVE is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_XGENE is not set
@@ -2837,6 +2850,7 @@ CONFIG_GPIO_CDEV_V1=y
 #
 # USB GPIO expanders
 #
+# CONFIG_GPIO_MPSSE is not set
 # end of USB GPIO expanders

 #
@@ -2968,6 +2982,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HS3001 is not set
 # CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_ISL28022 is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_POWERZ is not set
@@ -3030,6 +3045,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_NCT6683 is not set
 # CONFIG_SENSORS_NCT6775 is not set
 # CONFIG_SENSORS_NCT6775_I2C is not set
+# CONFIG_SENSORS_NCT7363 is not set
 # CONFIG_SENSORS_NCT7802 is not set
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
@@ -3392,8 +3408,18 @@ CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_PANIC is not set
+CONFIG_DRM_CLIENT=y
+CONFIG_DRM_CLIENT_LIB=y
+CONFIG_DRM_CLIENT_SELECTION=y
+CONFIG_DRM_CLIENT_SETUP=y
+
+#
+# Supported DRM clients
+#
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
+# end of Supported DRM clients
+
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_DISPLAY_DP_AUX_BUS=y
 CONFIG_DRM_DISPLAY_HELPER=y
@@ -3401,6 +3427,7 @@ CONFIG_DRM_BRIDGE_CONNECTOR=y
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
+CONFIG_DRM_DISPLAY_DSC_HELPER=y
 CONFIG_DRM_DISPLAY_HDMI_HELPER=y
 CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_EXEC=y
@@ -3508,6 +3535,9 @@ CONFIG_DRM_PANEL_HIMAX_HX83112A=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_AMS581VF01 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_AMS639RQ08 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS427AP24 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
@@ -3517,6 +3547,7 @@ CONFIG_DRM_PANEL_HIMAX_HX83112A=y
 # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA8 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
@@ -3559,6 +3590,7 @@ CONFIG_DRM_AUX_HPD_BRIDGE=y
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_ITE_IT6263 is not set
 # CONFIG_DRM_ITE_IT6505 is not set
 # CONFIG_DRM_LONTIUM_LT8912B is not set
 # CONFIG_DRM_LONTIUM_LT9211 is not set
@@ -3583,6 +3615,7 @@ CONFIG_DRM_AUX_HPD_BRIDGE=y
 # CONFIG_DRM_TOSHIBA_TC358768 is not set
 # CONFIG_DRM_TOSHIBA_TC358775 is not set
 # CONFIG_DRM_TI_DLPC3433 is not set
+# CONFIG_DRM_TI_TDP158 is not set
 # CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_TI_SN65DSI83 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
@@ -3609,6 +3642,7 @@ CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_TINYDRM_ILI9486 is not set
 # CONFIG_TINYDRM_MI0283QT is not set
 # CONFIG_TINYDRM_REPAPER is not set
+# CONFIG_TINYDRM_SHARP_MEMORY is not set
 # CONFIG_TINYDRM_ST7586 is not set
 # CONFIG_TINYDRM_ST7735R is not set
 # CONFIG_DRM_PL111 is not set
@@ -3804,6 +3838,7 @@ CONFIG_HID_VIVALDI=m
 CONFIG_HID_GT683R=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
+# CONFIG_HID_KYSONA is not set
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_VIEWSONIC=m
@@ -4160,6 +4195,7 @@ CONFIG_TYPEC_MUX_GPIO_SBU=y
 # CONFIG_TYPEC_MUX_IT5205 is not set
 # CONFIG_TYPEC_MUX_NB7VPQ904M is not set
 # CONFIG_TYPEC_MUX_PTN36502 is not set
+# CONFIG_TYPEC_MUX_TUSB1046 is not set
 # CONFIG_TYPEC_MUX_WCD939X_USBSS is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support

@@ -4554,6 +4590,7 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_IPQ_GCC_4019 is not set
 # CONFIG_IPQ_GCC_5018 is not set
 # CONFIG_IPQ_GCC_5332 is not set
+# CONFIG_IPQ_GCC_5424 is not set
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_IPQ_GCC_9574 is not set
@@ -4573,14 +4610,19 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_QCM_GCC_2290 is not set
 # CONFIG_QCM_DISPCC_2290 is not set
 # CONFIG_QCS_GCC_404 is not set
+# CONFIG_SA_CAMCC_8775P is not set
+# CONFIG_QCS_GCC_8300 is not set
 # CONFIG_SC_CAMCC_7180 is not set
 # CONFIG_SC_CAMCC_7280 is not set
 # CONFIG_SC_CAMCC_8280XP is not set
+# CONFIG_SA_DISPCC_8775P is not set
 # CONFIG_SC_DISPCC_7180 is not set
 # CONFIG_SC_DISPCC_7280 is not set
 # CONFIG_SC_DISPCC_8280XP is not set
 # CONFIG_SA_GCC_8775P is not set
 # CONFIG_SA_GPUCC_8775P is not set
+# CONFIG_SAR_GCC_2130P is not set
+# CONFIG_SAR_GPUCC_2130P is not set
 # CONFIG_SC_GCC_7180 is not set
 # CONFIG_SC_GCC_7280 is not set
 # CONFIG_SC_GCC_8180X is not set
@@ -4642,6 +4684,7 @@ CONFIG_SM_GPUCC_6350=y
 # CONFIG_SM_GPUCC_8650 is not set
 # CONFIG_SM_TCSRCC_8550 is not set
 # CONFIG_SM_TCSRCC_8650 is not set
+# CONFIG_SA_VIDEOCC_8775P is not set
 # CONFIG_SM_VIDEOCC_7150 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
 # CONFIG_SM_VIDEOCC_8250 is not set
@@ -4743,8 +4786,6 @@ CONFIG_RPMSG_QCOM_SMD=y
 # CONFIG_RPMSG_VIRTIO is not set
 # end of Rpmsg drivers

-# CONFIG_SOUNDWIRE is not set
-
 #
 # SOC (System On Chip) specific Drivers
 #
@@ -4976,6 +5017,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_AD7606_IFACE_SPI is not set
 # CONFIG_AD7766 is not set
 # CONFIG_AD7768_1 is not set
+# CONFIG_AD7779 is not set
 # CONFIG_AD7780 is not set
 # CONFIG_AD7791 is not set
 # CONFIG_AD7793 is not set
@@ -4987,6 +5029,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_AD9467 is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_GEHC_PMC_ADC is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
@@ -5113,6 +5156,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 #
 # Digital to analog converters
 #
+# CONFIG_AD3552R_HS is not set
 # CONFIG_AD3552R is not set
 # CONFIG_AD5064 is not set
 # CONFIG_AD5360 is not set
@@ -5137,6 +5181,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # CONFIG_AD5791 is not set
 # CONFIG_AD7293 is not set
 # CONFIG_AD7303 is not set
+# CONFIG_AD8460 is not set
 # CONFIG_AD8801 is not set
 # CONFIG_DPOT_DAC is not set
 # CONFIG_DS4424 is not set
@@ -5249,6 +5294,8 @@ CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_ADIS16480 is not set
 # CONFIG_BMI160_I2C is not set
 # CONFIG_BMI160_SPI is not set
+# CONFIG_BMI270_I2C is not set
+# CONFIG_BMI270_SPI is not set
 # CONFIG_BMI323_I2C is not set
 # CONFIG_BMI323_SPI is not set
 # CONFIG_BOSCH_BNO055_SERIAL is not set
@@ -5260,6 +5307,7 @@ CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_INV_ICM42600_SPI is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_SMI240 is not set
 # CONFIG_IIO_ST_LSM6DSX is not set
 # CONFIG_IIO_ST_LSM9DS0 is not set
 # end of Inertial measurement units
@@ -5319,6 +5367,7 @@ CONFIG_HID_SENSOR_PROX=m
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
+# CONFIG_VEML3235 is not set
 # CONFIG_VEML6030 is not set
 # CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
@@ -5334,6 +5383,7 @@ CONFIG_HID_SENSOR_PROX=m
 # CONFIG_AK8974 is not set
 # CONFIG_AK8975 is not set
 # CONFIG_AK09911 is not set
+# CONFIG_ALS31300 is not set
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
@@ -5510,6 +5560,7 @@ CONFIG_RESET_SCMI=y
 #
 CONFIG_GENERIC_PHY=y
 # CONFIG_PHY_CAN_TRANSCEIVER is not set
+# CONFIG_PHY_NXP_PTN3222 is not set

 #
 # PHY drivers for Broadcom platforms
@@ -5620,10 +5671,13 @@ CONFIG_INTERCONNECT=y
 CONFIG_INTERCONNECT_QCOM=y
 CONFIG_INTERCONNECT_QCOM_BCM_VOTER=y
 CONFIG_INTERCONNECT_QCOM_OSM_L3=y
+# CONFIG_INTERCONNECT_QCOM_QCS615 is not set
+# CONFIG_INTERCONNECT_QCOM_QCS8300 is not set
 # CONFIG_INTERCONNECT_QCOM_QDU1000 is not set
 CONFIG_INTERCONNECT_QCOM_RPMH_POSSIBLE=y
 CONFIG_INTERCONNECT_QCOM_RPMH=y
 # CONFIG_INTERCONNECT_QCOM_SA8775P is not set
+# CONFIG_INTERCONNECT_QCOM_SAR2130P is not set
 # CONFIG_INTERCONNECT_QCOM_SC7180 is not set
 # CONFIG_INTERCONNECT_QCOM_SC7280 is not set
 # CONFIG_INTERCONNECT_QCOM_SC8180X is not set
@@ -5669,7 +5723,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_XFS_FS=m
 CONFIG_XFS_SUPPORT_V4=y
@@ -5687,6 +5740,7 @@ CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_EXPERIMENTAL is not set
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_F2FS_FS=m
@@ -5710,6 +5764,7 @@ CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 CONFIG_QUOTA=y
 # CONFIG_QUOTA_NETLINK_INTERFACE is not set
 # CONFIG_QUOTA_DEBUG is not set
@@ -6301,6 +6356,7 @@ CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
+CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
 CONFIG_SWIOTLB=y
 # CONFIG_SWIOTLB_DYNAMIC is not set
 CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
@@ -6354,6 +6410,7 @@ CONFIG_SBITMAP=y

 CONFIG_GENERIC_IOREMAP=y
 CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_UNION_FIND=y

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

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

-# CONFIG_DEBUG_TIMEKEEPING is not set
-
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
@@ -6571,6 +6627,7 @@ CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FUNCTION_GRAPH_RETVAL is not set
+# CONFIG_FUNCTION_GRAPH_RETADDR is not set
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
@@ -6665,6 +6722,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_DYNAMIC_DEBUG is not set
 # CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_KALLSYMS is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_TEST_FREE_PAGES is not set
@@ -4,9 +4,8 @@

 _flavor="postmarketos-qcom-sm7150"
 pkgname=linux-$_flavor
-pkgver=6.7.4
-pkgrel=3
-_pkgrel=0
+pkgver=6.13.4
+pkgrel=0
 pkgdesc="Mainline Kernel fork for SM7150 devices"
 arch="aarch64"
 _carch="arm64"
@@ -14,11 +13,11 @@ url="https://github.com/sm7150-mainline/linux"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps
 	pmb:cross-native
-	pmb:kconfigcheck-nftables
+	pmb:kconfigcheck-community
 	"
-makedepends="bison findutils flex openssl-dev perl postmarketos-installkernel"
+makedepends="bison findutils flex openssl-dev perl postmarketos-installkernel python3"

-_tag="$pkgver-r$_pkgrel"
+_tag="$pkgver"

 # Source
 source="
@@ -35,7 +34,7 @@ prepare() {
 build() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((_pkgrel + 1 ))-$_flavor"
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor"
 }

 package() {
@@ -54,6 +53,6 @@ package() {


 sha512sums="
-e5159ef56d28f2e4cc071801c82255d8aa047cc9066aa491ac5a7094eae4b08ec217c042b166cf081e34292b1b6ff957d86545e590d585f3d9516020a37cfb8c  linux-postmarketos-qcom-sm7150-v6.7.4-r0.tar.gz
-f82fd0555e08505075db5c41b42f9d98065de6b1fb05ea6f8ae871361d2751fb3b3449bc5709f958ad06129135f09c074f8cf775e735917482dda9ce541a3920  config-postmarketos-qcom-sm7150.aarch64
+77e4c940c6e6ccbe89cf4f39b0f7f95c519a3a118f2ea261216f63f5bb05e599ed375b4ee31c3349b2baa48d8cf6189a704b9e915edfe25155c5c0901648fef2  linux-postmarketos-qcom-sm7150-v6.13.4.tar.gz
+3ebb29fd962754d0c4c9653ca06c69ef438ff2e2309b85b01e67adf5ea94ea9d68de339162eade054f64ed444b4734cda280eb2a294ca92e4f7e1d8585fcb561  config-postmarketos-qcom-sm7150.aarch64
 "
@@ -2,8 +2,8 @@
 # Co-Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
-pkgver=21
-pkgrel=3
+pkgver=22
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64 armv7"
@@ -106,5 +106,5 @@ eee73ae7895fb6772b35a190956d17642d08af47a0fa5dfd022052c5b30c99cf9649215aef161ddc
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 bcebc36ec62140f4620d462be2b95858adae380e5d74f6b9c9b956fb76a6541f39749f4dcec6ac3c39b868dbfed6fac7a34ba357510532a3df2d39f7ea818d55  77-modem-samsung-msm8916.rules
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8916.rules
-ff143f0f8654bba26087439e206b62c9f8e25f945fa299ba1b7504316f7398a0622404f2415e915ce1c96809ed9a5e93fc16ddcb2bafe410f35466510dc2d51d  adreno-a306-quirks.sh
+de35a32f697247e4a8419647b9c9fece9bc7f41c0e2377d01659ad0dc1ba21b08d3227193053d7cd1ec5006370db574472516f0d0061fb9d2d9509f27f6212d3  adreno-a306-quirks.sh
 "
@@ -1,4 +1,4 @@
 #!/bin/sh

 # New GTK renderer crashes a306.
-export GSK_RENDERER=gl
+export GSK_RENDERER=cairo
@@ -1,7 +1,7 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=soc-qcom-msm8953
 pkgdesc="Common package for Qualcomm MSM8953 devices"
-pkgver=12
+pkgver=13
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -73,6 +73,6 @@ sha512sums="
 8aadc874c8a334e46c7bf630874c3035070aa7b9052deba1a28ae059ab9d63dd99dfb82c1a58d09da5063ad250de813e3974e040ce938a53347e390ce2e450eb  soc-qcom-msm8953-f6dfc9b072e74b0ab2afcf452bc106242049ef28.tar.gz
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8xxx-vib.rules
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
-d546c99ca8d406b4e2e3901a417e4e461314a38f2f01c48525e44ca524ad57af7bfc280f416bda90573b0bfb1cca27d45cb0a0ed44e999ef8d406a380d1fdbb2  adreno-a506-quirks.sh
+4f9af3c582ae611d42fc058f949f60a96fc7cc884052e4c9f82e0292d57bba3b3cb8ace1d512b5a59535caa633be8558246a7519c2d067b7980f4088f452df6d  adreno-a506-quirks.sh
 d4fd0f3406c9f004e9cae7bc500c5713aab75f102f8e3ea1af820865f01eb03def01cd9ed3e8a184c7dfc22ab419628fad17957a3782885d96eb36e94461e842  moto-modem-rfs-setup.openrc
 "
@@ -1,8 +1,5 @@
 # Various GPU workarounds for Adreno a506

-# The 'ngl' GTK renderer, which is now used by default, has worse
-# performance and is somewhat more prone to crashes. Use the 'gl'
-# renderer until these issues have been sorted out.
-#
-# https://gitlab.gnome.org/GNOME/gtk/-/issues/6576
-export GSK_RENDERER=gl
+# Use the 'ngl' GTK renderer, so we prepare for the removal of
+# the legacy GL renderer
+export GSK_RENDERER=ngl
@@ -1 +0,0 @@
-/sbin/modprobe
@@ -1 +0,0 @@
-soc-qcom-sdm845-modem-openrc.post-install
@@ -1 +0,0 @@
-soc-qcom-sdm845-nonfree-firmware-openrc.post-install
@@ -1 +0,0 @@
-soc-qcom-sdm845-pulseaudio-openrc.post-install
@@ -1 +0,0 @@
-soc-qcom-sdm845-qbootctl-openrc.post-install
@@ -1,3 +1,2 @@
 /lib/firmware/qcom/a630_sqe.fw
 /lib/firmware/qcom/a630_gmu.bin
-/lib/firmware/qcom/a615_zap.mbn
@@ -0,0 +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"
@@ -0,0 +1,69 @@
+# Maintainer: Danila Tikhonov <danila@jiaxyga.com>
+# Co-Maintainer: Jens Reidel <adrian@travitia.xyz>
+
+pkgname=soc-qcom-sm7150
+pkgdesc="Common package for Qualcomm SM7150 devices"
+pkgver=3
+pkgrel=0
+url="https://postmarketos.org"
+license="BSD-3-Clause"
+arch="aarch64"
+options="!check !strip !archcheck !tracedeps"
+depends="
+	alsa-ucm-conf-qcom-sm7150
+	bootmac
+	hexagonrpcd>=0.3.2-r3
+	linux-firmware-ath10k
+	linux-firmware-qca
+	linux-firmware-qcom
+	msm-modem
+	msm-modem-uim-selection
+	swclock-offset
+	tqftpserv
+	unl0kr-fbforcerefresh
+"
+subpackages="
+	$pkgname-libssc-180-degrees:libssc_180_degrees
+	$pkgname-openrc
+"
+
+source="
+	30-initramfs-firmware.files
+	81-libssc-180-degrees.rules
+	90-feedbackd-aw8695.rules
+	90-feedbackd-pm6150.rules
+"
+
+package() {
+	install -Dm644 "$srcdir"/30-initramfs-firmware.files -t \
+		"$pkgdir"/usr/share/mkinitfs/files
+
+	install -Dm644 "$srcdir"/90-feedbackd-aw8695.rules -t \
+		"$pkgdir"/usr/lib/udev/rules.d
+
+	install -Dm644 "$srcdir"/90-feedbackd-pm6150.rules -t \
+		"$pkgdir"/usr/lib/udev/rules.d
+}
+
+libssc_180_degrees() {
+	install -Dm644 "$srcdir"/81-libssc-180-degrees.rules -t \
+		"$subpkgdir"/usr/lib/udev/rules.d
+}
+
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+	depends="
+		hexagonrpcd-openrc
+		tqftpserv-openrc
+		"
+
+	mkdir -p "$subpkgdir"
+}
+
+sha512sums="
+73438ceec8ca76dec24a92718d456d17b01a23510ee0b0e6c1263e3f6c2ca82263a3e41298c0a8ebf3dd8439da354fc1c914fd475ad1cf5c669c200770df62fa  30-initramfs-firmware.files
+2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-180-degrees.rules
+2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
+90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm6150.rules
+"
@@ -0,0 +1,3 @@
+#!/bin/sh
+rc-update add hexagonrpcd-adsp-sensorspd
+rc-update add tqftpserv boot
@@ -1,39 +1,41 @@
-# Maintainer: Caleb Connolly (kalube) <caleb@connolly.tech>
-# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
-pkgname=soc-qcom-sdm845
-pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=25
-pkgrel=1
+# Maintainer: Caleb Connolly <caleb@connolly.tech>
+pkgname=soc-qcom
+pkgdesc="Common package for Qualcomm devices"
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
 options="!check !archcheck !tracedeps"
 depends="
+	bootmac
+	msm-modem
+	pd-mapper
 	swclock-offset
+	tqftpserv
+"
+replaces="
+	soc-qcom-sdm845
+	soc-qcom-sdm845-nonfree-firmware
+	upower
 "
-replaces="upower"
 subpackages="
 	$pkgname-gstreamer-openrc:gstreamer_openrc
 	$pkgname-gstreamer-systemd:gstreamer_systemd
 	$pkgname-modem
 	$pkgname-modem-openrc:modem_openrc
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	$pkgname-openrc
 	$pkgname-pulseaudio
 	$pkgname-pulseaudio-openrc:pulseaudio_openrc
 	$pkgname-qbootctl
 	$pkgname-qbootctl-openrc:qbootctl_openrc
-	$pkgname-ucm
 	$pkgname-vulkan
 "

-_ucm_commit="70d89261a7d30273fba9c6e67a072699f9f88151"
 source="
-	10-initramfs-sdm845.files
-	51-qcom-sdm845.conf
+	51-qcom.conf
 	90-feedbackd-pmi8998.rules
 	UPower.conf
-	alsa-ucm-conf-$_ucm_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_ucm_commit/alsa-ucm-conf-$_ucm_commit.tar.gz
 	call_audio_idle_suspend_workaround.confd
 	call_audio_idle_suspend_workaround.initd
 	call_audio_idle_suspend_workaround.sh
@@ -51,25 +53,24 @@ package() {
 	install -Dm644 "$srcdir"/UPower.conf \
 		"$pkgdir"/etc/UPower/UPower.conf

-	install -Dm644 "$srcdir"/10-initramfs-sdm845.files \
-		-t "$pkgdir"/usr/share/mkinitfs/files/
-
-	install -Dm644 "$srcdir"/51-qcom-sdm845.conf \
+	install -Dm644 "$srcdir"/51-qcom.conf \
 		-t "$pkgdir"/usr/share/wireplumber/wireplumber.conf.d
 }

 gstreamer_openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	replaces="soc-qcom-sdm845-gstreamer-openrc"

 	install -Dm755 "$srcdir"/gstreamer.sh \
-		"$subpkgdir"/etc/profile.d/50-soc-qcom-sdm845-gstreamer.sh
+		"$subpkgdir"/etc/profile.d/50-soc-qcom-gstreamer.sh
 }

 gstreamer_systemd() {
 	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+	replaces="soc-qcom-sdm845-gstreamer-systemd"

 	install -Dm644 "$srcdir"/gstreamer.conf \
-		"$subpkgdir"/etc/environment.d/50-soc-qcom-sdm845-gstreamer.conf
+		"$subpkgdir"/etc/environment.d/50-soc-qcom-gstreamer.conf
 }

 modem() {
@@ -86,27 +87,15 @@ modem() {
 modem_openrc() {
 	install_if="$pkgname-modem=$pkgver-r$pkgrel openrc"
 	depends="q6voiced-openrc"
+	replaces="soc-qcom-sdm845-modem-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"

 	install -Dm644 "$srcdir"/modemmanager.conf \
 		"$subpkgdir"/etc/conf.d/modemmanager
 }

-nonfree_firmware() {
-	pkgdesc="Modem, WiFi and GPU Firmware"
-	depends="
-		pd-mapper
-		tqftpserv
-		msm-modem
-		bootmac
-		alsa-utils
-	"
-
-	mkdir "$subpkgdir"
-}
-
-nonfree_firmware_openrc() {
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	depends="
 		pd-mapper-openrc
 		tqftpserv-openrc
@@ -116,15 +105,6 @@ nonfree_firmware_openrc() {
 	mkdir "$subpkgdir"
 }

-ucm() {
-	provides="alsa-ucm-conf"
-	provider_priority=1
-
-	# install audio config files
-	mkdir -p "$subpkgdir"/usr/share/alsa/ucm2
-	cp -r "$srcdir/alsa-ucm-conf-$_ucm_commit"/ucm2 "$subpkgdir"/usr/share/alsa/
-}
-
 qbootctl() {
 	pkgdesc="Enable qbootctl mark-boot-successful service"
 	depends="qbootctl"
@@ -148,6 +128,7 @@ vulkan() {

 pulseaudio() {
 	install_if="$pkgname=$pkgver-r$pkgrel pulseaudio"
+	replaces="soc-qcom-sdm845-pulseaudio"

 	# Call Audio idle suspend workaround code
 	install -Dm755 "$srcdir"/call_audio_idle_suspend_workaround.sh \
@@ -157,6 +138,7 @@ pulseaudio() {
 pulseaudio_openrc() {
 	install_if="$pkgname-pulseaudio=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	replaces="soc-qcom-sdm845-pulseaudio-openrc"

 	# Call Audio idle suspend workaround init script
 	install -Dm755 "$srcdir"/call_audio_idle_suspend_workaround.initd \
@@ -167,11 +149,9 @@ pulseaudio_openrc() {
 }

 sha512sums="
-56845726c5e7b685953f96c381404181ad9b70ea7dbfe5a3d963fb6f15821addaead43a65c9b140cb938c2d45173cfb5421816bd36024fd7e1b8555e0b32622f  10-initramfs-sdm845.files
-28c14f47eaedec577d152001c51753537c98f267ac4a0acf78a304efebe5f6a1b4dc6d501497da9a0a925806a1d9c80b25e001cf9b1eb21efa22cd6a41ff753b  51-qcom-sdm845.conf
+28c14f47eaedec577d152001c51753537c98f267ac4a0acf78a304efebe5f6a1b4dc6d501497da9a0a925806a1d9c80b25e001cf9b1eb21efa22cd6a41ff753b  51-qcom.conf
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
-f6d03f3b03f944b29b588464e2e26f4f4cc185368714f9e623c1211174ea172efb81a765980c9a289112f5bf8c5c4aafdfd87c0094890069fc3d7c73b29456bc  alsa-ucm-conf-70d89261a7d30273fba9c6e67a072699f9f88151.tar.gz
 6fb4c0bd8b7ed534d855a6732ccff783960e3cfa0e0cc7effcbb93afa00798dec15361a37a3200081bc114c8d266b7a0851cc4e819ad36eabdb47a50c72620d9  call_audio_idle_suspend_workaround.confd
 5a58475b6e2ee1d655f3f23d8dc19e1cb2f32f1dfff3b9a9337d9c5baad1ec24bfaec0fb9cc03f00e5a291bee27c6b8bffbc65157e2bee5d65ef6d1adcb0910b  call_audio_idle_suspend_workaround.initd
 6da0a9209f114354aa2aa1185ec3896a8e0bb1bfce0dc3fc4c0de339cf1389feaa2d724e733c251ff032a5e86d37d9549e94f8f7c7a5accfedbd8a4d6316bbfd  call_audio_idle_suspend_workaround.sh
@@ -0,0 +1 @@
+soc-qcom-modem-openrc.post-install
@@ -0,0 +1 @@
+soc-qcom-openrc.post-install
@@ -0,0 +1 @@
+soc-qcom-pulseaudio-openrc.post-install
@@ -0,0 +1 @@
+soc-qcom-qbootctl-openrc.post-install
@@ -1,7 +1,7 @@
 # Maintainer: Dang Huynh <danct12@disroot.org>
 pkgname=wl1251-cal
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Retrieve wl1251 calibration data from a CAL partition and feed it to the driver"
 url="https://github.com/maemo-leste/wl1251-cal"
 arch="armv7"
@@ -11,6 +11,7 @@ subpackages="$pkgname-openrc"
 triggers="$pkgname.trigger=/lib/firmware/ti-connectivity"
 source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/wl1251-cal/archive/refs/tags/$pkgver.tar.gz
 	wl1251-cal.initd
+	wl1251-blacklist
 	calibrate-wl1251"
 options="!check" # No tests

@@ -21,6 +22,7 @@ build() {
 package() {
 	make install DESTDIR="$pkgdir"
 	install -Dm755 "$srcdir/calibrate-wl1251" "$pkgdir/usr/bin/calibrate-wl1251"
+	install -Dm644 "$srcdir/wl1251-blacklist" "$pkgdir/etc/modprobe.d/wl1251.conf"
 }

 openrc() {
@@ -31,6 +33,7 @@ openrc() {

 sha512sums="
 1a402553fc98fa8f2d81d34a548f96be91d13bdcb77ec8e9d8373732b27a6e908895f6044aef8e88dbcd9fa6fa04f0a3d62bed877be91ba6207f68440c3ce758  wl1251-cal-1.2.tar.gz
-1793a4d09ce3c4f2af7b7b4e171ed04e4d5e70d3e40f365ef169879d2431bd1f7abe8702a422efb4d86449a2800b53c531af7353d4e4c2563985c97030cbd99b  wl1251-cal.initd
-0d843727da4d2f3e2fe76ff80c68e67b85fa1e4797ba822d323f3b005df853ec5206c812a9e0caed96aff2bf5f353df79b20f1970c6382d90e02dc664411d0b4  calibrate-wl1251
+39fec86cb13d34a605ad1a76eb3a6ae6e242a01427f477008a3ff066e0b59fb804f0d8379909f81d015aa053ccf9850505dbe3124062ed707a663ae5e2ccd9f1  wl1251-cal.initd
+d14fd2816a8d55592907f1cf1f702d86095c8d2581b336460eb7d5bfc6ab8cece37a53c0a181b9f75ef5050bc612ce7443992158d36fc03939b39010cd33de4c  wl1251-blacklist
+11341461c487b3d797728e5bd0883e659b8440a486d2f0bce008403da517582ba706f6ac89ee4a44217078a5e2d71c3a0b3d79c1189f83a431edc4069eddac10  calibrate-wl1251
 "
				`@@ -1 +0,0 @@`
				`soc-qcom-sdm845-nonfree-firmware-openrc.post-install`
				`@@ -1 +0,0 @@`
				`soc-qcom-sdm845-pulseaudio-openrc.post-install`
				`@@ -1 +0,0 @@`
				`soc-qcom-sdm845-qbootctl-openrc.post-install`