bigscreen: tinydm

WIP: main/postmarketos-ui-plasma-bigscreen: re-enable
Still needs a solution for autologin...
2026-03-31 17:54:50 +02:00 · 2026-03-08 14:53:36 +01:00 · 2026-03-08 14:53:36 +01:00 · 2026-03-08 14:53:36 +01:00 · 2026-03-08 14:53:36 +01:00 · 2026-03-08 14:53:36 +01:00
673 changed files with 17847 additions and 56133 deletions
@@ -11,7 +11,7 @@
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk -q add py3-pip make git
-	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/main
+	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/master
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi

@@ -1,4 +1,4 @@
-image: registry.alpinelinux.org/img/alpine:3.23
+image: registry.alpinelinux.org/img/alpine:latest
 stages:
  - build
  - hardware tests
@@ -82,13 +82,13 @@ build:

 # Include all the devices that need and can to be tested

-{% for device in devices_under_test %}
+{% for device in devices_under_test if device.is_present_in_ci %}
 prepare-{{ device.name }}:
  stage: hardware tests
  extends:
    .pmos-ci-tron-build-boot-artifacts
  {%- if device.has_kernel_variants %}
-  # Build all the boot artifacts for all the supported kernel variants in
+  # Let's build all the boot artifacts for all the supported kernel variants in
  # different jobs, but hide them behind a single job name so as not to pollute
  # the pipeline.
  parallel:
@@ -112,8 +112,10 @@ prepare-{{ device.name }}:

 .test-{{ device.name }}:
  stage: hardware tests
+  extends:
+    - .pmos-ci-tron-initramfs-test
  {%- if device.has_kernel_variants %}
-  # Test all the kernels in different jobs, but hide them behind a single
+  # Let's test all the kernels in different jobs, but hide them behind a single
  # job name so as not to pollute the pipeline.
  parallel:
    matrix:
@@ -133,6 +135,10 @@ prepare-{{ device.name }}:
      {%- endif %}
  variables:
    CI_TRON__PMB_BUILD_JOB: "prepare-{{ device.name }}{% if device.has_kernel_variants %}: [$KERNEL_VARIANT]{% endif %}"
+    # FIXME: cmdline is hardcoded here, but ideally would be built from
+    # fragments using generate-kernel-cmdline...
+    # See: https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/issues/317
+    CI_TRON_KERNEL_CMDLINE__DEVICEINFO: 'console=tty1 console=ttyS0,115200 PMOS_FORCE_PARTITION_RESIZE psi=1'

 # Include the gitlab ci yml fragment, as found in
 # `device/$category/device-$devicename/gitlab-ci.yml.j2` which defines the jobs
@@ -6,7 +6,7 @@
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk add git python3
-	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/main
+	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/master
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi

@@ -129,17 +129,6 @@ if [ -n "$CI_MERGE_REQUEST_DIFF_BASE_SHA" ]; then
 			exit_code=1
 		fi
 	fi
-
-	# Disallow adding packages without a maintainer set
-	NEW_APKBUILDS=$(git show --pretty="" --name-only --diff-filter=A "$CI_MERGE_REQUEST_DIFF_BASE_SHA"..HEAD | grep APKBUILD || true)
-
-	if [ -n "$NEW_APKBUILDS" ]; then
-		if [ -n "$(grep -L '^maintainer="[^"]\+"$' $NEW_APKBUILDS || true)" ]; then
-			echo "ERROR: A new package does not have a maintainer set."
-			grep --color=always -L '^maintainer="[^"]\+"$' $NEW_APKBUILDS
-			exit_code=1
-		fi
-	fi
 fi

 exit "$exit_code"
@@ -24,7 +24,7 @@ def get_package_contents(package, revision, check=True):
    if not check:
        stderr = subprocess.DEVNULL

-    # Run something like "git show upstream/main:main/hello-world/APKBUILD"
+    # Run something like "git show upstream/master:main/hello-world/APKBUILD"
    pmaports_dir = common.get_pmaports_dir()
    pattern = pmaports_dir + "/**/" + package + "/APKBUILD"
    path = glob.glob(pattern, recursive=True)[0][len(pmaports_dir + "/"):]
@@ -137,7 +137,7 @@ def check_versions(packages):
        pkgver = head.rpartition('-r')[0]
        if package.startswith('device-') and not pkgver.isdigit():
            print(f" - {package}: invalid pkgver \"{pkgver}\""
-                  "See: https://docs.postmarketos.org/pmaports/main/packaging-guidelines.html#package-versioning-pkgver-pkgrel")
+                  "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
            error = True

        # Additional checks for device packages
@@ -145,11 +145,27 @@ def check_versions(packages):
            head_parsed = get_package_contents(package, "HEAD", False)
            upstream_parsed = get_package_contents(package, commit, False)

-            # Check that pkgrel was reset to 0 when pkgver was changed
-            if head_parsed["pkgver"] != upstream_parsed["pkgver"] and head_parsed["pkgrel"] != "0":
-                print(f" - {package}: pkgrel should be 0 when pkgver changes."
-                      "See: https://docs.postmarketos.org/pmaports/main/packaging-guidelines.html#package-versioning-pkgver-pkgrel")
-                error = True
+            # checksums did not change
+            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
+                # Check that pkgver did not change
+                if head_parsed["pkgver"] != upstream_parsed["pkgver"]:
+                    print(f" - {package}: pkgver should not change when package source checksums did not change."
+                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+                    error = True
+                # We do not check for a bumped pkgrel, because not everything
+                # needs it, e.g: pmb_recommends
+            # checksums changed
+            else:
+                # Check that pkgrel was reset to 0
+                if head_parsed["pkgrel"] != "0":
+                    print(f" - {package}: pkgrel should be 0 when package source checksums change."
+                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+                    error = True
+                # Check that pkgver was changed
+                if head_parsed["pkgver"] == upstream_parsed["pkgver"]:
+                    print(f" - {package}: pkgver should change when package source checksums change."
+                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+                    error = True

        # Compare head and upstream versions
        result = pmb.parse.version.compare(head, upstream)
@@ -90,7 +90,7 @@ def main() -> int:
    parser = argparse.ArgumentParser()
    parser.add_argument("--booting", help="devices must be in the upper table,"
                        " being in the 'not booting' table below is not"
-                        " enough (all devices in pmaports main and stable"
+                        " enough (all devices in pmaports master and stable"
                        " branches and should be in the upper table)",
                        action="store_true")
    parser.add_argument("--path", help="instead of downloading the devices"
@@ -48,7 +48,7 @@ def run_pmbootstrap(parameters):
@cache
 def get_upstream_branch():
    """ Use pmaports.cfg from current branch (e.g. "v20.05_fix-ci") and
-        channels.cfg from main to retrieve the upstream branch.
+        channels.cfg from master to retrieve the upstream branch.

        :returns: branch name, e.g. "v20.05" """

@@ -65,7 +65,7 @@ def get_upstream_branch():

    # Get branch_pmaports (e.g. "v20.05") from channels.cfg
    # https://postmarketos.org/channels.cfg
-    channels_cfg_str = run_git(["show", "upstream/main:channels.cfg"])
+    channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"])
    channels_cfg = configparser.ConfigParser()
    channels_cfg.read_string(channels_cfg_str)
    assert channel in channels_cfg, \
@@ -139,14 +139,7 @@ def get_changed_packages(skip_archived: bool = False):
        # Skip files:
        # * in the root dir of pmaports (e.g. README.md)
        # * path with a dot (e.g. .ci/, device/.shared-patches/)
-        # * documentation
-        if (
-                not dirname
-                or file.startswith(".")
-                or "/." in file
-                or skip_archived and dirname.startswith("device/archived")
-                or dirname == "docs"
-        ):
+        if not dirname or file.startswith(".") or "/." in file or skip_archived and dirname.startswith("device/archived"):
            continue

        if filename != "APKBUILD":
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 import common
-import glob
 import os.path
 import subprocess
 import sys
@@ -12,15 +11,9 @@ if __name__ == "__main__":
    if common.commit_message_has_string("[ci:skip-dint]"):
        print("WARNING: not linting deviceinfo files ([ci:skip-dint])")
        exit(0)
-
-    if "deviceinfo_schema.toml" in common.get_changed_files():
-        print("deviceinfo_schema.toml changed -> checking all deviceinfo files")
-        pmaports_dir = common.get_pmaports_dir()
-        deviceinfo_files = set(glob.glob(pmaports_dir + "/device/*/*/deviceinfo"))
-    else:
-        # only lint deviceinfo files in the devices repo
-        deviceinfo_files = {file for file in common.get_changed_files()
-                            if os.path.basename(file) == "deviceinfo" and file.startswith("device/")}
+    # only lint deviceinfo files in the devices repo
+    deviceinfo_files = {file for file in common.get_changed_files()
+                        if os.path.basename(file) == "deviceinfo" and file.startswith("device/")}

    try:
        subprocess.run(["dint", "check", *deviceinfo_files], text=True, check=True)
@@ -44,6 +44,10 @@ class Device:

        return Template(fragment_tmpl).render(device=self)

+    @property
+    def is_present_in_ci(self):
+        return bool(self.gitlab_ci_fragment)
+
    @cached_property
    def pmaports_path(self) -> Path:
        # Find the root of pmaports
@@ -73,7 +77,7 @@ class Device:
        return {"postmarketos-mkinitfs-hook-ci"}

    @cached_property
-    def package_dependencies(self) -> set[str]:
+    def package_dependencies(self) -> list[str]:
        # HACK: Work around a bug in depends_recurse which prevents listing all the dependencies
        # Bug: https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues/2623
        return {"postmarketos-initramfs"}
@@ -125,7 +129,7 @@ class Device:
                    dev = cls(device.codename)

                    # Ignore devices that do not have a gitlab ci fragment,
-                    # since adding that fragment is how we mark them as DUTs
+                    # since we won't be able to make use of them
                    if not dev.gitlab_ci_fragment:
                        continue

@@ -1,16 +0,0 @@
-#!/bin/sh -e
-# Description: static type checking for python scripts
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add py3-argcomplete py3-pip py3-pytest
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-set -x
-
-pip install --break-system-packages --no-warn-script-location mypy
-# Need to change directory for pyproject.toml to be picked up.
-cd .ci
-python -m mypy .
@@ -1,2 +0,0 @@
-[tool.mypy]
-disable_error_code = ["import-not-found"]
@@ -16,10 +16,6 @@ fi
 sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
-	./main/postmarketos-duranium/rootfs-usr-bin-duranium-set-channel
-	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-first-boot
-	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-mount-subpartitions
-	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-usb-gadget-setup
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
@@ -62,18 +62,6 @@ ruff:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/ruff.sh

-# testcases typechecking
-mypy:
-  stage: lint
-  rules:
-    - if: *mr_rule
-      changes:
-        - .ci/**/*
-        - .gitlab-ci.yml
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/mypy.sh
-
 # shellcheck and various grep checks
 shellcheck-grep:
  stage: lint
@@ -128,7 +116,6 @@ dint:
        - .ci/**/*
        - .gitlab-ci.yml
        - device/*/device-*/deviceinfo
-        - deviceinfo_schema.toml
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/dint.sh
@@ -26,7 +26,7 @@
 <!--
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
-* [ ] edge (`main` branch)
+* [ ] edge (`master` branch)
 * [ ] `v25.12`

 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
@@ -5,12 +5,10 @@ This repository contains the APKBUILD files for postmarketOS-specific packages,
 There are many more packages defined in the [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/) on which these packages depend.

 Helpful resources:
-
-* [Issues](https://gitlab.postmarketos.org/postmarketOS/pmaports/-/work_items)
 * [How to create a package](https://wiki.postmarketos.org/wiki/Create_a_package)
 * [APKBUILD reference](https://wiki.alpinelinux.org/wiki/APKBUILD_Reference)
 * [pmaports commit style](./COMMITSTYLE.md)
-* [Approval rules](docs/approval-rules.md)
+* [Review and merging guidelines](./docs/modules/ROOT/pages/merging-rules.adoc)
 * [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/)
 * [Alpine Linux package search](https://pkgs.alpinelinux.org/packages)
 * [postmarketOS package search](https://pkgs.postmarketos.org/packages)
@@ -4,7 +4,7 @@ recommended=edge

 [edge]
 description=Rolling release / Most devices / Occasional breakage: https://postmarketos.org/edge
-branch_pmaports=main
+branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge

@@ -1,31 +0,0 @@
-Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
-
-With `#include <linux/filter.h>` `struct sock_fprog` is available when
-linux headers are available. It seems that glibc is just including that header
-as an implementation detail, while musl does not.
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
-@@ -74,6 +74,7 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
-+#include <linux/filter.h>
- #if SANITIZER_ANDROID
- #include <linux/fs.h>
- #endif
-@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
-   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
-   unsigned struct_synth_info_sz = sizeof(struct synth_info);
-   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
-+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #endif // SANITIZER_LINUX
- 
- #if SANITIZER_GLIBC
-@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
- 
-   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
-   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #  endif  // SANITIZER_GLIBC
- 
- #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,6 +1,7 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-aarch64
 # Based on: main/gcc (from Alpine)
+
 CTARGET_ARCH=aarch64
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -22,7 +23,6 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

-maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-aarch64
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -797,7 +796,6 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -1,31 +0,0 @@
-Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
-
-With `#include <linux/filter.h>` `struct sock_fprog` is available when
-linux headers are available. It seems that glibc is just including that header
-as an implementation detail, while musl does not.
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
-@@ -74,6 +74,7 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
-+#include <linux/filter.h>
- #if SANITIZER_ANDROID
- #include <linux/fs.h>
- #endif
-@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
-   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
-   unsigned struct_synth_info_sz = sizeof(struct synth_info);
-   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
-+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #endif // SANITIZER_LINUX
- 
- #if SANITIZER_GLIBC
-@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
- 
-   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
-   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #  endif  // SANITIZER_GLIBC
- 
- #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,6 +1,7 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-armhf
 # Based on: main/gcc (from Alpine)
+
 CTARGET_ARCH=armhf
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -22,7 +23,6 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

-maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-armhf
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -797,7 +796,6 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -1,31 +0,0 @@
-Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
-
-With `#include <linux/filter.h>` `struct sock_fprog` is available when
-linux headers are available. It seems that glibc is just including that header
-as an implementation detail, while musl does not.
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
-@@ -74,6 +74,7 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
-+#include <linux/filter.h>
- #if SANITIZER_ANDROID
- #include <linux/fs.h>
- #endif
-@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
-   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
-   unsigned struct_synth_info_sz = sizeof(struct synth_info);
-   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
-+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #endif // SANITIZER_LINUX
- 
- #if SANITIZER_GLIBC
-@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
- 
-   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
-   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #  endif  // SANITIZER_GLIBC
- 
- #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,6 +1,7 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-armv7
 # Based on: main/gcc (from Alpine)
+
 CTARGET_ARCH=armv7
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -22,7 +23,6 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

-maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-armv7
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -797,7 +796,6 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -1,31 +0,0 @@
-Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
-
-With `#include <linux/filter.h>` `struct sock_fprog` is available when
-linux headers are available. It seems that glibc is just including that header
-as an implementation detail, while musl does not.
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
-@@ -74,6 +74,7 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
-+#include <linux/filter.h>
- #if SANITIZER_ANDROID
- #include <linux/fs.h>
- #endif
-@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
-   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
-   unsigned struct_synth_info_sz = sizeof(struct synth_info);
-   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
-+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #endif // SANITIZER_LINUX
- 
- #if SANITIZER_GLIBC
-@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
- 
-   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
-   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #  endif  // SANITIZER_GLIBC
- 
- #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,6 +1,7 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-loongarch64
 # Based on: main/gcc (from Alpine)
+
 CTARGET_ARCH=loongarch64
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -22,7 +23,6 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

-maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-loongarch64
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-loongarch64
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for loongarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -797,7 +796,6 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -1,31 +0,0 @@
-Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
-
-With `#include <linux/filter.h>` `struct sock_fprog` is available when
-linux headers are available. It seems that glibc is just including that header
-as an implementation detail, while musl does not.
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
-@@ -74,6 +74,7 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
-+#include <linux/filter.h>
- #if SANITIZER_ANDROID
- #include <linux/fs.h>
- #endif
-@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
-   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
-   unsigned struct_synth_info_sz = sizeof(struct synth_info);
-   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
-+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #endif // SANITIZER_LINUX
- 
- #if SANITIZER_GLIBC
-@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
- 
-   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
-   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #  endif  // SANITIZER_GLIBC
- 
- #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,6 +1,7 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-ppc64le
 # Based on: main/gcc (from Alpine)
+
 CTARGET_ARCH=ppc64le
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -22,7 +23,6 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

-maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-ppc64le
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-ppc64le
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for ppc64le"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -797,7 +796,6 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -1,31 +0,0 @@
-Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
-
-With `#include <linux/filter.h>` `struct sock_fprog` is available when
-linux headers are available. It seems that glibc is just including that header
-as an implementation detail, while musl does not.
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
-@@ -74,6 +74,7 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
-+#include <linux/filter.h>
- #if SANITIZER_ANDROID
- #include <linux/fs.h>
- #endif
-@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
-   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
-   unsigned struct_synth_info_sz = sizeof(struct synth_info);
-   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
-+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #endif // SANITIZER_LINUX
- 
- #if SANITIZER_GLIBC
-@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
- 
-   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
-   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #  endif  // SANITIZER_GLIBC
- 
- #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,6 +1,7 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-riscv64
 # Based on: main/gcc (from Alpine)
+
 CTARGET_ARCH=riscv64
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -22,7 +23,6 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

-maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-riscv64
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-riscv64
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -797,7 +796,6 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -1,31 +0,0 @@
-Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
-
-With `#include <linux/filter.h>` `struct sock_fprog` is available when
-linux headers are available. It seems that glibc is just including that header
-as an implementation detail, while musl does not.
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
-@@ -74,6 +74,7 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
-+#include <linux/filter.h>
- #if SANITIZER_ANDROID
- #include <linux/fs.h>
- #endif
-@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
-   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
-   unsigned struct_synth_info_sz = sizeof(struct synth_info);
-   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
-+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #endif // SANITIZER_LINUX
- 
- #if SANITIZER_GLIBC
-@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
- 
-   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
-   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #  endif  // SANITIZER_GLIBC
- 
- #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,6 +1,7 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-x86
 # Based on: main/gcc (from Alpine)
+
 CTARGET_ARCH=x86
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -22,7 +23,6 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

-maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-x86
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-x86
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for x86"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -797,7 +796,6 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -1,31 +0,0 @@
-Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
-
-With `#include <linux/filter.h>` `struct sock_fprog` is available when
-linux headers are available. It seems that glibc is just including that header
-as an implementation detail, while musl does not.
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
-@@ -74,6 +74,7 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
-+#include <linux/filter.h>
- #if SANITIZER_ANDROID
- #include <linux/fs.h>
- #endif
-@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
-   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
-   unsigned struct_synth_info_sz = sizeof(struct synth_info);
-   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
-+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #endif // SANITIZER_LINUX
- 
- #if SANITIZER_GLIBC
-@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
- 
-   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
-   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
- #  endif  // SANITIZER_GLIBC
- 
- #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,6 +1,7 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-x86_64
 # Based on: main/gcc (from Alpine)
+
 CTARGET_ARCH=x86_64
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -22,7 +23,6 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

-maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-x86_64
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-x86_64
-pkgrel=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="https://gcc.gnu.org"
 arch="aarch64"
@@ -279,7 +279,6 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -797,7 +796,6 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
-5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -6,10 +6,9 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

-maintainer=""
 pkgname=musl-aarch64
-pkgver=1.2.6
-pkgrel=2
+pkgver=1.2.5
+pkgrel=21
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

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

 sha512sums="
-03134d5e7b840db09a10f1f34254840dd86d69f960f3eb38a0944df06d897cc603a1a82af380f0ee975a10708c51430d77618debc8ae500d1bbef705fd77681b  musl-1.2.6-r2-aarch64-edge.apk
-d95f9907bd7c0e818ffde40481bf0a8c23ca038e83f260f4ecb583fe164a581c978f76df3623be312400d75e23e2ca4b0742d59855cd908a9d411829ac017de7  musl-dev-1.2.6-r2-aarch64-edge.apk
+dce3b131910f7596f8f1d7c2662805b619a151313c7822cf56a7529b6a8b3baf708bfab649be42d920b173dbd7caf33c667ab120779728b9c271439e1190d4ce  musl-1.2.5-r21-aarch64-edge.apk
+e635424ca037e3d949f793de68218e43fc25f0633aa27d1c330d96d97a8473643683f37bd545022bcb25c8298b8ed54288cf48ccc9633b6dda849cfa187d1019  musl-dev-1.2.5-r21-aarch64-edge.apk
 "
@@ -6,10 +6,9 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

-maintainer=""
 pkgname=musl-armhf
-pkgver=1.2.6
-pkgrel=2
+pkgver=1.2.5
+pkgrel=21
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

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

 sha512sums="
-0f2a24ee0f23612adfb578ccda1b9dccd24a37f78c90d1ba655cdcf0e094dd95f4ec34288c87f98804714cb8fc0865bf0fe079c7a1902b39c4d992bb46e10e64  musl-1.2.6-r2-armhf-edge.apk
-8b5175848776267bee95be058595e538eaa06cb63522d519b6760920faac40c16fa59a57a6be545c121f1e4d1c7cd2e4b2b8fdded57cbdb7e8585b08ca349d86  musl-dev-1.2.6-r2-armhf-edge.apk
+b5411d6b4e03c1c8767906733d091e3438b5ca61959395e5de969a311c131d460052d6ad0c776740bce51a57ea7956ceb11e76355ddc9cc7b045804dfea9927e  musl-1.2.5-r21-armhf-edge.apk
+cb52d3a273cfe102f1c782412d0fa5cb24d735527c99e6702aa456d04655bb09f2939c8c64db86c7e256579cc4179c5fbf1f56b6461596a5e298494c4464c35d  musl-dev-1.2.5-r21-armhf-edge.apk
 "
@@ -6,10 +6,9 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

-maintainer=""
 pkgname=musl-armv7
-pkgver=1.2.6
-pkgrel=2
+pkgver=1.2.5
+pkgrel=21
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

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

 sha512sums="
-a5847eb6b71a52d8b348e8ef09953bf9df858f3d3a141a75bba8db7525a83b3143e7ead4b00bdddffad0a21af6a9c01e4d4c8bb27aa8d69ce13dceb58eb43309  musl-1.2.6-r2-armv7-edge.apk
-01ed9d094bee237e8794678572769ec456709e9f58511be2e301f495518ab82f86ceedc2ad03727fe43925c5e3a5a0f18a1d7b244f57107c3f7593edd14e84c4  musl-dev-1.2.6-r2-armv7-edge.apk
+440fa575b03ca4253d9d25fbe5a59ae3164ba945c012d12224ef829786afa14c654a2ff3868fedbd200bbbadd5789539f6d88def7831ca207e63a1d753021e5e  musl-1.2.5-r21-armv7-edge.apk
+3b7ce82a7ab3c02cb302614898ca68356ed18512f37f3632b1ef8df44b242b40b528c60c42cc19cb6b31c1e197019bf712713eb3b7998b4efbf96dc2aac29723  musl-dev-1.2.5-r21-armv7-edge.apk
 "
@@ -6,10 +6,9 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

-maintainer=""
 pkgname=musl-loongarch64
-pkgver=1.2.6
-pkgrel=2
+pkgver=1.2.5
+pkgrel=21
 arch="x86_64"
 subpackages="musl-dev-loongarch64:package_dev"

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

 sha512sums="
-112265a3a4c20cbc03a67fe23c69338332e127d51d3a4ad137547fcc8554a8878425f74f46765a032ba1c36c2782a1f3dcf3102e7bbb3c93a671fb85eba4e000  musl-1.2.6-r2-loongarch64-edge.apk
-45a0953693e6eaa3434e799bc79608dccedfb711cf816ac7dc1bb7ab15ed4a934dfbd0b2ad0b286ac8b8b00f901b99c8e4b06b9f7e50fb69e2d96cc83bbc0304  musl-dev-1.2.6-r2-loongarch64-edge.apk
+ec3cafd077ad5d07aadd75fdefadb6bcb625979eec47f2ac4ac675471c4d57c956c563bbcb1a455fe30b72212047cff8a1d7f4e4d143ad681a1f3c71c98614fd  musl-1.2.5-r21-loongarch64-edge.apk
+6bfff1beebaa45f409e414e3213c1260a98fc6a1345e11f41d23dcc1a7d37380ae21c538e28e72ab1c4ce5370f3e776dad6e827f741358ce85888bf5ab4e027c  musl-dev-1.2.5-r21-loongarch64-edge.apk
 "
@@ -6,10 +6,9 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

-maintainer=""
 pkgname=musl-ppc64le
-pkgver=1.2.6
-pkgrel=2
+pkgver=1.2.5
+pkgrel=21
 arch="x86_64"
 subpackages="musl-dev-ppc64le:package_dev"

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

 sha512sums="
-fa1484bf04b70b27bf6540d8b3f506a334623a160c7d86dd5c58f418dd751eb641c35a0166b485c8ba1bba57f4e929b277352eae5e55cd740a0b73e741f72cc7  musl-1.2.6-r2-ppc64le-edge.apk
-4ea8db19500bcc05e31c1e9c37e43742b150e9218ba585f98b4cde918abd1896431797921f19ff6a82f42d2db245ccfe368ab552c01637d17f19a8ff33db0396  musl-dev-1.2.6-r2-ppc64le-edge.apk
+0e2720a11cd9c4417c96301d71f97dcc65ebe990e0115628aa30fe95debce12db75a716def86b4326074110c5e515f5f6876691c693c72ae211d641a43ba73cf  musl-1.2.5-r21-ppc64le-edge.apk
+fcea40a1616b49350f90fb1f0ba99ea8e7cf40544044133553ef4d70f24376d489fa5ff85c15aa4550e4283915eb172c14429ef439a51cd1ec7e08f3a231ce04  musl-dev-1.2.5-r21-ppc64le-edge.apk
 "
@@ -6,10 +6,9 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

-maintainer=""
 pkgname=musl-riscv64
-pkgver=1.2.6
-pkgrel=2
+pkgver=1.2.5
+pkgrel=21
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

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

 sha512sums="
-3113c288563199b52e9fbb93a34e16eb87bfe4b7e0872ba0349eec1fc532ea8583565f862b82130fcf416fc006ff661afad1bf549e25d688aa6b055287089c39  musl-1.2.6-r2-riscv64-edge.apk
-8bf4503998a50581af7965407bd25aa41c2716526e6db7683dfb9cce134d9cf401bdeeafd060fd6e5d83ac52852e745c6eafdd406dd59d8f5eea256445f21a3d  musl-dev-1.2.6-r2-riscv64-edge.apk
+c3f9b76c99bd9c1426f4f87b1d60405e3b4fc6c93451d08b72338496b4cefae6692ef0b0ab9f09b78317d944289060b38c0a7072737d92b3f75fbb0fd8e81132  musl-1.2.5-r21-riscv64-edge.apk
+2b28646a759b54c3b2846499c04df7d9b8195da8892a004cbefb69625bbbb874bbc1748ce3d49738931e1e321ab5d90482b08783d07efe28f55d8d1657d451dd  musl-dev-1.2.5-r21-riscv64-edge.apk
 "
@@ -6,10 +6,9 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

-maintainer=""
 pkgname=musl-x86
-pkgver=1.2.6
-pkgrel=2
+pkgver=1.2.5
+pkgrel=21
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"

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

 sha512sums="
-f731bafa153e7b3ea212cc4e13d5c843227374a13530188131184c32f13907057f66af65ff7889a01f7c2b46bae7087f712b09e97ff879e2ed263ebec37432bf  musl-1.2.6-r2-x86-edge.apk
-afc7894a31de08bcfa6b28604625ad7e6cf8cd61394d34bd2ed50ea07c9d4e7ad212cb668439f51599ce2c946a326e196ee01503fe196a4a8dce973ae51d57ef  musl-dev-1.2.6-r2-x86-edge.apk
+6b0da8df450dc4f9b15851a0cdcfc8249f5cc6bedf91ce0d04d6b810b6d2970337345bb8ea83d6b66927be24b88395779b0f660c3511ac2adedbbae76e5c2dc2  musl-1.2.5-r21-x86-edge.apk
+771c4002ede113c134bc00586dcafba4004c3860ca715723d680c5d8916d42a0a888094276d24405a8e6a39ff79e4690f0021fff075909398ae3f7379cdb6c25  musl-dev-1.2.5-r21-x86-edge.apk
 "
@@ -6,10 +6,9 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

-maintainer=""
 pkgname=musl-x86_64
-pkgver=1.2.6
-pkgrel=2
+pkgver=1.2.5
+pkgrel=21
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"

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

 sha512sums="
-5a10449984203c8f1c3f243310cec43aad11023bf83f5e08f9a15771a6c3545e678ab98a57f9f9b9528f4096d2efa1cda5620006eacef3feb459156588f5b44a  musl-1.2.6-r2-x86_64-edge.apk
-2454ee23df3c3b93aaa366554692a0ab7258b7c9865247c0acde3903ebbe796e4dda982d11f7556b635b3b9cf7cf238628b276f95eabc426d5045c24830c3b2d  musl-dev-1.2.6-r2-x86_64-edge.apk
+a378f3015c9222161aaa8ffd34038880f923e7a86cb400dac886d1c1adcf691e55798844f8fa6a4ee3ca9ee4d1a1a5d5ea616a550ac0d99933e64a68c2d65332  musl-1.2.5-r21-x86_64-edge.apk
+87296e7eb778ba4153c6fb27f596561ea7997ee5aa67346aeee9b42687ccb6a5d45e1c1faa2f13d1742e45f47898d78629db3320f640ef8700b55f710584662a  musl-dev-1.2.5-r21-x86_64-edge.apk
 "
@@ -2,7 +2,7 @@
 maintainer=""
 pkgname=systemd-boot-x86
 _pkgname=systemd-boot  # for monitoring
-pkgver=260.1
+pkgver=259.3
 pkgrel=0
 pkgdesc="systemd's EFI boot manager for x86 EFI on x86_64."
 url="https://systemd.io/"
@@ -118,7 +118,7 @@ efistub() {
 }

 sha512sums="
-9f975dce6861853a817a7ceab18a24449a85d1bda6939b3a5173430c02a4d8a9a2b34ebb8cce1c51db9b0ff9078fcc65da7b0f44e3bdcbbe013b9e04bb6f0ff9  systemd-260.1.tar.gz
+ea7314fcde3c0e541c9399f2d165f114bd7bf37cec294680964352da374435ddd3949432f939f35ecb49f0ce6a3b7aaaddf2b65cc8107abc65e2ec3806c99dac  systemd-259.3.tar.gz
 8ecb5e25c0d8b01c406fa3084b0910d517cabbf12894958b4d3d77462cb0924f0a52fe2bf1aa39af29b16fd78fe080a6a99daa18015c6059fb2e52c971d83ba9  0001-meson-disable-libintl-check-if-pam-is-disabled.patch
 ad54e2c7e7a21bfa9b5f9e8db1b6af6a6d78a3e5dfe2dafcec77488f6224865ab4d4c8a8c8ee1c54c99d1741361e9fb3a51e5d36bcbc7a1c3fdcc4d0c1672132  cross-x86.meson
 "
@@ -9,7 +9,6 @@ test-{{ device.name }}:
  extends:
    # Extended from jobs defined in ci-common/ci-tron/common.yml
    - .pmos-ci-tron-runner-{{ device.name }}
-    - .pmos-ci-tron-initramfs-test

    # Extended from build-jobs.yaml.j2
    - .device-boot-flow-separate-artifacts
@@ -29,6 +28,4 @@ test-{{ device.name }}:
    CI_TRON_FASTBOOT__RAMDISK_OFFSET: 0x01000000
    CI_TRON_FASTBOOT__TAGS_OFFSET: 0x00000100
    CI_TRON_FASTBOOT__PAGESIZE: 4096
-    # Devices should not have the serial console enabled, but we want it
-    # to be able to get logs. And all qcom devices use the same one!
    CI_TRON_KERNEL_CMDLINE__CONSOLE: "console=ttyMSM0,115200"
@@ -10,13 +10,7 @@ test-{{ device.name }}:
  extends:
    # Extended from jobs defined in ci-common's ci-tron/common.yml
    - .pmos-ci-tron-runner-{{ device.name }}
-    - .pmos-ci-tron-initramfs-test

    # Extended from build-jobs.yaml.j2
    - .device-boot-flow-separate-artifacts
    - .test-{{ device.name }}
-  variables:
-    # FIXME: cmdline is hardcoded here, but ideally would be built from
-    # fragments using generate-kernel-cmdline...
-    # See: https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/issues/317
-    CI_TRON_KERNEL_CMDLINE__DEVICEINFO: 'console=tty1 console=ttyS0,115200 pmos.force-partition-resize psi=1'
@@ -1,7 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-mako-downstream
-pkgver=5
+pkgver=4
 pkgrel=0
 pkgdesc="Google Nexus 4 (Downstream)"
 url="https://postmarketos.org"
@@ -45,7 +45,7 @@ package() {

 sha512sums="
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
-f266d3af15602fc04b33f7bb31d6d34562417ecec3c384e3996cc5f98d32bdf3db007f6d74369180041b2a92c77c0d940dc10e9fa581462a432519d9e719859f  deviceinfo
+b9984d44b6ce342fb02854eae0171741e0f65cf201f115904434796c77b1dc6f08a2599bad2aa1168f96649d3e6048060f46b306d004846adde1dcf823664c9b  deviceinfo
 67a15c9304112e80e54e62da1bfc6c4c0b942f3a125723f6d007afaa07232fe61ec14c515570ae9abf2ef35a8bdd2f4e7df892904b79b0c1b0f54073603ac157  kernel-cmdline.conf
 217bdf692ade75d57968299e29e9379ffcfc97addf735663b3e1e7dfce049f9d13b26347b4405ac724ae5fac2946012dcc58014b23b8df357e225b6718dbc0a6  fb.modes
 52b1465c75c51e2dc2e351a0609220af04b939b9edf7fca844cc00bb9eeb4e71f53e34817ba094e477fc43bf15101fcfd07963c791a36be5c52f199bba6a6d9d  pointercal
@@ -17,6 +17,7 @@ deviceinfo_dev_touchscreen="/dev/input/event2"

 # Fastboot related
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_bootimg="true"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x80200000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -1,6 +1,6 @@
 maintainer="Richard Acayan <mailingradian@gmail.com>"
 pkgname=alsa-ucm-conf-qcom-sdm670
-pkgver=1.2.9_git20260223
+pkgver=1.2.9_git20250707
 pkgrel=0
 pkgdesc="ALSA UCM configuration for SDM670 devices"
 url="https://gitlab.com/sdm670-mainline/alsa-ucm-conf"
@@ -8,7 +8,7 @@ arch="aarch64"
 license="BSD-3-Clause"
 provides="alsa-ucm-conf"
 provider_priority=1
-_commit="2f8edef47f67a308d5fe3370c73f29a021e6a885"
+_commit="abe7dee6d942965c7a7d5861beacc9cf0b6adbec"
 source="https://gitlab.com/sdm670-mainline/alsa-ucm-conf/-/archive/$_commit/alsa-ucm-conf-$_commit.tar.gz"
 options="!check"

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

 sha512sums="
-ff65e897310fcade9e2842ffd149dcedd8487e7cb191b7b6e3d702f5fbfadae61602445d5d5b70baff56d08367a85215ba008c6898a2806b61d9e38b4ab7d161  alsa-ucm-conf-2f8edef47f67a308d5fe3370c73f29a021e6a885.tar.gz
+beddfa4754a6e24deda3e0a78959a03afc93cb7a7c8e69880fc0f5b3011ea11ab9f36c21ca1c588062b8437f7c599234cad109f04887d35d8c480bf0d548a53d  alsa-ucm-conf-abe7dee6d942965c7a7d5861beacc9cf0b6adbec.tar.gz
 "
@@ -4,7 +4,7 @@ maintainer="Sebastian Fleer <dev@dwurp.de>"
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=12
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,9 +51,6 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/systemd-gru-watchdog.conf \
-	  "$pkgdir"/usr/lib/systemd/system.conf.d/90-gru-watchdog.conf
 }

 nonfree_firmware() {
@@ -68,6 +65,13 @@ openrc() {
 	mkdir "$subpkgdir"
 }

+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+	install -Dm644 "$srcdir"/systemd-gru-watchdog.conf \
+	  "$subpkgdir"/usr/lib/systemd/system.conf.d/90-gru-watchdog.conf
+	default_systemd
+}
+
 sha512sums="
 aa8ded3034eae5bca4c3cfd8add13d8aaa4f1f1dde3e86b4c6f001507d4b5a4d89a532adc9813f42a0fa2526db8223643481736eeffaf13bd673d312ecd06adf  deviceinfo
 a750a0c41068082e0b82351d5aec91715e1a5215b09b26fec644dfe259cea2d662e878433a732a8c06dab2a9b420baec2bcc6161d8357cf3ed770239c5165090  modules-initfs
@@ -6,7 +6,7 @@ maintainer="Adam Thiede <me@adamthiede.com>"
 pkgname=device-google-oak
 pkgdesc="Google Oak Chromebooks"
 pkgver=10
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ depends="
 	alsa-utils
 	depthcharge-tools
 	linux-postmarketos-mediatek-mt8173
-	mesa-vulkan-imagination
 	postmarketos-base
 	postmarketos-cros-common
 "
@@ -43,6 +42,6 @@ nonfree_firmware() {

 sha512sums="
 cab64e21c7710d875cac4ed459a7c6ca8547d7234704e8cb80e875a5cfc65cab6cac00be0c3d9b9300e96f9a45c1b315896708b488024dcffc7cb42c850127e0  deviceinfo
-09dfc86138379250bc72b3395a4a94257da81d359cb210ee871cfa8efe6450ca3bbd95a134f365bc509bebcde5e882433805d9b265bdd8df12fd85c86491d66f  kernel-cmdline.conf
+97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb  kernel-cmdline.conf
 4b0197eacfeeb4b13f5abc26950f570ee762742547674ce10110ccea63eb46630a2e3b5f87e9c9a1f9deda21baf05bec248ab7a65656687ec94d296b5657dafa  modules-initfs
 "
@@ -1,3 +1,2 @@
 quiet
 loglevel=2
-powervr.exp_hw_support=1
@@ -3,7 +3,7 @@ maintainer="Henrik Grimler <henrik@grimler.se>"
 pkgname=device-google-peach-pit
 pkgdesc="Samsung Chromebook 2 (11.6 inch)"
 pkgver=10
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -48,7 +48,7 @@ package() {
 i3wm() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
 	install -Dm644 "$srcdir"/90-tap-to-click.conf \
-		"$subpkgdir"/usr/share/X11/xorg.conf.d/90-tap-to-click.conf
+		"$subpkgdir"/etc/X11/xorg.conf.d/90-tap-to-click.conf
 }

 nonfree_firmware() {
@@ -1,2 +1,8 @@
+# Invert the acceleration so it is directed downwards, at rest on a planet.
+# This is for compatibility with iio-sensor-proxy.
+#
+# https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/issues/375
+SUBSYSTEM=="misc", KERNEL=="fastrpc-adsp*", ENV{ACCEL_MOUNT_MATRIX}="-1, 0, 0; 0, -1, 0; 0, 0, -1"
+
 # Be compatible with the fix to CVE 2024-41024.
 SUBSYSTEM=="misc", KERNEL=="fastrpc-adsp-secure", SYMLINK="fastrpc-adsp"
@@ -2,7 +2,7 @@
 maintainer="Richard Acayan <mailingradian@gmail.com>"
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
-pkgver=18
+pkgver=17
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -77,7 +77,7 @@ plasma_camera() {
 }

 sha512sums="
-e358f0565b95cd5d39dd5bc07645c6e0f94679c93b120b72bd2b6082b7f919e990a6a78e03edc0db045f8fc5e3363377c69fb8e42107298868ec319740c29210  81-libssc-google-sargo.rules
+089ce0acba4e1d789e337bedfca7570796a6416e7230ae9b8fc6b625747a40dbb064b1a707877cd6b7bdc73844c6571316e2ec0746a77060f13d98c52fdbfc00  81-libssc-google-sargo.rules
 6625f41b5348bd45e47f56dc3b4a8aa07430939ae76e082d645397db6680182a7174a1b897ad8b7019e6211220a8f3712eeac6eb2e9b55c4e1434e964729de97  deviceinfo
 b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd.confd
 925d8b176a8f1b47a86a1026cc920ffae99ceb35c3e52c222654c15078907579d23c4d68ed65a98ab937f59aaba2bbdd74da8d273e8b9c1ac87a52f718d383d6  modules-initfs
@@ -2,7 +2,7 @@
 maintainer="Danct12 <danct12@disroot.org>"
 pkgname=device-nokia-n900
 pkgver=51
-pkgrel=5
+pkgrel=4
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -182,9 +182,9 @@ x11() {
 	install -D -m644 "$srcdir"/acpi.map \
 		"$pkgdir"/etc/acpi.map
 	install -D -m644 "$srcdir"/40-xkb.conf \
-		"$subpkgdir"/usr/share/X11/xorg.conf.d/40-xkb.conf
+		"$subpkgdir"/etc/X11/xorg.conf.d/40-xkb.conf
 	install -D -m644 "$srcdir"/xorg.conf \
-		"$subpkgdir"/usr/share/X11/xorg.conf.d/11-n900.conf
+		"$subpkgdir"/etc/X11/xorg.conf.d/11-n900.conf
 	install -Dm755 "$srcdir"/lock.sh \
 		"$subpkgdir"/usr/bin/lock.sh
 	install -Dm644 "$srcdir"/xresources \
@@ -2,7 +2,7 @@
 maintainer="Henrik Grimler <henrik@grimler.se>"
 pkgname=device-odroid-xu4
 pkgdesc="ODROID XU4"
-pkgver=6
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,7 +26,7 @@ package() {
 }

 sha512sums="
-0f1f9f655f9b73b18598ddd5690904861fa63ff6e8855d9b4bead3a40c69b6a97606267eb623fb23028cfa13da98feba687b9e7e6b3dff4f6f8d2846b808c8ba  deviceinfo
+ee1b15e55366bb7dbe45e35053f670aa68f74b8603239575cf41ad7bd209a90123670a70363d14fe3adf5ac323f1103dc638e3eb8c031c63e0b8d7fcf3654e5b  deviceinfo
 da521908455bec78086df8614e2a9f0cd871155f91d65d351670fdcf3e2880bfb1d578aab26f3dd3778ce3ebf27efbde67d65f39f5f733da5c750e33161ecc9b  kernel-cmdline.conf
-36ce87dcf1bbb49637e8ab7e75325ce41541ccfd7d6ac35edbc8269db319c2201f9d12c6263f8761424ad0d59b2bfa9c523b8200584f753b7264a7c7a2928d90  modules-initfs
+9f6c3cc0079e718ef0dfc221fadaf9bc092a8601b62794c2298eab893924af457612bd8a6e852fb2b181bee637e774dd2abea681eb72b1aa9c6672e686454795  modules-initfs
 "
@@ -9,6 +9,7 @@ deviceinfo_codename="odroid-xu4"
 deviceinfo_year="2015"
 deviceinfo_dtb="exynos5422-odroidxu4"
 deviceinfo_arch="armv7"
+deviceinfo_no_framebuffer="true"
 deviceinfo_getty="ttySAC2;115200"
 deviceinfo_disable_dhcpd="true"

@@ -1,8 +1,5 @@
-exynosdrm
-hid_generic
+uas
+usb-storage
 scsi_mod
 sd_mod
 t10_pi
-uas
-usb-storage
-usbhid
@@ -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"
@@ -2,7 +2,7 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=25
+pkgver=24
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -30,6 +30,7 @@ source="
 	modules-initfs
 	q6voiced.conf
 	80-device-oneplus-enchilada.preset
+	81-libssc-oneplus-enchilada.rules
 "
 install="
 	$pkgname-openrc.post-install
@@ -49,12 +50,12 @@ package() {
 	replaces="$pkgname-nonfree-firmware"
 	devicepkg_package $startdir $pkgname

+	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"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
-	install -Dm644 -t "$pkgdir"/usr/lib/systemd/system-preset \
-		"$srcdir"/80-device-oneplus-enchilada.preset
 }

 openrc() {
@@ -64,12 +65,18 @@ openrc() {
 }

 pmtest() {
-	depends="postmarketos-test-bootrr qrtr firmware-oneplus-sdm845 postmarketos-test-unl0kr"
+	depends="bootrr qrtr firmware-oneplus-sdm845 postmarketos-test-unl0kr"
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci"

 	mkdir -p "$subpkgdir"
 }

+systemd() {
+	install -Dm644 -t "$subpkgdir"/usr/lib/systemd/system-preset \
+		"$srcdir"/80-device-oneplus-enchilada.preset
+	default_systemd
+}
+
 sha512sums="
 73088bcff276b1e2f03efc3776be4c7d9a367ef898031686b88e5a853f8910373eb9f77b8e035d58149947929e908e745f255fbd24d02bed7bdc816afd703d2b  deviceinfo
 f16e550f623522be29027954c69a956eb6543f2f608a4c6b37c1a3983403a3edaa24e70aa42dbe88e76216991aba867b48c7341c9b8a81f675902d6223937b51  kernel-cmdline.conf
@@ -77,4 +84,5 @@ c8d3026e9f803ea823e35f83dab66fa8545e99af9655576476c194567113084d78200feab46f8498
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 a72de3293bc59e0afa0114d74030e4e725959f7619879ab616b0164595d57033affc3d1d4ccc9d8bc191b177a4c1593c1ad0a19fe7e452c3e0c9c847135c1102  80-device-oneplus-enchilada.preset
+2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-oneplus-enchilada.rules
 "
@@ -4,7 +4,7 @@ maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=24
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -65,7 +65,7 @@ openrc() {
 }

 pmtest() {
-	depends="postmarketos-test-bootrr qrtr postmarketos-test-unl0kr"
+	depends="bootrr qrtr postmarketos-test-unl0kr"
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci"

 	mkdir -p "$subpkgdir"
@@ -1,7 +1,7 @@
 maintainer="Antoine Martin (ayakael) <dev@ayakael.net>"
 pkgname=device-pine64-pinenote
 pkgdesc="Pine64 PineNote"
-pkgver=12
+pkgver=11
 pkgrel=0
 _commit="28d2c05ab4e80a7972611cd3188f3e8be4197f6a"
 url="https://postmarketos.org"
@@ -36,14 +36,12 @@ source="
 	30-eink-waveform.files
 	50-touchscreen.conf
 	panfrost.conf
-	tinydm-ebc-workaround-systemd.conf
-	tinydm-ebc-workaround-openrc.initd
+	tinydm-ebc-workaround-override.conf
 "
 subpackages="
 	$pkgname-nonfree-firmware
 	$pkgname-nonfree-firmware-openrc:firmware_openrc
 	$pkgname-nonfree-firmware-systemd:firmware_systemd
-	$pkgname-openrc
 	$pkgname-sway
 	$pkgname-sway-hrdl
 	$pkgname-systemd
@@ -106,6 +104,13 @@ package() {
 	# panfront sometimes insists on loading after rockchip_ebc
 	install -Dm644 "$srcdir"/panfrost.conf \
 		-t "$pkgdir"/usr/lib/modprobe.d
+
+	# rockchip_ebc sometimes fails to load the initial waveform.
+	# This forces a reload before starting tinydm
+	# TODO: openrc workaround
+	install -Dm644 \
+		"$srcdir"/tinydm-ebc-workaround-override.conf \
+		"$pkgdir"/usr/lib/systemd/system/tinydm.service.d/override.conf
 }

 hrdl() {
@@ -232,30 +237,12 @@ sway() {
 	mkdir -p "$subpkgdir"
 }

-openrc() {
-	# rockchip_ebc sometimes fails to load the initial waveform.
-	# This forces a reload before starting tinydm
-	install="$subpkgname.post-install"
-	install -Dm755 "$srcdir"/tinydm-ebc-workaround-openrc.initd \
-		"$subpkgdir"/etc/init.d/tinydm-ebc
-
-	# source `install_if`, `pkgdesc` and `depends`
-	default_openrc
-}
-
 systemd() {
 	# post-install enables tinydm if tinydm-ebc was enabled
 	# enables seamless upgrade 7-r0 to 8-r0
 	# TODO: remove in preparation for v26.06
 	install="$subpkgname.post-install"

-	# rockchip_ebc sometimes fails to load the initial waveform.
-	# This forces a reload before starting tinydm
-	install -Dm644 \
-		"$srcdir"/tinydm-ebc-workaround-systemd.conf \
-		"$subpkgdir"/usr/lib/systemd/system/tinydm.service.d/override.conf
-
-	# source `install_if`, `pkgdesc` and `depends`
 	default_systemd
 }

@@ -283,7 +270,7 @@ x11() {

 	# xorg touchscreen settings
 	install -Dm644 "$srcdir"/50-touchscreen.conf \
-		-t "$subpkgdir"/usr/share/X11/xorg.conf.d
+		-t "$subpkgdir"/etc/X11/xorg.conf.d
 }

 sha512sums="
@@ -301,6 +288,5 @@ df0565391a66eed53ed817d3d1415bef000f9ed33ef2e8aa3016be3ecc21dd4a357e57838979d271
 8f7a5ad2f407de8c474d54dfdb9cc099c96e8918fc123f8b2a8ff911d7e1c7ca6fe30f9cea8ee2f0c1ba5f3e53359193d0683ca912f0b66e79a12814ce38dd98  30-eink-waveform.files
 ac433eebbc35a48561837495997aee4e55510b979bc0d8e3bafb761bc1be5b4bdeed2f456369dcbc582688aefd07c63966b0d72b6ffa99e84cfd868e677f02c8  50-touchscreen.conf
 6ba6638754e00908243de2f73ed6898dac03638a200dcf7b7cd9684757355ee1eb0ac874af0f971ad2e054c1a8c471867bdaea4d9aaf7eea6d3cf81ac7dd73a2  panfrost.conf
-3b95a2292a7367d228f281a1f0e031fffb3d26748350d7010d26b18a3fb46bceb214b083e0c8e2d5fe318c67ae3776663ad78fef83ce9030529d3a89b581b703  tinydm-ebc-workaround-systemd.conf
-2432031a5785eecf84697c70e7ed17d4b10b9a36ebb73969b0016aefbc4feb1768b144031966fdf478c47f7b1032566975aa4affcbb66293c5f348e1d2151b37  tinydm-ebc-workaround-openrc.initd
+3b95a2292a7367d228f281a1f0e031fffb3d26748350d7010d26b18a3fb46bceb214b083e0c8e2d5fe318c67ae3776663ad78fef83ce9030529d3a89b581b703  tinydm-ebc-workaround-override.conf
 "
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update add tinydm-ebc
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-
-name=$RC_SVCNAME
-description="Restarts rockchip_ebc service before tinydm"
-
-depend() {
-    before tinydm
-}
-
-start() {
-    einfo "Reloading rockchip_ebc"
-    modprobe -r rockchip_ebc
-    modprobe rockchip_ebc
-    eend $?
-}
@@ -3,7 +3,7 @@
 maintainer="Arnav Singh <me@arnavion.dev>"
 pkgname=device-pine64-pinephone
 pkgver=11
-pkgrel=1
+pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -226,7 +226,7 @@ sway() {
 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
 	install -Dm644 "$srcdir"/x11-pinephone-keyboard.conf \
-		"$subpkgdir"/usr/share/X11/xorg.conf.d/pinephone-keyboard.conf
+		"$subpkgdir"/etc/X11/xorg.conf.d/pinephone-keyboard.conf
 }

 audio() {
@@ -3,7 +3,7 @@ maintainer="Jan Jasper de Kroon <jajadekroon@gmail.com>"
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
 pkgver=8
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -136,7 +136,7 @@ sway() {
 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
 	install -Dm644 "$srcdir"/x11-pinephone-keyboard.conf \
-		"$subpkgdir"/usr/share/X11/xorg.conf.d/pinephone-keyboard.conf
+		"$subpkgdir"/etc/X11/xorg.conf.d/pinephone-keyboard.conf
 }

 sha512sums="
@@ -4,7 +4,7 @@
 maintainer="Alistair Francis <alistair@alistair23.me>"
 pkgname=device-purism-librem5
 pkgver=12
-pkgrel=1
+pkgrel=0
 _confver=69
 _purismrel=2
 # <librem5-base ver>.<purism release>
@@ -142,7 +142,7 @@ usbguard() {
 x11() {
 	install_if="$pkgname xorg-server"
 	install -Dm644 "$srcdir"/xorg.conf \
-		"$subpkgdir"/usr/share/X11/xorg.conf.d/10-video.conf
+		"$subpkgdir"/etc/X11/xorg.conf.d/10-video.conf
 }

 package() {
@@ -1 +0,0 @@
-../../.gitlab-ci/packages/single-runner-defined-in-ci-common.yml.j2
@@ -1 +0,0 @@
-../../.gitlab-ci/packages/single-runner-defined-in-ci-common.yml.j2
@@ -1,38 +1,31 @@
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer="Duje Mihanović <duje@dujemihanovic.xyz>"
+maintainer="Duje Mihanović <duje.mihanovic@skole.hr>"
 pkgname=device-samsung-coreprimevelte
 pkgdesc="Samsung Galaxy Core Prime VE LTE"
-pkgver=10
+pkgver=8
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="
-	dtc
-	firmware-samsung-pxa1908
+depends="dtc
 	linux-samsung-coreprimevelte
-	mkbootimg
-	postmarketos-base
-	pxa-mkbootimg
-	systemd-boot
 	u-boot-coreprimevelte
+	postmarketos-base
+	mkbootimg
 	u-boot-tools
-"
+	pxa-mkbootimg"
 makedepends="devicepkg-dev"
+_pmb_recommends="firmware-samsung-pxa1908"
 source="
+	boot-image.its
 	deviceinfo
-	kernel-cmdline.conf
-	modprobe.d_mwifiex.conf
 	modules-initfs
 	90-mlan-to-wlan.rules
 "
-subpackages="$pkgname-udev"

 build() {
 	devicepkg_build $startdir $pkgname
-
-	fallocate -l 4k dummy-initramfs
 }

 package() {
@@ -42,22 +35,13 @@ package() {
 		-t "$pkgdir"/usr/lib/udev/rules.d

 	mkdir -p "$pkgdir"/usr/share/u-boot/coreprimevelte/
-	install -Dm644 dummy-initramfs \
+	install -Dm644 "$srcdir"/boot-image.its \
 		-t "$pkgdir"/usr/share/u-boot/coreprimevelte/
-
-	install -Dm644 "$srcdir"/modprobe.d_mwifiex.conf \
-		"$pkgdir"/usr/lib/modprobe.d/mwifiex.conf
-}
-
-udev() {
-	default_udev
-	install_if="$pkgname=$pkgver-r$pkgrel udev"
 }

 sha512sums="
-59b0f7785ed4db79b4b78cc88a601d23e3bda7f0ff46f97ffe2a11ec70824955b65f4854a7cecfa4314fb5fee587723e443391bbab9afa915ed3d69eab0d308f  deviceinfo
-a9193f0e8190aca5820a5c96c575c87cf190e61a015cb7145ee47721fb543868207725ee9ba113981e1a158ea3cabfeedb26160692b32306d6d7c84791f71dd2  kernel-cmdline.conf
-d0f22c864f19d9d54c42a8397cb8c2412d43192211fb36a86d0bd61f9f420349f774282b9b6789b54e7a8be6d379f18e56b49ae19260a60d0b572e39729931c2  modprobe.d_mwifiex.conf
+fd8183975ed524f5f04f45abadd58bf7cccda5672262dcb733a180f1a9b3edbab1abda3e849f2c0a7a8d593ac804b9b07952955f7c8af8bad1263015ab02c242  boot-image.its
+452485d2da3802b0a8557f951c94085c31f5ba5bb67a6c446080cd3735766d75cfbaa4f54c4396d0ba7919717f79130e953b047223de2b7d37cbfb5badbc3e3e  deviceinfo
 b1617e4b116d60abb15003c5bf7d4e8fa13e57a4a12feadd1e128946238b0922e98810289690f0466fec39f54adcc9ef08346acdef0f5a0fbb62c68438c3a063  modules-initfs
 d51facbaa99f69964786e770dc8ed500bfb2609353a25aa344701c851131cc421ef3a2663fe4422a21a5f38e01f0c34235fa4fad75739fb614109a2fb268db8a  90-mlan-to-wlan.rules
 "
@@ -0,0 +1,46 @@
+/dts-v1/;
+
+/ {
+	description = "Samsung Galaxy Core Prime VE LTE FIT";
+	#address-cells = <1>;
+
+	images {
+		kernel {
+			description = "Kernel image";
+			data = /incbin/("vmlinuz");
+			type = "kernel";
+			arch = "arm64";
+			os = "linux";
+			compression = "gzip";
+			load = <0x1000000>;
+			entry = <0x1000000>;
+		};
+
+		fdt {
+			description = "Device tree";
+			data = /incbin/("/boot/dtbs/marvell/mmp/pxa1908-samsung-coreprimevelte.dtb");
+			type = "flat_dt";
+			compression = "none";
+		};
+
+		initramfs {
+			description = "Initramfs image";
+			data = /incbin/("initramfs");
+			type = "ramdisk";
+			arch = "arm64";
+			os = "linux";
+			compression = "none";
+		};
+	};
+
+	configurations {
+		default = "standard";
+
+		standard {
+			description = "Normal boot";
+			kernel = "kernel";
+			fdt = "fdt";
+			ramdisk = "initramfs";
+		};
+	};
+};
@@ -17,11 +17,15 @@ deviceinfo_screen_height="800"
 deviceinfo_drm="true"

 # Bootloader related
+deviceinfo_create_initfs_extra="true"
 deviceinfo_dtb="marvell/mmp/pxa1908-samsung-coreprimevelte"
+deviceinfo_generate_uboot_fit_images="true"
 deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_bootimg_pxa="true"
+deviceinfo_bootimg_override_payload="u-boot.uImage"
+deviceinfo_bootimg_override_initramfs="boot-image.itb"
 deviceinfo_flash_kernel_on_update="true"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
@@ -31,9 +35,3 @@ deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
 deviceinfo_flash_sparse_samsung_format="1"
 deviceinfo_bootimg_append_seandroidenforce="true"
-
-# U-Boot related stuff. U-Boot is wrapped into an uImage and chainloaded by
-# Samsung's bootloader, after which the OS is located and booted through UEFI.
-# We only need a dummy initfs for boot-deploy (inspired by jolla-c2).
-deviceinfo_bootimg_override_payload="u-boot.uImage"
-deviceinfo_bootimg_override_initramfs="dummy-initramfs"
@@ -1,3 +0,0 @@
-# Our U-Boot currently implements no shutdown or reboot methods, so relying on
-# EFI services to do either doesn't work.
-efi=noruntime
@@ -1,2 +0,0 @@
-# Load WLAN calibration data from a firmware file
-options mwifiex cal_data_cfg=mrvl/WlanCalData_ext.conf
@@ -1,9 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer="Mithil Bavishi <bavishimithil@gmail.com>"
+maintainer="Mighty17 <mightymb17@gmail.com>"
 pkgname=device-samsung-espresso10
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
 pkgver=6
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -1,10 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Co-Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
-maintainer="Mithil Bavishi <bavishimithil@gmail.com>"
+maintainer="Mighty17 <mightymb17@gmail.com>"
 pkgname=device-samsung-espresso7
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
 pkgver=7
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -3,7 +3,7 @@ maintainer="Dzmitry Sankouski <dsankouski@gmail.com>"
 pkgname=device-samsung-starqltechn
 pkgdesc="Samsung Galaxy S9 SM-G9600"
 pkgver=11
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-sdm845
 	dtc
-	firmware-samsung-sdm845
+	hexagonfs-firmware-loader
 	hexagonrpcd>=0.3.2-r3
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
@@ -5,7 +5,7 @@ maintainer="Alexander Martinz <amartinz@shiftphones.com>"
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
 pkgver=20
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -69,7 +69,7 @@ nonfree_firmware_openrc() {
 }

 pmtest() {
-	depends="postmarketos-test-bootrr qrtr firmware-shift-sdm845 postmarketos-test-unl0kr"
+	depends="bootrr qrtr firmware-shift-sdm845 postmarketos-test-unl0kr"
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci"

 	mkdir -p "$subpkgdir"
@@ -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"
@@ -2,7 +2,7 @@
 maintainer="Joel Selvaraj <foss@joelselvaraj.com>"
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
-pkgver=18
+pkgver=16
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -19,6 +19,7 @@ makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	$pkgname-nonfree-firmware-udev:nonfree_firmware_udev
 	$pkgname-kernel-tianma:kernel_tianma
 	$pkgname-kernel-ebbg:kernel_ebbg
 "
@@ -30,6 +31,7 @@ source="
 	modules-initfs.ebbg
 	modules-initfs.tianma
 	q6voiced.conf
+	81-libssc-xiaomi-beryllium.rules
 "

 build() {
@@ -39,6 +41,8 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname

+	install -Dm644 "$srcdir"/81-libssc-xiaomi-beryllium.rules \
+		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-xiaomi-beryllium.rules
 	install -Dm644 "$srcdir"/q6voiced.conf \
 		"$pkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/hexagonrpcd.confd \
@@ -66,6 +70,12 @@ nonfree_firmware_openrc() {
 	mkdir -p "$subpkgdir"
 }

+nonfree_firmware_udev() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel udev"
+
+	default_udev
+}
+
 kernel_tianma() {
 	pkgdesc="Tianma Panel. To know which panel your device use and the status of the port, Visit the Poco F1 wiki page: https://wiki.postmarketos.org/wiki/Xiaomi_Poco_F1_(xiaomi-beryllium)"
 	depends="linux-postmarketos-qcom-sdm845"
@@ -80,9 +90,10 @@ kernel_ebbg() {

 sha512sums="
 5d48f17dcec44653e749191d4f236350e9ff0166df77b711f357dca6d74a1af7dfa768a2caa1dc309c2651d004edd0ab7846305513488f74d3ea7ae11da6168d  deviceinfo
-f16e550f623522be29027954c69a956eb6543f2f608a4c6b37c1a3983403a3edaa24e70aa42dbe88e76216991aba867b48c7341c9b8a81f675902d6223937b51  kernel-cmdline.conf
+003e5228a2b2825f24cb8b4842e3c3f72b99225f0aef3cda5bb2de4e4beb5e1c84800ba48c6cf1b84fe042bd039912e67c545c00981b604db0c0f0bcb546f7c5  kernel-cmdline.conf
 52079045a0c1f48628d891bf8867f5c1802152fce8e2c4bd787630f1f5e4c9b386bfc373e464cb053688350ac678dbc3c407a76a31a1ae700ca67764d0d384f1  hexagonrpcd.confd
 cab76675b9c48eb1ce0691b31667d17ee73ecf21439a7f7c9c2ba96344e3bf4ad713ebc685298d6e32ad589ba26f429cd6b0d200338b50d136ad1a29758e4214  modules-initfs.ebbg
 175a7d859956a029b91a1105b93c4113b07ab5cfe932294dd369808059ed03471625f64ce90e5146a65c0bb26417470d8f7c02e48dfacf2d016ce5b2c28cee76  modules-initfs.tianma
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
+2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-xiaomi-beryllium.rules
 "
@@ -1,4 +1 @@
 console=ttyMSM0,115200
-# FIXME: Console enabled to workaround a race condition with display initialisation
-# See https://gitlab.freedesktop.org/drm/msm/-/issues/46
-quiet
@@ -1,43 +0,0 @@
-From 21c36eefd5390fd80fc04eea0462ba49ca1457f7 Mon Sep 17 00:00:00 2001
-From: Dylan Van Assche <git@dylanvanassche.be>
-Date: Thu, 8 Jan 2026 16:25:00 +0100
-Subject: [PATCH] sargo: set mount matrix
-
---
- proprietary/vendor/etc/sensors/config/b4s4_bmi160.json | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/proprietary/vendor/etc/sensors/config/b4s4_bmi160.json b/proprietary/vendor/etc/sensors/config/b4s4_bmi160.json
-index aa47c9b..90a614e 100644
--- a/proprietary/vendor/etc/sensors/config/b4s4_bmi160.json
-+++ b/proprietary/vendor/etc/sensors/config/b4s4_bmi160.json
-@@ -236,7 +236,7 @@
-     ".placement":{
-       "owner": "sns_bmi160",
-       "0":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "1":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-@@ -248,7 +248,7 @@
-         "data": "0.0"
-       },
-       "4":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "5":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-@@ -260,7 +260,7 @@
-         "data": "0.0"
-       },
-       "8":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "9":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-- 
-2.52.0
-
@@ -1,7 +1,7 @@
 maintainer="Richard Acayan <mailingradian@gmail.com>"
 pkgname=firmware-google-sargo
 pkgver=220505.008
-pkgrel=10
+pkgrel=9
 pkgdesc="Proprietary firmware blobs from the Google Pixel 3a factory image"
 url="https://github.com/TheMuppets/proprietary_vendor_google_sargo"
 arch="aarch64"
@@ -14,7 +14,6 @@ source="
 	https://github.com/TheMuppets/proprietary_vendor_google_sargo/archive/$_commit.tar.gz
 	https://gitlab.com/flamingradian/firmware-google-sargo-modem/-/archive/$_modemfw_commit/firmware-google-sargo-modem-$_modemfw_commit.tar.gz
 	https://raw.githubusercontent.com/LineageOS/android_device_google_bonito/$_device_android_commit/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb
-	0001-sargo-set-mount-matrix.patch
 "
 builddir="$srcdir/proprietary_vendor_google_sargo-$_commit"
 options="!check !archcheck !strip !tracedeps textrels pmb:cross-native"
@@ -103,5 +102,4 @@ sha512sums="
 fbbb852405bd521efa4add32136b25f5d07b0671953b05ec66f7b04b6de483269b1e57500f1a723b6b00abb7b9b405e01d14552c686c5c6ffbdb4d0c14f98af0  c631f0f2aa24ea60cfb505d327cd4ae56ca27f16.tar.gz
 53a71c7d51d6277375076dcf7d89c2189ba67272238a8efa89f712238c2474ee777c3b0d749e8e28eeaa8e6bfbbd6eb56949481029d5ca3505cac321ce8963ef  firmware-google-sargo-modem-34bbe2c27f35537f13747c9eba67ece6ae141806.tar.gz
 dc2418dd0a45e0a5ed2e31771f5039d085527e30af9541d4469de7a52071f6a9133d87e00f7697f1379ac1dc201c4f4e8f5031a2eaf27ae5831d35bc06b61578  Global_cal.acdb
-035251fa69d544bf8c39b0ebfbd193f792387d1b063b0a070e33054952db07471287ab56c5e07805f2189671baa2316d387bfa7d682ccfc2ff91dc647a9302e7  0001-sargo-set-mount-matrix.patch
 "
@@ -1,52 +0,0 @@
-From 050045923d68d17e2b6326177acd8b54c245f1e7 Mon Sep 17 00:00:00 2001
-From: Dylan Van Assche <git@dylanvanassche.be>
-Date: Thu, 8 Jan 2026 16:07:36 +0100
-Subject: [PATCH] oneplus6: set mount matrix
-
---
- .../OnePlus/oneplus6/sensors/config/sdm845_bmi160_0.json    | 6 +++---
- .../oneplus6/sensors/registry/bmi160_0_platform.placement   | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/usr/share/qcom/sdm845/OnePlus/oneplus6/sensors/config/sdm845_bmi160_0.json b/usr/share/qcom/sdm845/OnePlus/oneplus6/sensors/config/sdm845_bmi160_0.json
-index 96cdf14..ddcbc62 100644
--- a/usr/share/qcom/sdm845/OnePlus/oneplus6/sensors/config/sdm845_bmi160_0.json
-+++ b/usr/share/qcom/sdm845/OnePlus/oneplus6/sensors/config/sdm845_bmi160_0.json
-@@ -201,7 +201,7 @@
-     ".placement":{
-       "owner": "sns_bmi160",
-       "0":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "1":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-@@ -213,7 +213,7 @@
-         "data": "0.0"
-       },
-       "4":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "5":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-@@ -225,7 +225,7 @@
-         "data": "0.0"
-       },
-       "8":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "9":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-diff --git a/usr/share/qcom/sdm845/OnePlus/oneplus6/sensors/registry/bmi160_0_platform.placement b/usr/share/qcom/sdm845/OnePlus/oneplus6/sensors/registry/bmi160_0_platform.placement
-index 2072fdd..0b684c1 100644
--- a/usr/share/qcom/sdm845/OnePlus/oneplus6/sensors/registry/bmi160_0_platform.placement
-+++ b/usr/share/qcom/sdm845/OnePlus/oneplus6/sensors/registry/bmi160_0_platform.placement
-@@ -1 +1 @@
-{"bmi160_0_platform.placement":{"owner":"sns_bmi160","0":{"type":"flt","ver":"0","data":"0.000000"},"1":{"type":"flt","ver":"0","data":"0.000000"},"2":{"type":"flt","ver":"0","data":"0.000000"},"3":{"type":"flt","ver":"0","data":"0.000000"},"4":{"type":"flt","ver":"0","data":"0.000000"},"5":{"type":"flt","ver":"0","data":"0.000000"},"6":{"type":"flt","ver":"0","data":"0.000000"},"7":{"type":"flt","ver":"0","data":"0.000000"},"8":{"type":"flt","ver":"0","data":"0.000000"},"9":{"type":"flt","ver":"0","data":"0.000000"},"10":{"type":"flt","ver":"0","data":"0.000000"},"11":{"type":"flt","ver":"0","data":"0.000000"}}}
-\ No newline at end of file
-+{"bmi160_0_platform.placement":{"owner":"sns_bmi160","0":{"type":"flt","ver":"0","data":"-1.000000"},"1":{"type":"flt","ver":"0","data":"0.000000"},"2":{"type":"flt","ver":"0","data":"0.000000"},"3":{"type":"flt","ver":"0","data":"0.000000"},"4":{"type":"flt","ver":"0","data":"-1.000000"},"5":{"type":"flt","ver":"0","data":"0.000000"},"6":{"type":"flt","ver":"0","data":"0.000000"},"7":{"type":"flt","ver":"0","data":"0.000000"},"8":{"type":"flt","ver":"0","data":"-1.000000"},"9":{"type":"flt","ver":"0","data":"0.000000"},"10":{"type":"flt","ver":"0","data":"0.000000"},"11":{"type":"flt","ver":"0","data":"0.000000"}}}
-- 
-2.52.0
-
@@ -2,7 +2,7 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=firmware-oneplus-sdm845
 pkgver=10
-pkgrel=3
+pkgrel=2
 pkgdesc="Firmware for OnePlus 6 / 6T"
 url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845"
 arch="aarch64"
@@ -16,9 +16,7 @@ source="$pkgname-$_version.tar.gz::$url/-/archive/$_version/$pkgname-$_version.t
 	firmware.files
 	sensor.files
 	30-oneplus-sdm845-firmware-ci.files
-	0001-oneplus6-set-mount-matrix.patch
 "
-builddir="$srcdir/$pkgname-$_version"
 subpackages="
 	$pkgname-pmtest
 	$pkgname-sensors:firmware_sensors
@@ -59,5 +57,4 @@ sha512sums="
 23e4ea891f688bf5669e4b8479aab06b56c5478429b759c22fa417e1ad09cb413e55856140b456c6b676b8920ecec40aa0215d8fd61a23ac2c5c02240552f247  firmware.files
 09e06851f8cd936aea191e839abca0a37a66444470df446eaaf24cee275a66611400286907565175d4d74627f6232bf2eed88b1d1906ce6416689a5c67e1c980  sensor.files
 d6a81ab4697e763eebf2b428e8a63dbdd0a44743691d9277e9d3c7de26dbcbddaea1928a6cfa5509f8f41506d8812022f200ec47f87d28e05af77302683ffcf4  30-oneplus-sdm845-firmware-ci.files
-3f5b04afd8ccd08e676cee2d290c08c3b5e0f0c0b85ddf6e94f86730615ea174a2cc57452dc8455f68675fc173bf0fb79c0505819c3e0203ad5a7acb5ebf4b10  0001-oneplus6-set-mount-matrix.patch
 "
@@ -1,7 +1,7 @@
-maintainer="Arnav Singh <me@arnavion.dev>"
+maintainer=""
 pkgname=firmware-pine64-ov5640
 pkgver=0_git20201028
-pkgrel=3
+pkgrel=2
 _commit="61beaa4eb1ad87ad067cfbe123fbcd0a0cf01246"
 pkgdesc="Firmware for the ov5640 autofocus"
 url="https://github.com/pmsourcedump/ov5640"
@@ -1,7 +1,7 @@
-maintainer="Mithil Bavishi <bavishimithil@gmail.com>"
+maintainer=""
 pkgname=firmware-samsung-espresso
 pkgver=1
-pkgrel=1
+pkgrel=0
 pkgdesc="Samsung Galaxy Tab Firmware"
 url="https://github.com/TheMuppets/proprietary_vendor_samsung"
 arch="armv7"
@@ -1,7 +1,7 @@
-maintainer="Stefan Hansson <newbyte@postmarketos.org>"
+maintainer=""
 pkgname=firmware-samsung-midas
 pkgver=8
-pkgrel=2
+pkgrel=1
 pkgdesc="Samsung Galaxy Midas board firmware (m0, m3, t0lte, ...)"
 _commit="fdd8c44568a148c22fbf008de822ff4e27992da1"
 url="https://github.com/TheMuppets/proprietary_vendor_samsung"
@@ -1,7 +1,7 @@
-maintainer="Duje Mihanović <duje@dujemihanovic.xyz>"
+maintainer=""
 pkgname=firmware-samsung-pxa1908
-pkgver=3
-pkgrel=0
+pkgver=2
+pkgrel=6
 pkgdesc="Firmware for Samsung PXA1908 devices"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -13,7 +13,8 @@ source="
 	$pkgname-$_commit.tar.gz::https://github.com/xcover3/$_repo/archive/$_commit.tar.gz
 	sd8x-wlan.initd
 "
-_fw_files="sd8777_uapsta.bin WlanCalData_ext.conf txpwrlimit_cfg.bin bt_cal_data.conf"
+_fw_file="sd8777_uapsta.bin"
+_misc_files="WlanCalData_ext.conf txpwrlimit_cfg.bin bt_cal_data.conf"
 builddir="$srcdir/$_repo-$_commit"
 install="$pkgname-downstream-openrc.post-install"
 subpackages="
@@ -22,18 +23,23 @@ subpackages="
 	"

 package() {
-	cd "$builddir"/proprietary/etc/firmware/mrvl/
-	for _i in $_fw_files; do
-		install -Dm644 "$_i" \
-			-t "$pkgdir/usr/lib/firmware/postmarketos/mrvl"
-	done
+	cd proprietary/etc/firmware/mrvl/
+
+	install -Dm644 "$_fw_file" \
+		-t "$pkgdir/lib/firmware/postmarketos/mrvl"
 }

 downstream() {
-	pkgdesc="Stub to pull service for enabling WLAN"
+	pkgdesc="Extra firmware files needed by downstream driver"
 	depends="$pkgname"

 	mkdir "$subpkgdir"
+
+	cd "$builddir"/proprietary/etc/firmware/mrvl/
+	for _i in $_misc_files; do
+		install -Dm644 "$_i" \
+			-t "$subpkgdir/lib/firmware/postmarketos/mrvl"
+	done
 }

 downstream_openrc() {
@@ -1,27 +0,0 @@
-maintainer="Dzmitry Sankouski <dsankouski@gmail.com>"
-pkgname=firmware-samsung-sdm845
-pkgver=20260323
-pkgrel=0
-pkgdesc="Firmware for Samsung Galaxy S9 series phones based on SDM845 SoC"
-url="https://github.com/dsankouski/firmware-samsung-sdm845"
-arch="aarch64"
-license="proprietary"
-options="!check !strip !spdx !archcheck !tracedeps textrels pmb:cross-native"
-
-_version="538a9464ebd63d6b65ba9f217f6056762b93150d"
-
-source="$pkgname-$_version.tar.gz::$url/archive/$_version.tar.gz
-	sensors.files
-"
-
-package() {
-	while IFS="" read -r _i || [ -n "$_i" ]; do
-		[ ! -d $(dirname $_i) ] && mkdir -p $(dirname $_i)
-		install -Dm644 "$srcdir/$pkgname-$_version/$_i" "$pkgdir/$_i"
-	done < "$srcdir/sensors.files"
-}
-
-sha512sums="
-55df6eac3260c64062e8d8334c3d315c1a14cdecef481353aac589f8f855a90effc738b36b42afb872e2caa2cff71c3e995738799506809aac8fe47ae4f683f4  firmware-samsung-sdm845-538a9464ebd63d6b65ba9f217f6056762b93150d.tar.gz
-e890c4b5acd5f992ea2eb5449b00f665d5ceff1919a5d8ef26d963be91a0870b80d1292329eb25e9af9065c8c73e8f414e85ba3526494c76fc9a64f399d24064  sensors.files
-"
@@ -1,182 +0,0 @@
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/AlacDecoderModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/ApeDecoderModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/AudioContextDetection.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/AudioSphereModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/CFCMModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/EtsiAmrWbPlusDecModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/EtsiEaacPlusEncAndCmnModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/fastrpc_shell_0
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/FlacDecoderModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/fluence_voiceplus_module.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/HeaacDecoderModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/libstabilitydomain_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/libsysmondomain_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/libsysmon_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/map_AVS_SHARED_LIBS_845.adsp.prodQ.txt
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/map_SHARED_LIBS_845.adsp.prodQ.txt
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/mmecns_module.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/SAPlusCmnModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/SVACmnModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/VoiceWakeup_V2_Module.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/VorbisDecoderModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/WmaProDecoderModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/adsp/WmaStdDecoderModule.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/fastrpc_shell_3
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libbenchmark_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libc++abi.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libc++.so.1
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libhcp_rpc_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libstabilitydomain_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libsysmondomain_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libsysmon_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libvpp_aie.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libvpp_diagtools.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libvpp_frc.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libvpp_mvp.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libvpp_nr.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libvpp_qbr.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/libvpp_svc_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/map_SHARED_LIBS_845.cdsp.prodQ.txt
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/cdsp/ubwcdma_dynlib.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/sdsp/fastrpc_shell_2
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/sdsp/libFastRPC_UTF_Forward_800s_sdm845_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/sdsp/libstabilitydomain_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/sdsp/libsysmondomain_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/sdsp/libsysmon_skel.so
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/sdsp/map_SHARED_LIBS_AAAAAAAAQ.txt
-usr/share/qcom/sdm845/Samsung/starqltechn/dsp/sdsp/map_SSC_SLPI_USER_AAAAAAAAQ.txt
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/ak991x_dri_0.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/lsm6dsm_0.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sdm845_ak991x_0.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sdm845_ak991x_2.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sdm845_lps22hb_0.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sdm845_lsm6dsm_0.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sdm845_lsm6dsm_2.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sdm845_power_0.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sdm845_tmd4906_0.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sns_amd.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sns_cm.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sns_diag_filter.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sns_fmv.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sns_geomag_rv.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sns_gyro_cal.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sns_mag_cal.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sns_rmd.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/config/sns_rotv.json
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0.mag
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0.mag.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0.mag.config_2
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0_platform
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0_platform.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0_platform.mag
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0_platform.mag.fac_cal
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0_platform.mag.fac_cal.bias
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0_platform.mag.fac_cal.corr_mat
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0_platform.orient
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/ak0991x_0_platform.placement
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lps22hb_0_platform
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lps22hb_0_platform.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lps22hb_0_platform.placement
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lps22hb_0_platform.pressure
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lps22hb_0_platform.pressure.fac_cal
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lps22hb_0_platform.pressure.fac_cal.bias
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lps22hb_0_platform.pressure.fac_cal.scale
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lps22hb_0_platform.temp
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lps22hb_0_platform.temp.fac_cal
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lps22hb_0_platform.temp.fac_cal.bias
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lps22hb_0_platform.temp.fac_cal.scale
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0.accel
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0.accel.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0.gyro
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0.gyro.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0.md
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0.md.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.accel
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.accel.fac_cal
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.accel.fac_cal.bias
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.accel.fac_cal.corr_mat
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.gyro
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.gyro.fac_cal
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.gyro.fac_cal.bias
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.gyro.fac_cal.corr_mat
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.md
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.md.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.orient
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.placement
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.temp
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.temp.fac_cal
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.temp.fac_cal.bias
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0_platform.temp.fac_cal.scale
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0.temp
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/lsm6dsm_0.temp.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/power
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/power.island
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sensors_registry
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_amd
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_cm
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_diag_sensor_datatype
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_fmv_platform
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_fmv_platform.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_geomag_rv
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_geomag_rv.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_gyro_cal_config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_gyro_cal_persist_s0
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_gyro_cal_persist_s0.bias
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_gyro_cal_persist_s0.compensation_matrix
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_gyro_cal_persist_s0.scale_factor
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_mag_cal_config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_mag_cal_persist_s0c0
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_mag_cal_persist_s0c0.bias
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_reg_config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_rmd
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_rotv_platform
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/sns_rotv_platform.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/tmd4906_platform
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/tmd4906_platform.als
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/tmd4906_platform.als.fac_cal
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/tmd4906_platform.config
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/tmd4906_platform.orient
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/tmd4906_platform.placement
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/tmd4906_platform.prox
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/tmd4906_platform.prox.fac_cal
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/tmd4906_platform.rgb
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/tmd4906_platform.rgb.fac_cal
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/registry/tmd4906_platform.rgb.target_val
-usr/share/qcom/sdm845/Samsung/starqltechn/sensors/sns_reg.conf
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/accessory_chip
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/build_id
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/chip_family
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/chip_name
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/family
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/foundry_id
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/hw_platform
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/image_crm_version
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/images
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/image_variant
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/image_version
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/machine
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/ncluster_array_offset
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/ndefective_parts_array_offset
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/nmodem_supported
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/nproduct_id
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/num_clusters
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/num_defective_parts
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/platform_subtype
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/platform_subtype_id
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/platform_version
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/pmic_die_revision
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/pmic_model
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/raw_device_family
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/raw_device_number
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/raw_id
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/raw_version
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/revision
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/select_image
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/serial_number
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/soc_id
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/uevent
-usr/share/qcom/sdm845/Samsung/starqltechn/socinfo/vendor
@@ -2,7 +2,7 @@
 maintainer="Joel Selvaraj <foss@joelselvaraj.com>"
 pkgname=firmware-xiaomi-beryllium
 pkgver=8
-pkgrel=2
+pkgrel=1
 pkgdesc="Firmware for Xiaomi Poco F1"
 url="https://gitlab.com/sdm845-mainline/firmware-xiaomi-beryllium"
 arch="aarch64"
@@ -15,10 +15,8 @@ _commit="5a797a180ddee8edabd5e6c9d0d3566f257ec4c3"
 source="$pkgname.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
 	firmware.files
 	sensor.files
-	mount-matrix.patch
 	"

-builddir="$srcdir/$pkgname-$_commit"
 subpackages="$pkgname-sensors:firmware_sensors"

 package() {
@@ -44,5 +42,4 @@ sha512sums="
 babe3ec1abde42f21f1943357a28548cb89c3df4f860a1c3bdef22782e38b77ff6e1fcf6dce44de4ba771da4c61bfad97df25520ff2b466288a081fd7a13cf7e  firmware-xiaomi-beryllium.tar.gz
 d41eb4cfd7b1fa932a6471162e1edb15f637be9b3b66648827916d5f3a03ebcae24b158b574916070a6d8a22cd8c0ac1bbcbafab8de6aba3b4932fa6bfb23bb1  firmware.files
 445600490c81091ec51b0ce50297e960f214d9848242e8dc35689ce40e5a7469e8d495d64b61e1a89d38aa6695cbd012f7f1cdd8c5e94cce0c1c64f2c833dba3  sensor.files
-9337e243aee9e56bb9f9e297dfe5084b3a97b87ac36bcaf66f6f4d07cbb39c7b73d024afe07fdadef254c569ba9f2d3067324478c35175592ff8abb2ff19e930  mount-matrix.patch
 "
@@ -1,52 +0,0 @@
-From e682cd17537df752cbe02be03e11333df06935f2 Mon Sep 17 00:00:00 2001
-From: Dylan Van Assche <git@dylanvanassche.be>
-Date: Tue, 10 Feb 2026 20:10:57 +0100
-Subject: [PATCH] beryllium: set mount matrix
-
---
- .../Xiaomi/beryllium/sensors/config/sdm845_bmi160_0.json    | 6 +++---
- .../beryllium/sensors/registry/bmi160_0_platform.placement  | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/usr/share/qcom/sdm845/Xiaomi/beryllium/sensors/config/sdm845_bmi160_0.json b/usr/share/qcom/sdm845/Xiaomi/beryllium/sensors/config/sdm845_bmi160_0.json
-index 90b4704..87bdadf 100644
--- a/usr/share/qcom/sdm845/Xiaomi/beryllium/sensors/config/sdm845_bmi160_0.json
-+++ b/usr/share/qcom/sdm845/Xiaomi/beryllium/sensors/config/sdm845_bmi160_0.json
-@@ -201,7 +201,7 @@
-     ".placement":{
-       "owner": "sns_bmi160",
-       "0":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "1":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-@@ -213,7 +213,7 @@
-         "data": "0.0"
-       },
-       "4":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "5":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-@@ -225,7 +225,7 @@
-         "data": "0.0"
-       },
-       "8":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "9":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-diff --git a/usr/share/qcom/sdm845/Xiaomi/beryllium/sensors/registry/bmi160_0_platform.placement b/usr/share/qcom/sdm845/Xiaomi/beryllium/sensors/registry/bmi160_0_platform.placement
-index 2072fdd..0b684c1 100755
--- a/usr/share/qcom/sdm845/Xiaomi/beryllium/sensors/registry/bmi160_0_platform.placement
-+++ b/usr/share/qcom/sdm845/Xiaomi/beryllium/sensors/registry/bmi160_0_platform.placement
-@@ -1 +1 @@
-{"bmi160_0_platform.placement":{"owner":"sns_bmi160","0":{"type":"flt","ver":"0","data":"0.000000"},"1":{"type":"flt","ver":"0","data":"0.000000"},"2":{"type":"flt","ver":"0","data":"0.000000"},"3":{"type":"flt","ver":"0","data":"0.000000"},"4":{"type":"flt","ver":"0","data":"0.000000"},"5":{"type":"flt","ver":"0","data":"0.000000"},"6":{"type":"flt","ver":"0","data":"0.000000"},"7":{"type":"flt","ver":"0","data":"0.000000"},"8":{"type":"flt","ver":"0","data":"0.000000"},"9":{"type":"flt","ver":"0","data":"0.000000"},"10":{"type":"flt","ver":"0","data":"0.000000"},"11":{"type":"flt","ver":"0","data":"0.000000"}}}
-\ No newline at end of file
-+{"bmi160_0_platform.placement":{"owner":"sns_bmi160","0":{"type":"flt","ver":"0","data":"-1.000000"},"1":{"type":"flt","ver":"0","data":"0.000000"},"2":{"type":"flt","ver":"0","data":"0.000000"},"3":{"type":"flt","ver":"0","data":"0.000000"},"4":{"type":"flt","ver":"0","data":"-1.000000"},"5":{"type":"flt","ver":"0","data":"0.000000"},"6":{"type":"flt","ver":"0","data":"0.000000"},"7":{"type":"flt","ver":"0","data":"0.000000"},"8":{"type":"flt","ver":"0","data":"-1.000000"},"9":{"type":"flt","ver":"0","data":"0.000000"},"10":{"type":"flt","ver":"0","data":"0.000000"},"11":{"type":"flt","ver":"0","data":"0.000000"}}}
-- 
-GitLab
-
@@ -2,7 +2,7 @@
 # Kernel config based on: arch/arm64/configs/pinenote_defconfig
 maintainer="Antoine Martin (ayakael) <dev@ayakael.net>"
 pkgname=linux-pine64-pinenote
-pkgver=6.19.11
+pkgver=6.19.3
 _kernver=${pkgver%.*}
 pkgrel=0
 pkgdesc="Pine64 PineNote close to mainline fork"
@@ -34,7 +34,6 @@ _commit="526524233b7156b194cf6f0869d2059dfa4c90e9"
 source="
 	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
 	$pkgname-$_kernver-$_commit.patch::https://ayakael.net/forge/linux-pinenote/compare/$_commit..v$_kernver.patch
-	enable-ultra-suspend.patch
 	$_config
 "
 # get patch releases
@@ -83,7 +82,6 @@ package() {
 sha512sums="
 01b29c7f4e5bc0c9802794c2cd027fece825f90417be229a71e60eefce530010d5d301749c54ae744e9d4a483518e769e2bb7e6e9209687681ad7fff11c3ed86  linux-6.19.tar.xz
 468c7d0ab2463adc8b9a56448ddd0819d56a5914b99baa921e2989ec1fdc5c414c02ef72e55691acc9b75ddd1afff5c17953fc2d2e1ed81210e5f7c40cd01765  linux-pine64-pinenote-6.19-526524233b7156b194cf6f0869d2059dfa4c90e9.patch
-665bdc843912a22bc9f1840bf89195f6cccabd2b8ca3313f3c61b5503c84f98395e3de0d28bc31cbc9f1b4be4a41a483db156fad353506bb5be7abdc22e46501  enable-ultra-suspend.patch
-e173cb7e305ee0a13833bdb5600b1e37f3405c4de1914e18001e80dc665a42e8ca43018e5e9f66269f82d85ecc77d316d67a8f45acc6aec55b357b95ba784c7d  config-pine64-pinenote.aarch64
-c68361a19d04529226beb12cdd3a764bdcf481dbad342d5626d83412a00857588942308e880a92fceac31c79fe6f389bcf7b1f171e7c57b0110ec2babc0e24ae  linux-pine64-pinenote-6.19.11.patch.xz
+7e8071c98f94b6cc5c6dae72e9045a3956145cae4b25ac07868379ddda0d22b17413136bff4ff92700a728d07c520c878fad163693fa1e6c3258b7deb0bdc400  config-pine64-pinenote.aarch64
+42cf563be07254942e3873a91241f423753d4a4dc70e18bc8ac210519c0642aef45ea91fdd0e359b7e428a87c5e091e8be3e1199ebeaf679bfc7a09af5e1206e  linux-pine64-pinenote-6.19.3.patch.xz
 "
@@ -1,16 +1,16 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.19.11 Kernel Configuration
+# Linux/arm64 6.19.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="Alpine clang version 22.1.2"
+CONFIG_CC_VERSION_TEXT="Alpine clang version 21.1.8"
 CONFIG_GCC_VERSION=0
 CONFIG_CC_IS_CLANG=y
-CONFIG_CLANG_VERSION=220102
+CONFIG_CLANG_VERSION=210108
 CONFIG_AS_IS_LLVM=y
-CONFIG_AS_VERSION=220102
+CONFIG_AS_VERSION=210108
 CONFIG_LD_VERSION=0
 CONFIG_LD_IS_LLD=y
-CONFIG_LLD_VERSION=220102
+CONFIG_LLD_VERSION=210108
 CONFIG_RUSTC_VERSION=0
 CONFIG_RUSTC_LLVM_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -110,7 +110,6 @@ CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
-CONFIG_BPF_LSM=y
 # end of BPF subsystem

 CONFIG_PREEMPT_NONE_BUILD=y
@@ -683,11 +682,10 @@ CONFIG_SCHED_MC=y
 CONFIG_HOTPLUG_CORE_SYNC=y
 CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 CONFIG_GENERIC_IRQ_ENTRY=y
-CONFIG_KPROBES=y
+# CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_KRETPROBES=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -1088,7 +1086,7 @@ CONFIG_AF_UNIX_OOB=y
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
 CONFIG_XFRM_ALGO=m
-# CONFIG_XFRM_USER is not set
+CONFIG_XFRM_USER=m
 # CONFIG_XFRM_INTERFACE is not set
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
@@ -1159,7 +1157,6 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
 # CONFIG_IPV6_SEG6_HMAC is not set
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
 # CONFIG_IPV6_IOAM6_LWTUNNEL is not set
-# CONFIG_NETLABEL is not set
 # CONFIG_MPTCP is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NET_PTP_CLASSIFY=y
@@ -1261,13 +1258,11 @@ CONFIG_NETFILTER_XT_NAT=m
 # CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set

@@ -1401,8 +1396,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
 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=m
-# CONFIG_IP_NF_SECURITY 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
@@ -1436,8 +1430,7 @@ CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
 CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
+# CONFIG_IP6_NF_RAW is not set
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 # CONFIG_IP6_NF_TARGET_NPT is not set
@@ -2587,7 +2580,7 @@ CONFIG_USB_NET_CDC_NCM=m
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_NET_PLUSB is not set
 # CONFIG_USB_NET_MCS7830 is not set
-CONFIG_USB_NET_RNDIS_HOST=m
+# CONFIG_USB_NET_RNDIS_HOST is not set
 # CONFIG_USB_NET_CDC_SUBSET is not set
 # CONFIG_USB_NET_ZAURUS is not set
 # CONFIG_USB_NET_CX82310_ETH is not set
@@ -6042,6 +6035,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_HYM8563 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_MAX31335 is not set
+# CONFIG_RTC_DRV_NVIDIA_VRS10 is not set
 # CONFIG_RTC_DRV_NCT3018Y is not set
 CONFIG_RTC_DRV_RK808=y
 # CONFIG_RTC_DRV_RS5C372 is not set
@@ -7480,7 +7474,6 @@ CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
@@ -7589,26 +7582,11 @@ CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_PROC_MEM_ALWAYS_FORCE=y
 # CONFIG_PROC_MEM_FORCE_PTRACE is not set
 # CONFIG_PROC_MEM_NO_FORCE is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-# CONFIG_SECURITY_NETWORK is not set
-# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
-# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_SECURITY_LANDLOCK is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-# CONFIG_IMA is not set
 # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
-# CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,ipe,bpf"

 #
 # Kernel hardening options
@@ -8204,6 +8182,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y

 # CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set

 #
@@ -8232,7 +8211,6 @@ CONFIG_RCU_TRACE=y
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 CONFIG_CPU_HOTPLUG_STATE_CONTROL=y
 # CONFIG_LATENCYTOP is not set
-# CONFIG_DEBUG_CGROUP_REF is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -8277,11 +8255,8 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_KPROBE_EVENTS=y
-# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 # CONFIG_UPROBE_EVENTS is not set
 CONFIG_EPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
@@ -8299,7 +8274,6 @@ CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_KPROBE_EVENT_GEN_TEST is not set
 # CONFIG_RV is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
@@ -8320,7 +8294,6 @@ CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
 #
 # CONFIG_KUNIT is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FUNCTION_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 # CONFIG_KCOV is not set
@@ -1,160 +0,0 @@
-Patch-Source: https://git.sr.ht/~hrdl/linux/log/v6.19_ultra_suspend
-From af0f33629aefaa75ea6318352debdb8b64655c15 Mon Sep 17 00:00:00 2001
-From: hrdl <git@hrdl.eu>
-Date: Sun, 15 Mar 2026 21:35:31 +0100
-Subject: [PATCH] [rockchip suspend driver] allow overriding suspend_state
-
-Rockchip's bl31 behaves differently when configured with
-suspend_state=5, which identifies rockchip's ultra suspend mode. This
-is a prerequisite to achieve significant power savings in suspend mode
-with rockchip's bl31.
-
-Signed-off-by: hrdl <git@hrdl.eu>
---
- drivers/soc/rockchip/rockchip_pm_config.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/soc/rockchip/rockchip_pm_config.c b/drivers/soc/rockchip/rockchip_pm_config.c
-index 65524181695fb8eafa0c09adf5d9c9860f1f6654..e5f982879c42b9f4ca5ac751cd973f880917b1b6 100644
--- a/drivers/soc/rockchip/rockchip_pm_config.c
-+++ b/drivers/soc/rockchip/rockchip_pm_config.c
-@@ -38,6 +38,8 @@ static struct rk_on_off_regulator_list {
- 	struct regulator_dev *off_reg_list[MAX_ON_OFF_REG_NUM];
- } on_off_regs_list[RK_PM_STATE_MAX];
- 
-+static int suspend_state_override = 0;
-+
- static const struct of_device_id pm_match_table[] = {
- 	{ .compatible = "rockchip,pm-px30",},
- 	{ .compatible = "rockchip,pm-rk1808",},
-@@ -190,6 +192,9 @@ static int pm_config_probe(struct platform_device *pdev)
- 	else
- 		sip_smc_set_suspend_mode(WKUP_SOURCE_CONFIG, wakeup_config, 0);
- 
-+	of_property_read_u32(node, "rockchip,suspend-state-override",
-+			     &suspend_state_override);
-+
- 	if (of_property_read_u32_array(node,
- 				       "rockchip,pwm-regulator-config",
- 				       &pwm_regulator_config, 1))
-@@ -250,6 +255,9 @@ static int pm_config_prepare(struct device *dev)
- 	struct regulator_dev **on_list;
- 	struct regulator_dev **off_list;
- 
-+	if (suspend_state_override)
-+		suspend_state = suspend_state_override;
-+
- 	sip_smc_set_suspend_mode(LINUX_PM_STATE,
- 				 suspend_state,
- 				 0);
-From 693fee19336c7b348e30222a31de06eb34f70e25 Mon Sep 17 00:00:00 2001
-From: hrdl <git@hrdl.eu>
-Date: Sun, 15 Mar 2026 21:35:31 +0100
-Subject: [PATCH] [HACK]: Input: cyttsp5: support resume from ultra suspend
-
-Signed-off-by: hrdl <git@hrdl.eu>
---
- drivers/input/touchscreen/cyttsp5.c | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/input/touchscreen/cyttsp5.c b/drivers/input/touchscreen/cyttsp5.c
-index 63e71f3b1ff2c40ec29d5c01a37afeee20512c33..c163ef2d87b80267b7cf28f7967162be8ac3177d 100644
--- a/drivers/input/touchscreen/cyttsp5.c
-+++ b/drivers/input/touchscreen/cyttsp5.c
-@@ -1008,11 +1008,22 @@ static int __maybe_unused cyttsp5_suspend(struct device *dev)
- static int __maybe_unused cyttsp5_resume(struct device *dev)
- {
- 	struct cyttsp5 *ts = dev_get_drvdata(dev);
-+	int error = 0;
-+
-+	if (!device_may_wakeup(dev)) {
-+		error = cyttsp5_power_control(ts, true);
-+
-+		if (error) {
-+			gpiod_set_value_cansleep(ts->reset_gpio, 1);
-+			msleep(10);
-+			gpiod_set_value_cansleep(ts->reset_gpio, 0);
-+			msleep(20);
-+			error = 0;
-+			// error = cyttsp5_startup(ts);
-+		}
-+	}
- 
-	if (!device_may_wakeup(dev))
-		cyttsp5_power_control(ts, true);
-
-	return 0;
-+	return error;
- }
- 
- static SIMPLE_DEV_PM_OPS(cyttsp5_pm, cyttsp5_suspend, cyttsp5_resume);
-From ee2c553f7893e82223e42436cebbcf8c4958464d Mon Sep 17 00:00:00 2001
-From: hrdl <git@hrdl.eu>
-Date: Sun, 15 Mar 2026 21:35:32 +0100
-Subject: [PATCH] arm64: dts: rockchip: pinenote: enable rockchip's ultra
- suspend mode
-
-This reduces suspend power consumption from about 60 mW to about 11
-mW, extending the battery life in suspend mode from a week to about
-1.5 months. This is achieved by
-
-1. Disabling the *_pmu regulators in suspend to save power.
-2. Overriding the suspend mode to instruct bl31 to configure the
-  system for ultra suspend (suspend mode 5). This is needed for the
-  system to resume.
-3. Indicate that the wifi mmc module will be powered off during
-  suspend. Without it the driver will not try to reinitialise it.
-
-Signed-off-by: hrdl <git@hrdl.eu>
---
- arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
-index 15118c7ea8aa70f8ddcd26ebe4411dfe0b04e7b4..fe2219961b2420874626941ac56d42f7a444ce34 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
-@@ -137,6 +137,7 @@
- 		compatible = "rockchip,pm-rk3568";
- 		status = "okay";
- 		rockchip,sleep-debug-en = <0>;
-+		rockchip,suspend-state-override = <5>;
- 		rockchip,sleep-mode-config = <
- 			(0
- 			| RKPM_SLP_CENTER_OFF
-@@ -486,7 +487,7 @@
- 				regulator-max-microvolt = <1800000>;
- 
- 				regulator-state-mem {
-					regulator-on-in-suspend;
-+					regulator-off-in-suspend;
- 				};
- 			};
- 
-@@ -508,7 +509,7 @@
- 				regulator-max-microvolt = <900000>;
- 
- 				regulator-state-mem {
-					regulator-on-in-suspend;
-+					regulator-off-in-suspend;
- 				};
- 			};
- 
-@@ -541,7 +542,7 @@
- 				regulator-max-microvolt = <3300000>;
- 
- 				regulator-state-mem {
-					regulator-on-in-suspend;
-+					regulator-off-in-suspend;
- 				};
- 			};
- 
-@@ -981,7 +982,7 @@
- 	bus-width = <4>;
- 	cap-sd-highspeed;
- 	cap-sdio-irq;
-	keep-power-in-suspend;
-+	cap-power-off-card;
- 	mmc-pwrseq = <&sdio_pwrseq>;
- 	non-removable;
- 	pinctrl-0 = <&sdmmc1_bus4>, <&sdmmc1_clk>, <&sdmmc1_cmd>;
@@ -2,7 +2,7 @@
 # Co-Maintainer: Ingo Reitz <9l@9lo.re>
 maintainer="WeirdTreeThing <bradyn127@protonmail.com>"
 pkgname=linux-postmarketos-mediatek-mt81
-pkgver=6.18.21
+pkgver=6.18.13
 pkgrel=0
 pkgdesc="Mainline kernel for mediatek mt8183/mt8192/mt8195/mt8186"
 arch="aarch64"
@@ -83,7 +83,7 @@ package() {


 sha512sums="
-905fd68a53a69d228dbfbded4bbdbda68d1d776f31e5950d52771c9923d13950f3b76cbd840f04beb9029fe39d6c1946f66bccce0241f8a01d13b8af6c6fa8b1  linux-6.18.21.tar.xz
+361052a6d964dbe33b958d35c63a6695a0b2f9d06c21c924141f67060f2f44fd995a977129dc053ab74b3132fa3921a7e7ad8fa5d69113442b5ab9ba431a2967  linux-6.18.13.tar.xz
 d74da1231181835bec82015da1b3f5b08a1fe9c3c35dd712e285891094d94d9427ceac75d32f74be3a635e17d93ad82b37adf97db8176efc91aed17535023fc2  mt8183-fix-bluetooth.patch
 e4eaff9d3ec1a56ae2503dd353ad57bf072219e68c26ba8b894feb90d6ccb01bd131cdde8d238451258679aca1203a9ebdd888f01ee2a118d46f981ff4bcf54c  mt8186-enable-dpi.patch
 2c282b7cd4f72c998d65e4160b9d1f9122676a6392ef45f734dbd5428754eccc06404a057ea19ea097bf6237e27b3483c271c1ed15b20e359419ab9fb61b8d83  mt8186-ASoC-hdmi-codec-Add-event-handler-for-hdmi-TX.patch
@@ -91,5 +91,5 @@ b2dcf3e3b9f80d185f587972ab6fc1f07e8ec7c7dbe3aa75c53ff6d3c7380ff4c3e6f39479297658
 e09b8fc578742b0efcfb7e4419b30de39feecf3303def62576110c98e3a7101c68c78d1276f885e585ee21536df1f2474df5816f0dffa8f99ea1df1c787fe2c6  mt8186-drm-bridge-it6505-Add-audio-support.patch
 b4c005f705bbae87b93dd061b4d02f982f2dbce1c59635a02b501def1eb784b057d1555c2c11e868f81a91365dcd1c0fbecf85034b6da701011cb2b68ecb3404  mt8186-ASoC-mediatek-mt8186-make-FE-nonatomic-and-no_pcm.patch
 06539b9c5cdaa41e4e0a4bfb8e300548cf95387db716a2f896062690075f07419e9e211c0cb5537caaa046cfae646e47413e12fde0a3c71c9f94868f464de208  mtk-pmdomain.patch
-18fc8e451b249d022d59a6d1328ddcf27a2ffb5706ba78a7a97942e07dc283dcfb07657b2e607db7277ab4641ae3d31322e72b797f6d4c8f14b0ceff7372b30a  config-postmarketos-mediatek-mt81.aarch64
+b5e9ec3ae66b9e4052ec244a1cfdc3fdb70a22a1e53b00d026300d30dbba011b6e3642771002860c2760118b5001de8a12eb98808ff644bc3fae04e639b3a7ff  config-postmarketos-mediatek-mt81.aarch64
 "
@@ -1,16 +1,16 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.18.21 Kernel Configuration
+# Linux/arm64 6.18.9 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="Alpine clang version 22.1.2"
+CONFIG_CC_VERSION_TEXT="Alpine clang version 21.1.8"
 CONFIG_GCC_VERSION=0
 CONFIG_CC_IS_CLANG=y
-CONFIG_CLANG_VERSION=220102
+CONFIG_CLANG_VERSION=210108
 CONFIG_AS_IS_LLVM=y
-CONFIG_AS_VERSION=220102
+CONFIG_AS_VERSION=210108
 CONFIG_LD_VERSION=0
 CONFIG_LD_IS_LLD=y
-CONFIG_LLD_VERSION=220102
+CONFIG_LLD_VERSION=210108
 CONFIG_RUSTC_VERSION=0
 CONFIG_RUSTC_LLVM_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -104,7 +104,7 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
-CONFIG_BPF_LSM=y
+# CONFIG_BPF_LSM is not set
 # end of BPF subsystem

 CONFIG_PREEMPT_BUILD=y
@@ -710,12 +710,11 @@ CONFIG_SCHED_MC=y
 CONFIG_HOTPLUG_CORE_SYNC=y
 CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 CONFIG_GENERIC_IRQ_ENTRY=y
-CONFIG_KPROBES=y
+# CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
 CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_KRETPROBES=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -1274,13 +1273,11 @@ CONFIG_NETFILTER_XT_NAT=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set

@@ -1415,7 +1412,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
 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=m
+# CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_SECURITY is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_NFT_COMPAT_ARP=m
@@ -1452,7 +1449,7 @@ CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
 CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP6_NF_SECURITY is not set
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -2246,8 +2243,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 # CONFIG_XEN_BLKDEV_BACKEND is not set
 CONFIG_VIRTIO_BLK=y
 # CONFIG_BLK_DEV_RBD is not set
-CONFIG_BLK_DEV_UBLK=m
-CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+# CONFIG_BLK_DEV_UBLK is not set

 #
 # NVME Support
@@ -8429,16 +8425,16 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_ROMFS_FS is not set
 # CONFIG_PSTORE is not set
 # CONFIG_UFS_FS is not set
-CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS=y
 # CONFIG_EROFS_FS_DEBUG is not set
 CONFIG_EROFS_FS_XATTR=y
 CONFIG_EROFS_FS_POSIX_ACL=y
 CONFIG_EROFS_FS_SECURITY=y
 CONFIG_EROFS_FS_BACKED_BY_FILE=y
 CONFIG_EROFS_FS_ZIP=y
-CONFIG_EROFS_FS_ZIP_LZMA=y
-CONFIG_EROFS_FS_ZIP_DEFLATE=y
-CONFIG_EROFS_FS_ZIP_ZSTD=y
+# CONFIG_EROFS_FS_ZIP_LZMA is not set
+# CONFIG_EROFS_FS_ZIP_DEFLATE is not set
+# CONFIG_EROFS_FS_ZIP_ZSTD is not set
 # CONFIG_EROFS_FS_ZIP_ACCEL is not set
 # CONFIG_EROFS_FS_ONDEMAND is not set
 # CONFIG_EROFS_FS_PCPU_KTHREAD is not set
@@ -8943,7 +8939,7 @@ CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_ARM64=y
 CONFIG_XZ_DEC_SPARC=y
 CONFIG_XZ_DEC_RISCV=y
-CONFIG_XZ_DEC_MICROLZMA=y
+# CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
@@ -9184,6 +9180,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y

 # CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set

 #
@@ -9212,7 +9209,6 @@ CONFIG_RCU_TRACE=y
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
-# CONFIG_DEBUG_CGROUP_REF is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -9257,8 +9253,6 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_KPROBE_EVENTS=y
-# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_EPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
@@ -9279,7 +9273,6 @@ CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_KPROBE_EVENT_GEN_TEST is not set
 # CONFIG_RV is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
@@ -9300,7 +9293,6 @@ CONFIG_STRICT_DEVMEM=y
 #
 # CONFIG_KUNIT is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FUNCTION_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 # CONFIG_KCOV is not set
@@ -3,7 +3,7 @@
 # Co-Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
 maintainer="Adam Thiede <me@adamthiede.com>"
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=7.0
+pkgver=6.19.6
 pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
@@ -37,7 +37,7 @@ case $pkgver in
 	*.*)	_kernver=$pkgver;;
 esac
 source="
-	https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-${pkgver//_/-}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${pkgver//_/-}.tar.xz
 	$_config
 "
 builddir="$srcdir/linux-${_kernver//_/-}"
@@ -69,6 +69,6 @@ package() {
 }

 sha512sums="
-8c85b708342f8f09ca25b2234b22e93b62b144a9ef919fbb21827f52fa47498e778c79db1559524dd7fb360f95b2ce174171443c1859656c281be41d2b6c5a0b  linux-7.0.tar.xz
-da794d5ff5d0b8e7d0c2d0f421c662620bf818c531ebd37ccc6f526173777d4c122eb2a727b1b5f4d57defe8a768262672fbebc0fe49a9692e90e6e406e65414  config-postmarketos-mediatek-mt8173.aarch64
+efbcb5c24bcf257e724387cd5caf069de6351230cbf6e15589d9c371b9a36d92ad211866dba72818b38458ced9c4a8ea4f572b49c0b0f282254f10030d456e2a  linux-6.19.6.tar.xz
+e49f5406d213889ba849a5962a92f3af27cc3a5077e6497dc6abf520aaa36bcee0a60eeea932834087d6727f380b8c10cb762431ab604672a64b1e52708acd8d  config-postmarketos-mediatek-mt8173.aarch64
 "
@@ -1,16 +1,16 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 7.0.0 Kernel Configuration
+# Linux/arm64 6.19.6 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="Alpine clang version 22.1.3"
+CONFIG_CC_VERSION_TEXT="Alpine clang version 22.1.0"
 CONFIG_GCC_VERSION=0
 CONFIG_CC_IS_CLANG=y
-CONFIG_CLANG_VERSION=220103
+CONFIG_CLANG_VERSION=220100
 CONFIG_AS_IS_LLVM=y
-CONFIG_AS_VERSION=220103
+CONFIG_AS_VERSION=220100
 CONFIG_LD_VERSION=0
 CONFIG_LD_IS_LLD=y
-CONFIG_LLD_VERSION=220103
+CONFIG_LLD_VERSION=220100
 CONFIG_RUSTC_VERSION=0
 CONFIG_RUSTC_LLVM_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -20,7 +20,6 @@ CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_ASSUME=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_CC_HAS_COUNTED_BY=y
-CONFIG_CC_HAS_COUNTED_BY_PTR=y
 CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING=y
 CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
 CONFIG_PAHOLE_VERSION=0
@@ -105,11 +104,13 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
-CONFIG_BPF_LSM=y
+# CONFIG_BPF_LSM is not set
 # end of BPF subsystem

 CONFIG_PREEMPT_BUILD=y
 CONFIG_ARCH_HAS_PREEMPT_LAZY=y
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
 # CONFIG_PREEMPT_LAZY is not set
 CONFIG_PREEMPT_COUNT=y
@@ -426,7 +427,6 @@ CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
 # CONFIG_ARM64_ERRATUM_3194386 is not set
-CONFIG_ARM64_ERRATUM_4311569=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -500,6 +500,9 @@ CONFIG_THUMB2_COMPAT_VDSO=y
 # ARMv8.1 architectural features
 #
 CONFIG_ARM64_HW_AFDBM=y
+CONFIG_ARM64_PAN=y
+CONFIG_ARM64_LSE_ATOMICS=y
+CONFIG_ARM64_USE_LSE_ATOMICS=y
 # end of ARMv8.1 architectural features

 #
@@ -691,6 +694,7 @@ CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
 CONFIG_VIRT_XFER_TO_GUEST_WORK=y
 CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
+CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
 CONFIG_KVM_GUEST_MEMFD=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
@@ -715,13 +719,11 @@ CONFIG_SCHED_MC=y
 CONFIG_HOTPLUG_CORE_SYNC=y
 CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 CONFIG_GENERIC_IRQ_ENTRY=y
-CONFIG_KPROBES=y
+# CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-# CONFIG_STATIC_CALL_SELFTEST is not set
 CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_KRETPROBES=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -782,7 +784,6 @@ CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS=y
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_PV_STEAL_CLOCK_GEN=y
 CONFIG_HAVE_MOVE_PUD=y
 CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
@@ -829,7 +830,6 @@ CONFIG_ARCH_HAS_RELR=y
 CONFIG_RELR=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_ARCH_HAS_CC_PLATFORM=y
-CONFIG_HAVE_STATIC_CALL=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -980,6 +980,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_HARDENED is not set
 # CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
+CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
 # end of Slab allocator options

@@ -1000,8 +1001,8 @@ CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
 CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_SPLIT_PMD_PTLOCKS=y
-CONFIG_BALLOON=y
-CONFIG_BALLOON_MIGRATION=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 CONFIG_PAGE_REPORTING=y
@@ -1080,9 +1081,7 @@ CONFIG_EXECMEM=y
 CONFIG_NUMA_MEMBLKS=y
 # CONFIG_NUMA_EMU is not set
 CONFIG_ARCH_HAS_USER_SHADOW_STACK=y
-CONFIG_PT_RECLAIM=y
 CONFIG_FIND_NORMAL_PAGE=y
-CONFIG_ARCH_HAS_LAZY_MMU_MODE=y

 #
 # Data Access Monitoring
@@ -1284,13 +1283,11 @@ CONFIG_NETFILTER_XT_NAT=m
 # CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set

@@ -1425,7 +1422,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
 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=m
+# CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_SECURITY is not set
 CONFIG_IP_NF_ARPTABLES=m
 # CONFIG_IP_NF_ARPFILTER is not set
@@ -1461,7 +1458,7 @@ CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
 CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
+# CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP6_NF_SECURITY is not set
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -1499,7 +1496,6 @@ CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
 # CONFIG_NET_DSA_TAG_DSA is not set
 # CONFIG_NET_DSA_TAG_EDSA is not set
 # CONFIG_NET_DSA_TAG_MTK is not set
-# CONFIG_NET_DSA_TAG_MXL_862XX is not set
 # CONFIG_NET_DSA_TAG_MXL_GSW1XX is not set
 # CONFIG_NET_DSA_TAG_KSZ is not set
 # CONFIG_NET_DSA_TAG_OCELOT is not set
@@ -2637,7 +2633,6 @@ CONFIG_NET_DSA_BCM_SF2=m
 # CONFIG_NET_DSA_MV88E6060 is not set
 # CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON is not set
 # CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_MXL862 is not set
 # CONFIG_NET_DSA_AR9331 is not set
 # CONFIG_NET_DSA_QCA8K is not set
 # CONFIG_NET_DSA_SJA1105 is not set
@@ -2690,6 +2685,7 @@ CONFIG_SYSTEMPORT=m
 # CONFIG_NET_VENDOR_CORTINA is not set
 CONFIG_NET_VENDOR_DAVICOM=y
 # CONFIG_DM9051 is not set
+# CONFIG_DNET is not set
 # CONFIG_NET_VENDOR_DEC is not set
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
@@ -2745,6 +2741,7 @@ CONFIG_NET_VENDOR_MUCSE=y
 # CONFIG_FEALNX is not set
 # CONFIG_NET_VENDOR_NI is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
 # CONFIG_NET_VENDOR_NETRONOME is not set
 # CONFIG_NET_VENDOR_NVIDIA is not set
 # CONFIG_NET_VENDOR_OKI is not set
@@ -2789,6 +2786,7 @@ CONFIG_NET_VENDOR_WANGXUN=y
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
 # CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
 CONFIG_MDIO_BUS=m
 CONFIG_PHYLINK=m
 CONFIG_PHYLIB=m
@@ -3425,18 +3423,18 @@ CONFIG_SERIAL_8250_EXAR=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+# CONFIG_SERIAL_8250_PCI1XXXX is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 # CONFIG_SERIAL_8250_RSA is not set
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_PCI1XXXX is not set
+CONFIG_SERIAL_8250_DWLIB=y
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_RT288X is not set
 CONFIG_SERIAL_8250_MT6577=y
 CONFIG_SERIAL_8250_PERICOM=y
 CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_8250_DWLIB=y

 #
 # Non-8250 serial port support
@@ -3582,6 +3580,7 @@ CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_CADENCE=m
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_DESIGNWARE_CORE=y
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 # CONFIG_I2C_EMEV2 is not set
@@ -3622,7 +3621,6 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 # end of I2C support

 # CONFIG_I3C is not set
-CONFIG_I3C_OR_I2C=y
 CONFIG_SPI=y
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
@@ -3700,7 +3698,6 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_KVM=y
-CONFIG_PTP_1588_CLOCK_VMCLOCK=y
 # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_FC3W is not set
@@ -3866,7 +3863,6 @@ CONFIG_GPIO_MAX77620=y
 #
 # CONFIG_GPIO_AGGREGATOR is not set
 # CONFIG_GPIO_LATCH is not set
-# CONFIG_GPIO_LINE_MUX is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_VIRTIO is not set
 # CONFIG_GPIO_SIM is not set
@@ -4390,7 +4386,6 @@ CONFIG_REGULATOR_HI6421V530=y
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX77503 is not set
 CONFIG_REGULATOR_MAX77620=y
-# CONFIG_REGULATOR_MAX77675 is not set
 # CONFIG_REGULATOR_MAX77857 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
@@ -4445,7 +4440,6 @@ CONFIG_REGULATOR_ROHM=y
 # CONFIG_REGULATOR_RT6160 is not set
 # CONFIG_REGULATOR_RT6190 is not set
 # CONFIG_REGULATOR_RT6245 is not set
-# CONFIG_REGULATOR_RT8092 is not set
 # CONFIG_REGULATOR_RTQ2134 is not set
 # CONFIG_REGULATOR_RTMV20 is not set
 # CONFIG_REGULATOR_RTQ6752 is not set
@@ -4461,7 +4455,6 @@ CONFIG_REGULATOR_ROHM=y
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 CONFIG_REGULATOR_TPS65132=m
-# CONFIG_REGULATOR_TPS65185 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_REGULATOR_VCTRL=m
 # CONFIG_REGULATOR_QCOM_LABIBB is not set
@@ -4724,7 +4717,6 @@ CONFIG_VIDEO_MEDIATEK_VPU=m
 #
 # Sunxi media platform drivers
 #
-# CONFIG_VIDEO_DW_MIPI_CSI2RX is not set

 #
 # Texas Instruments drivers
@@ -4802,7 +4794,6 @@ CONFIG_VIDEO_IMX219=m
 # CONFIG_VIDEO_MT9V111 is not set
 # CONFIG_VIDEO_OG01A1B is not set
 # CONFIG_VIDEO_OG0VE1B is not set
-# CONFIG_VIDEO_OS05B10 is not set
 # CONFIG_VIDEO_OV01A10 is not set
 # CONFIG_VIDEO_OV02A10 is not set
 # CONFIG_VIDEO_OV02E10 is not set
@@ -4842,10 +4833,8 @@ CONFIG_VIDEO_OV5645=m
 # CONFIG_VIDEO_RDACM21 is not set
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_S5C73M3 is not set
-# CONFIG_VIDEO_S5K3M5 is not set
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5KJN1 is not set
 # CONFIG_VIDEO_VD55G1 is not set
 # CONFIG_VIDEO_VD56G3 is not set
 # CONFIG_VIDEO_VGXY61 is not set
@@ -5021,7 +5010,14 @@ CONFIG_DRM_TTM_HELPER=m
 CONFIG_DRM_GEM_DMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y
-# CONFIG_DRM_AMDGPU is not set
+
+#
+# Drivers for system framebuffers
+#
+CONFIG_DRM_SYSFB_HELPER=y
+CONFIG_DRM_EFIDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
+# end of Drivers for system framebuffers

 #
 # ARM devices
@@ -5032,74 +5028,19 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_KOMEDA=m
 # end of ARM devices

-# CONFIG_DRM_AST is not set
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-# CONFIG_DRM_CHIPONE_ICN6211 is not set
-# CONFIG_DRM_CHRONTEL_CH7033 is not set
-# CONFIG_DRM_CROS_EC_ANX7688 is not set
-CONFIG_DRM_DISPLAY_CONNECTOR=y
-CONFIG_DRM_I2C_NXP_TDA998X=y
-# CONFIG_DRM_ITE_IT6263 is not set
-CONFIG_DRM_ITE_IT6505=y
-CONFIG_DRM_LONTIUM_LT8912B=m
-# CONFIG_DRM_LONTIUM_LT9211 is not set
-CONFIG_DRM_LONTIUM_LT9611=m
-CONFIG_DRM_LONTIUM_LT9611UXC=m
-# CONFIG_DRM_ITE_IT66121 is not set
-# CONFIG_DRM_LVDS_CODEC is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-CONFIG_DRM_NWL_MIPI_DSI=m
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-CONFIG_DRM_PARADE_PS8640=y
-# CONFIG_DRM_SAMSUNG_DSIM is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-CONFIG_DRM_SII902X=m
-# CONFIG_DRM_SII9234 is not set
-CONFIG_DRM_SIMPLE_BRIDGE=y
-# CONFIG_DRM_SOLOMON_SSD2825 is not set
-CONFIG_DRM_THINE_THC63LVD1024=m
-# CONFIG_DRM_TOSHIBA_TC358762 is not set
-# CONFIG_DRM_TOSHIBA_TC358764 is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TOSHIBA_TC358768 is not set
-# CONFIG_DRM_TOSHIBA_TC358775 is not set
-# CONFIG_DRM_TI_DLPC3433 is not set
-# CONFIG_DRM_TI_TDP158 is not set
-# CONFIG_DRM_TI_TFP410 is not set
-# CONFIG_DRM_TI_SN65DSI83 is not set
-CONFIG_DRM_TI_SN65DSI86=m
-# CONFIG_DRM_TI_TPD12S015 is not set
-# CONFIG_DRM_WAVESHARE_BRIDGE is not set
-# CONFIG_DRM_ANALOGIX_ANX6345 is not set
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-CONFIG_DRM_ANALOGIX_ANX7625=y
-CONFIG_DRM_I2C_ADV7511=m
-CONFIG_DRM_I2C_ADV7511_AUDIO=y
-CONFIG_DRM_I2C_ADV7511_CEC=y
-# CONFIG_DRM_CDNS_DSI is not set
-CONFIG_DRM_CDNS_MHDP8546=m
-# end of Display Interface Bridges
-
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_GUD is not set
-CONFIG_DRM_HISI_HIBMC=m
-CONFIG_DRM_HISI_KIRIN=m
-CONFIG_DRM_POWERVR=y
-# CONFIG_DRM_LIMA is not set
-# CONFIG_DRM_LOGICVC is not set
-CONFIG_DRM_MEDIATEK=y
-# CONFIG_DRM_MEDIATEK_DP is not set
-CONFIG_DRM_MEDIATEK_HDMI_COMMON=y
-CONFIG_DRM_MEDIATEK_HDMI=y
-# CONFIG_DRM_MEDIATEK_HDMI_V2 is not set
-# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_AMDGPU is not set
 # CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_XE is not set
+# CONFIG_DRM_VGEM is not set
+# CONFIG_DRM_VKMS is not set
+# CONFIG_DRM_VMWGFX is not set
+CONFIG_DRM_UDL=m
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_QXL is not set
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_VIRTIO_GPU_KMS=y
 CONFIG_DRM_PANEL=y

 #
@@ -5182,7 +5123,6 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_LTL106HL02 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
@@ -5227,26 +5167,68 @@ CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 # end of Display Panels

-CONFIG_DRM_PANFROST=y
-# CONFIG_DRM_PANTHOR is not set
-CONFIG_DRM_PL111=m
-# CONFIG_DRM_QXL is not set
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_ST7571 is not set
-# CONFIG_DRM_ST7586 is not set
-# CONFIG_DRM_ST7735R is not set
-# CONFIG_DRM_ST7920 is not set
-# CONFIG_DRM_SSD130X is not set
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y

 #
-# Drivers for system framebuffers
+# Display Interface Bridges
 #
-CONFIG_DRM_SYSFB_HELPER=y
-CONFIG_DRM_EFIDRM=y
-# CONFIG_DRM_SIMPLEDRM is not set
-# end of Drivers for system framebuffers
+# CONFIG_DRM_CHIPONE_ICN6211 is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
+# CONFIG_DRM_CROS_EC_ANX7688 is not set
+CONFIG_DRM_DISPLAY_CONNECTOR=y
+CONFIG_DRM_I2C_NXP_TDA998X=y
+# CONFIG_DRM_ITE_IT6263 is not set
+CONFIG_DRM_ITE_IT6505=y
+CONFIG_DRM_LONTIUM_LT8912B=m
+# CONFIG_DRM_LONTIUM_LT9211 is not set
+CONFIG_DRM_LONTIUM_LT9611=m
+CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_ITE_IT66121 is not set
+# CONFIG_DRM_LVDS_CODEC is not set
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_NWL_MIPI_DSI=m
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+CONFIG_DRM_PARADE_PS8640=y
+# CONFIG_DRM_SAMSUNG_DSIM is not set
+# CONFIG_DRM_SIL_SII8620 is not set
+CONFIG_DRM_SII902X=m
+# CONFIG_DRM_SII9234 is not set
+CONFIG_DRM_SIMPLE_BRIDGE=y
+# CONFIG_DRM_SOLOMON_SSD2825 is not set
+CONFIG_DRM_THINE_THC63LVD1024=m
+# CONFIG_DRM_TOSHIBA_TC358762 is not set
+# CONFIG_DRM_TOSHIBA_TC358764 is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TOSHIBA_TC358768 is not set
+# CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TI_DLPC3433 is not set
+# CONFIG_DRM_TI_TDP158 is not set
+# CONFIG_DRM_TI_TFP410 is not set
+# CONFIG_DRM_TI_SN65DSI83 is not set
+CONFIG_DRM_TI_SN65DSI86=m
+# CONFIG_DRM_TI_TPD12S015 is not set
+# CONFIG_DRM_WAVESHARE_BRIDGE is not set
+# CONFIG_DRM_ANALOGIX_ANX6345 is not set
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+CONFIG_DRM_ANALOGIX_ANX7625=y
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
+CONFIG_DRM_I2C_ADV7511_CEC=y
+# CONFIG_DRM_CDNS_DSI is not set
+CONFIG_DRM_CDNS_MHDP8546=m
+# end of Display Interface Bridges

-CONFIG_DRM_TIDSS=m
+# CONFIG_DRM_ETNAVIV is not set
+CONFIG_DRM_HISI_HIBMC=m
+CONFIG_DRM_HISI_KIRIN=m
+# CONFIG_DRM_LOGICVC is not set
+CONFIG_DRM_MEDIATEK=y
+# CONFIG_DRM_MEDIATEK_DP is not set
+CONFIG_DRM_MEDIATEK_HDMI_COMMON=y
+CONFIG_DRM_MEDIATEK_HDMI=y
+# CONFIG_DRM_MEDIATEK_HDMI_V2 is not set
 # CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
@@ -5261,14 +5243,18 @@ CONFIG_DRM_TIDSS=m
 # CONFIG_TINYDRM_MI0283QT is not set
 # CONFIG_TINYDRM_REPAPER is not set
 # CONFIG_TINYDRM_SHARP_MEMORY is not set
-CONFIG_DRM_UDL=m
-# CONFIG_DRM_VGEM is not set
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VIRTIO_GPU_KMS=y
-# CONFIG_DRM_VKMS is not set
-# CONFIG_DRM_VMWGFX is not set
-# CONFIG_DRM_XE is not set
+CONFIG_DRM_PL111=m
 # CONFIG_DRM_XEN_FRONTEND is not set
+# CONFIG_DRM_LIMA is not set
+CONFIG_DRM_PANFROST=y
+# CONFIG_DRM_PANTHOR is not set
+CONFIG_DRM_TIDSS=m
+# CONFIG_DRM_GUD is not set
+# CONFIG_DRM_ST7571_I2C is not set
+# CONFIG_DRM_ST7586 is not set
+# CONFIG_DRM_ST7735R is not set
+# CONFIG_DRM_SSD130X is not set
+CONFIG_DRM_POWERVR=y
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y

 #
@@ -5369,7 +5355,6 @@ CONFIG_BACKLIGHT_PWM=y

 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
-# CONFIG_FIRMWARE_EDID is not set

 #
 # Console display driver support
@@ -5386,11 +5371,8 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_MONO_FILE="drivers/video/logo/logo_linux_mono.pbm"
 CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_VGA16_FILE="drivers/video/logo/logo_linux_vga16.ppm"
 CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_LINUX_CLUT224_FILE="drivers/video/logo/logo_linux_clut224.ppm"
 # CONFIG_TRACE_GPU_MEM is not set
 # end of Graphics support

@@ -5833,7 +5815,6 @@ CONFIG_SND_SOC_RT1015P=m
 # CONFIG_SND_SOC_RT1318_SDW is not set
 # CONFIG_SND_SOC_RT1320_SDW is not set
 CONFIG_SND_SOC_RT5514=m
-# CONFIG_SND_SOC_RT5575 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_RT5640 is not set
@@ -5878,6 +5859,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
 # CONFIG_SND_SOC_TAS2770 is not set
 # CONFIG_SND_SOC_TAS2780 is not set
 # CONFIG_SND_SOC_TAS2781_I2C is not set
+# CONFIG_SND_SOC_TAS2783_SDW is not set
 # CONFIG_SND_SOC_TAS5086 is not set
 CONFIG_SND_SOC_TAS571X=m
 # CONFIG_SND_SOC_TAS5720 is not set
@@ -6082,7 +6064,6 @@ CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PLAYSTATION=m
 CONFIG_PLAYSTATION_FF=y
 CONFIG_HID_PXRC=m
-# CONFIG_HID_RAPOO is not set
 CONFIG_HID_RAZER=m
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_RETRODE=m
@@ -6275,7 +6256,6 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_DWC3_HAPS=y
 CONFIG_USB_DWC3_OF_SIMPLE=y
 CONFIG_USB_DWC3_GENERIC_PLAT=y
-# CONFIG_USB_DWC3_GOOGLE is not set
 CONFIG_USB_DWC2=y
 # CONFIG_USB_DWC2_HOST is not set

@@ -6584,7 +6564,6 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m
 # LED drivers
 #
 # CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_OSRAM_AMS_AS3668 is not set
 # CONFIG_LEDS_AW200XX is not set
 # CONFIG_LEDS_AW2013 is not set
 # CONFIG_LEDS_BCM6328 is not set
@@ -6641,7 +6620,6 @@ CONFIG_LEDS_SYSCON=y
 #
 # CONFIG_LEDS_GROUP_MULTICOLOR is not set
 # CONFIG_LEDS_KTD202X is not set
-# CONFIG_LEDS_LP5812 is not set
 # CONFIG_LEDS_NCP5623 is not set
 # CONFIG_LEDS_PWM_MULTICOLOR is not set
 CONFIG_LEDS_QCOM_LPG=m
@@ -6864,6 +6842,7 @@ CONFIG_UDMABUF=y
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
 CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_SYSFS_STATS is not set
 # CONFIG_DMABUF_HEAPS_SYSTEM is not set
 CONFIG_DMABUF_HEAPS_CMA=y
 # end of DMABUF options
@@ -7232,7 +7211,6 @@ CONFIG_PLATFORM_MHU=y
 # CONFIG_MTK_ADSP_MBOX is not set
 CONFIG_MTK_CMDQ_MBOX=y
 # CONFIG_MTK_GPUEB_MBOX is not set
-# CONFIG_MTK_VCP_MBOX is not set
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
@@ -7259,7 +7237,6 @@ CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_MMU_500_CPRE_ERRATA=y
 CONFIG_ARM_SMMU_V3=y
 # CONFIG_ARM_SMMU_V3_SVA is not set
-# CONFIG_TEGRA241_CMDQV is not set
 # CONFIG_IOMMUFD is not set
 CONFIG_MTK_IOMMU=y
 # CONFIG_VIRTIO_IOMMU is not set
@@ -7510,7 +7487,6 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_AD4030 is not set
 # CONFIG_AD4080 is not set
 # CONFIG_AD4130 is not set
-# CONFIG_AD4134 is not set
 # CONFIG_AD4170_4 is not set
 # CONFIG_AD4695 is not set
 # CONFIG_AD4851 is not set
@@ -7593,13 +7569,11 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
-# CONFIG_TI_ADS1018 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS124S08 is not set
 # CONFIG_TI_ADS1298 is not set
 # CONFIG_TI_ADS131E08 is not set
-# CONFIG_TI_ADS131M02 is not set
 # CONFIG_TI_ADS7138 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS7950 is not set
@@ -7630,7 +7604,6 @@ CONFIG_TI_ADS1015=m
 #
 # CONFIG_AD8366 is not set
 # CONFIG_ADA4250 is not set
-# CONFIG_ADL8113 is not set
 # CONFIG_HMC425 is not set
 # end of Amplifiers

@@ -7732,12 +7705,10 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_LTC2664 is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
-# CONFIG_MAX22007 is not set
 # CONFIG_MAX5522 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4728 is not set
-# CONFIG_MCP47FEB02 is not set
 # CONFIG_MCP4821 is not set
 # CONFIG_MCP4922 is not set
 # CONFIG_TI_DAC082S085 is not set
@@ -7944,7 +7915,6 @@ CONFIG_VCNL4000=m
 # CONFIG_MAG3110 is not set
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 # CONFIG_MMC35240 is not set
-# CONFIG_MMC5633 is not set
 CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
@@ -8011,8 +7981,6 @@ CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
 # Pressure sensors
 #
 # CONFIG_ABP060MG is not set
-# CONFIG_ABP2030PA_I2C is not set
-# CONFIG_ABP2030PA_SPI is not set
 # CONFIG_ROHM_BM1390 is not set
 # CONFIG_BMP280 is not set
 CONFIG_IIO_CROS_EC_BARO=m
@@ -8025,8 +7993,7 @@ CONFIG_IIO_CROS_EC_BARO=m
 # CONFIG_MPL115_I2C is not set
 # CONFIG_MPL115_SPI is not set
 CONFIG_MPL3115=m
-# CONFIG_MPRLS0025PA_I2C is not set
-# CONFIG_MPRLS0025PA_SPI is not set
+# CONFIG_MPRLS0025PA is not set
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_SDP500 is not set
@@ -8140,7 +8107,6 @@ CONFIG_RESET_SCMI=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-# CONFIG_PHY_GOOGLE_USB is not set
 # CONFIG_PHY_CAN_TRANSCEIVER is not set
 # CONFIG_PHY_NXP_PTN3222 is not set

@@ -8473,7 +8439,6 @@ CONFIG_EROFS_FS_ZIP_ZSTD=y
 # CONFIG_EROFS_FS_ZIP_ACCEL is not set
 # CONFIG_EROFS_FS_ONDEMAND is not set
 # CONFIG_EROFS_FS_PCPU_KTHREAD is not set
-# CONFIG_EROFS_FS_PAGE_CACHE_SHARE is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V2=y
@@ -8481,7 +8446,7 @@ CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=y
 # CONFIG_NFS_SWAP is not set
-CONFIG_NFS_V4_0=y
+CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=y
 CONFIG_PNFS_BLOCK=y
@@ -8590,7 +8555,7 @@ CONFIG_KEYS=y
 # CONFIG_TRUSTED_KEYS is not set
 # CONFIG_ENCRYPTED_KEYS is not set
 CONFIG_KEY_DH_OPERATIONS=y
-CONFIG_SECURITY_DMESG_RESTRICT=y
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_PROC_MEM_ALWAYS_FORCE=y
 # CONFIG_PROC_MEM_FORCE_PTRACE is not set
 # CONFIG_PROC_MEM_NO_FORCE is not set
@@ -8715,13 +8680,13 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
-# CONFIG_CRYPTO_MLDSA is not set
 # end of Public-key cryptography

 #
 # Block ciphers
 #
 CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_TI is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARIA is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -8753,6 +8718,7 @@ CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_NHPOLY1305=y
 # end of Length-preserving ciphers and modes

 #
@@ -8835,12 +8801,16 @@ CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # end of Userspace interface

+CONFIG_CRYPTO_NHPOLY1305_NEON=y
+
 #
 # Accelerated Cryptographic Algorithms for CPU (arm64)
 #
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 # CONFIG_CRYPTO_SM3_NEON is not set
 CONFIG_CRYPTO_SM3_ARM64_CE=m
+# CONFIG_CRYPTO_AES_ARM64 is not set
+CONFIG_CRYPTO_AES_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_CRYPTO_AES_ARM64_BS=y
@@ -8887,7 +8857,6 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-CONFIG_OPENSSL_SUPPORTS_ML_DSA=y
 # end of Certificates for signature checking

 # CONFIG_CRYPTO_KRB5 is not set
@@ -8930,7 +8899,6 @@ CONFIG_CRC_OPTIMIZATIONS=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_AES_ARCH=y
 CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_BLAKE2B=y
@@ -8940,8 +8908,6 @@ CONFIG_CRYPTO_LIB_CURVE25519=m
 CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
 CONFIG_CRYPTO_LIB_DES=m
 CONFIG_CRYPTO_LIB_MD5=y
-CONFIG_CRYPTO_LIB_NH=y
-CONFIG_CRYPTO_LIB_NH_ARCH=y
 CONFIG_CRYPTO_LIB_POLY1305=y
 CONFIG_CRYPTO_LIB_POLY1305_ARCH=y
 CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
@@ -9038,6 +9004,7 @@ CONFIG_SGL_ALLOC=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 CONFIG_IRQ_POLL=y
@@ -9113,7 +9080,6 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_WARN_CONTEXT_ANALYSIS=y
 # end of Compile-time checks and compiler options

 #
@@ -9210,7 +9176,6 @@ CONFIG_SCHED_INFO=y
 # end of Scheduler Debugging

 # CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_ATOMIC is not set

 #
 # Lock Debugging (spinlocks, mutexes, etc...)
@@ -9262,7 +9227,6 @@ CONFIG_RCU_TRACE=y
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
-# CONFIG_DEBUG_CGROUP_REF is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -9308,8 +9272,6 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_KPROBE_EVENTS=y
-# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_EPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
@@ -9330,7 +9292,6 @@ CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_KPROBE_EVENT_GEN_TEST is not set
 # CONFIG_RV is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
@@ -9352,7 +9313,6 @@ CONFIG_STRICT_DEVMEM=y
 #
 # CONFIG_KUNIT is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FUNCTION_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 # CONFIG_KCOV is not set
@@ -9368,4 +9328,3 @@ CONFIG_MEMTEST=y
 # end of Kernel hacking

 CONFIG_IO_URING_ZCRX=y
-CONFIG_IO_URING_BPF=y
@@ -12,3 +12,179 @@ index 9d588cfaa..ac033debf 100644
 +		interrupts = <0>;
 +	};
 };
+diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
+index dd5227cf8..61e1075bd 100644
+--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
+@@ -479,15 +479,15 @@ config INPUT_AXP20X_PEK
+ 	  be called axp20x-pek.
+ 
+ 
+-config INPUT_TWL4030_PWRBUTTON
+-	tristate "TWL4030 Power button Driver"
+config INPUT_TWL_PWRBUTTON
+	tristate "TWL Power button Driver"
+ 	depends on TWL4030_CORE
+ 	help
+ 	  Say Y here if you want to enable power key reporting via the
+-	  TWL4030 family of chips.
+	  TWL family of chips.
+ 
+ 	  To compile this driver as a module, choose M here. The module will
+-	  be called twl4030_pwrbutton.
+	  be called twl_pwrbutton
+ 
+ config INPUT_TWL4030_VIBRA
+ 	tristate "Support for TWL4030 Vibrator"
+diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
+index b92c53a6b..03531e525 100644
+--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
+@@ -78,7 +78,7 @@ obj-$(CONFIG_INPUT_SOC_BUTTON_ARRAY)	+= soc_button_array.o
+ obj-$(CONFIG_INPUT_STPMIC1_ONKEY)  	+= stpmic1_onkey.o
+ obj-$(CONFIG_INPUT_TPS65218_PWRBUTTON)	+= tps65218-pwrbutton.o
+ obj-$(CONFIG_INPUT_TPS65219_PWRBUTTON)	+= tps65219-pwrbutton.o
+-obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON)	+= twl4030-pwrbutton.o
+obj-$(CONFIG_INPUT_TWL_PWRBUTTON)	+= twl-pwrbutton.o
+ obj-$(CONFIG_INPUT_TWL4030_VIBRA)	+= twl4030-vibra.o
+ obj-$(CONFIG_INPUT_TWL6040_VIBRA)	+= twl6040-vibra.o
+ obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
+diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl-pwrbutton.c
+similarity index 58%
+rename from drivers/input/misc/twl4030-pwrbutton.c
+rename to drivers/input/misc/twl-pwrbutton.c
+index b307cca17..9f6081474 100644
+--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl-pwrbutton.c
+@@ -31,15 +31,22 @@
+ 
+ #define PWR_PWRON_IRQ (1 << 0)
+ 
+-#define STS_HW_CONDITIONS 0xf
+#define TWL4030_STS_HW_CONDITIONS 0x0f
+#define TWL6030_STS_HW_CONDITIONS 0x21
+ 
+-static irqreturn_t powerbutton_irq(int irq, void *_pwr)
+static irqreturn_t twl_pwrbutton_irq(int irq, void *_pwr)
+ {
+ 	struct input_dev *pwr = _pwr;
+ 	int err;
+ 	u8 value;
+ 
+-	err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &value, STS_HW_CONDITIONS);
+	if (twl_class_is_4030())
+		err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &value,
+				TWL4030_STS_HW_CONDITIONS);
+	else
+		err = twl_i2c_read_u8(TWL6030_MODULE_ID0, &value,
+				TWL6030_STS_HW_CONDITIONS);
+
+ 	if (!err)  {
+ 		pm_wakeup_event(pwr->dev.parent, 0);
+ 		input_report_key(pwr, KEY_POWER, value & PWR_PWRON_IRQ);
+@@ -52,7 +59,7 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr)
+ 	return IRQ_HANDLED;
+ }
+ 
+-static int twl4030_pwrbutton_probe(struct platform_device *pdev)
+static int twl_pwrbutton_probe(struct platform_device *pdev)
+ {
+ 	struct input_dev *pwr;
+ 	int irq = platform_get_irq(pdev, 0);
+@@ -64,15 +71,23 @@ static int twl4030_pwrbutton_probe(struct platform_device *pdev)
+ 		return -ENOMEM;
+ 	}
+ 
+-	input_set_capability(pwr, EV_KEY, KEY_POWER);
+-	pwr->name = "twl4030_pwrbutton";
+-	pwr->phys = "twl4030_pwrbutton/input0";
+	pwr->evbit[0] = BIT_MASK(EV_KEY);
+	pwr->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
+	pwr->name = "twl_pwrbutton";
+	pwr->phys = "twl_pwrbutton/input0";
+ 	pwr->dev.parent = &pdev->dev;
+ 
+-	err = devm_request_threaded_irq(&pdev->dev, irq, NULL, powerbutton_irq,
+	if (twl_class_is_6030()) {
+		twl6030_interrupt_unmask(TWL6030_PWRON_INT_MASK,
+			REG_INT_MSK_LINE_A);
+		twl6030_interrupt_unmask(TWL6030_PWRON_INT_MASK,
+			REG_INT_MSK_STS_A);
+	}
+
+	err = devm_request_threaded_irq(&pwr->dev, irq, NULL, twl_pwrbutton_irq,
+ 			IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING |
+ 			IRQF_ONESHOT,
+-			"twl4030_pwrbutton", pwr);
+			"twl_pwrbutton", pwr);
+ 	if (err < 0) {
+ 		dev_err(&pdev->dev, "Can't get IRQ for pwrbutton: %d\n", err);
+ 		return err;
+@@ -84,31 +99,45 @@ static int twl4030_pwrbutton_probe(struct platform_device *pdev)
+ 		return err;
+ 	}
+ 
+	platform_set_drvdata(pdev, pwr);
+ 	device_init_wakeup(&pdev->dev, true);
+ 
+ 	return 0;
+ }
+ 
+static void twl_pwrbutton_remove(struct platform_device *pdev)
+{
+	if (twl_class_is_6030()) {
+		twl6030_interrupt_mask(TWL6030_PWRON_INT_MASK,
+			REG_INT_MSK_LINE_A);
+		twl6030_interrupt_mask(TWL6030_PWRON_INT_MASK,
+			REG_INT_MSK_STS_A);
+	}
+
+
+}
+
+ #ifdef CONFIG_OF
+-static const struct of_device_id twl4030_pwrbutton_dt_match_table[] = {
+static const struct of_device_id twl_pwrbutton_dt_match_table[] = {
+        { .compatible = "ti,twl4030-pwrbutton" },
+       { .compatible = "ti,twl6030-pwrbutton" },
+        {},
+ };
+-MODULE_DEVICE_TABLE(of, twl4030_pwrbutton_dt_match_table);
+MODULE_DEVICE_TABLE(of, twl_pwrbutton_dt_match_table);
+ #endif
+ 
+-static struct platform_driver twl4030_pwrbutton_driver = {
+-	.probe		= twl4030_pwrbutton_probe,
+static struct platform_driver twl_pwrbutton_driver = {
+	.probe		= twl_pwrbutton_probe,
+	.remove		= twl_pwrbutton_remove,
+ 	.driver		= {
+-		.name	= "twl4030_pwrbutton",
+-		.of_match_table = of_match_ptr(twl4030_pwrbutton_dt_match_table),
+		.name	= "twl_pwrbutton",
+		.of_match_table = of_match_ptr(twl_pwrbutton_dt_match_table),
+ 	},
+ };
+-module_platform_driver(twl4030_pwrbutton_driver);
+module_platform_driver(twl_pwrbutton_driver);
+ 
+-MODULE_ALIAS("platform:twl4030_pwrbutton");
+-MODULE_DESCRIPTION("Triton2 Power Button");
+MODULE_ALIAS("platform:twl_pwrbutton");
+MODULE_DESCRIPTION("TWL Power Button");
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Peter De Schrijver <peter.de-schrijver@nokia.com>");
+ MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
+-
+diff --git a/include/linux/mfd/twl.h b/include/linux/mfd/twl.h
+index 8871cc518..108138c99 100644
+--- a/include/linux/mfd/twl.h
+++ b/include/linux/mfd/twl.h
+@@ -113,6 +113,7 @@ enum twl6030_module_ids {
+ #define REG_INT_MSK_STS_C		0x08
+ 
+ /* MASK INT REG GROUP A */
+#define TWL6030_PWRON_INT_MASK		0x01
+ #define TWL6030_PWR_INT_MASK 		0x07
+ #define TWL6030_RTC_INT_MASK 		0x18
+ #define TWL6030_HOTDIE_INT_MASK 	0x20
Author	SHA1	Message	Date
Bart Ribbers	9c4ee155d1	bigscreen: tinydm	2026-03-31 17:54:50 +02:00
Bart Ribbers	9b9ff6fd2c	WIP: main/postmarketos-ui-plasma-bigscreen: re-enable Still needs a solution for autologin...	2026-03-08 14:53:36 +01:00
Bart Ribbers	eaa58e9cdf	temp/plasma-bigscreen: new aport	2026-03-08 14:53:36 +01:00
Bart Ribbers	361278a4ff	temp/plasma-remotecontrollers: new aport	2026-03-08 14:53:36 +01:00
Bart Ribbers	7f264de95d	temp/aura-browser: new aport	2026-03-08 14:53:36 +01:00
Bart Ribbers	b47f868309	temp/plank-player: new aport	2026-03-08 14:53:36 +01:00
				`@@ -1 +0,0 @@`
				`../../.gitlab-ci/packages/single-runner-defined-in-ci-common.yml.j2`