ci: add support for integration tests

Replace use of the deprecated "only" keyword with the much more flexible "rules". Introduce support for spawning a dynamic child pipeline to run tests against packages that were built in CI. The child pipeline initially allows for packages to define what tests and for which devices to run. Initially, this supports the following kinds of tests: 1. Install tests "pmbootstrap install" is run with the newly built package in the local repo. 2. Upgrade tests Where a chroot for the device is created, the new package made available via a local repo, and then "apk upgrade -a" is run inside the chroot. This allows for validating the .post-upgrade script in the context of a real rootfs. This is currently limited to packages that are automatically pulled in as part of a default installation. This is because handling non-default packages requires either spawning jobs per-package, or assuming that multiple packages updated in the same MR can all be installed at once (often not the case). In the end this can't be handled properly without a dependency graph solver, or by imposing some strong restrictions. Hence it is deemed out of scope for this initial implementation. Signed-off-by: Caleb Connolly <caleb@connolly.tech>
postmarketos-base: define CI config
2024-01-23 19:16:47 +00:00 · 2024-01-22 17:45:54 +00:00 · 2024-01-22 16:43:15 +00:00
1043 changed files with 4292 additions and 34941 deletions
@@ -4,11 +4,11 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	apk -q add ruff
+	apk -q add py3-flake8
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi

 set -x

 # shellcheck disable=SC2046
-ruff --ignore E501,F401,E722,W605 $(find .ci -name '*.py')
+flake8 --ignore E501,F401,E722,W504,W605 $(find .ci -name '*.py')
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+# Copyright 2024 Caleb Connolly
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Description: check pkgver/pkgrel bumps, amount of changed pkgs etc
+# Options: native
+# Use 'native' because it requires git commit history.
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add python3 git
+	# Keep environment variables
+	exec su -p "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+.ci/lib/generate_test_pipeline.py
@@ -2,8 +2,6 @@
 # Description: check various bad patterns with grep
 # https://postmarketos.org/pmb-ci

-exit_code=0
-
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk -q add grep
@@ -14,7 +12,7 @@ fi
 if grep -qr '(CHANGEME!)' -- *; then
 	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
 	grep --color=always -r '(CHANGEME!)' -- *
-	exit_code=1
+	exit 1
 fi

 # DTBs installed to /usr/share/db
@@ -25,7 +23,7 @@ if grep -qr 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/; then
 	echo 'ERROR: Files that need fixing:'
 	# shellcheck disable=SC2016
 	grep --color=always -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/
-	exit_code=1
+	exit 1
 fi


@@ -33,45 +31,24 @@ fi
 if grep -qr '/etc/postmarketos-mkinitfs' -- *; then
 	echo "ERROR: Please replace '/etc/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
 	grep --color=always -r '/etc/postmarketos-mkinitfs' -- *
-	exit_code=1
+	exit 1
 fi
 if grep -qr '/usr/share/postmarketos-mkinitfs' -- *; then
 	echo "ERROR: Please replace '/usr/share/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
 	grep --color=always -r '/usr/share/postmarketos-mkinitfs' -- *
-	exit_code=1
+	exit 1
 fi

 # Direct sourcing of deviceinfo
 if grep --exclude='source_deviceinfo' -qEr 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *; then
 	echo 'ERROR: Please source the source_deviceinfo script instead of sourcing deviceinfo directly!'
 	grep --color=always --exclude='rootfs-usr-share-misc-source_deviceinfo' -Er 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *
-	exit_code=1
+	exit 1
 fi

 # Removed deviceinfo variable
 if grep -qr 'deviceinfo_modules_initfs' -- *; then
 	echo 'ERROR: deviceinfo_modules_initfs variable has been removed. Use "modules-initfs" file instead.'
 	grep --color=always -r 'deviceinfo_modules_initfs' -- *
-	exit_code=1
+	exit 1
 fi
-
-POSTMARKETOS_WALLPAPER_PATH='/usr/share/wallpapers/postmarketos.jpg'
-# The excluded devices are "grandfathered in". New devices should not be added here.
-# See https://gitlab.com/postmarketOS/pmaports/-/issues/2529
-if grep -qr $POSTMARKETOS_WALLPAPER_PATH \
-	--exclude-dir='device-pine64-pinetab' \
-	--exclude-dir='device-oneplus-kebab' \
-	--exclude-dir='device-xiaomi-willow' \
-	--exclude-dir='device-nokia-n900' \
-	-- device; then
-	echo "ERROR: Please don't include configuration files that set the default wallpaper in device-specific packages!"
-	grep --color=always -r $POSTMARKETOS_WALLPAPER_PATH \
-		--exclude-dir='device-pine64-pinetab' \
-		--exclude-dir='device-oneplus-kebab' \
-		--exclude-dir='device-xiaomi-willow' \
-		--exclude-dir='device-nokia-n900' \
-		-- device
-	exit_code=1
-fi
-
-exit "$exit_code"
@@ -22,9 +22,8 @@ def get_pmaports_dir():
    return ret


-def run_git(parameters, check=True, stderr=None):
-    """ Run git in the pmaports dir and return the output """
-    cmd = ["git", "-C", get_pmaports_dir()] + parameters
+def run_cmd(cmd, check=True, stderr=None):
+    """ Run a command and return the output """
    try:
        return subprocess.check_output(cmd, stderr=stderr).decode()
    except subprocess.CalledProcessError:
@@ -33,6 +32,12 @@ def run_git(parameters, check=True, stderr=None):
        return None


+def run_git(parameters, check=True, stderr=None):
+    """ Run git in the pmaports dir and return the output """
+    cmd = ["git", "-C", get_pmaports_dir()] + parameters
+    return run_cmd(cmd, check, stderr)
+
+
 def add_upstream_git_remote():
    """ Add a remote pointing to postmarketOS/pmaports. """
    run_git(["remote", "add", "upstream",
@@ -85,17 +90,21 @@ def get_upstream_branch():
    return ret


-def get_changed_files(removed=True):
+def get_changed_files(removed=True, print_info=True):
    """ Get all changed files and print them, as well as the branch and the
        commit that was used for the diff.
        :param removed: also return removed files (default: True)
        :returns: set of changed files
    """
+    def log_info(message):
+        if print_info:
+            print(message)
+
    branch_upstream = f"upstream/{get_upstream_branch()}"
    commit_head = run_git(["rev-parse", "HEAD"])[:-1]
    commit_upstream = run_git(["rev-parse", branch_upstream])[:-1]
-    print("commit HEAD: " + commit_head)
-    print(f"commit {branch_upstream}: f{commit_upstream}")
+    log_info("commit HEAD: " + commit_head)
+    log_info(f"commit {branch_upstream}: f{commit_upstream}")

    # Check if we are HEAD on the upstream branch
    if commit_head == commit_upstream:
@@ -104,11 +113,11 @@ def get_changed_files(removed=True):
    else:
        # otherwise compare with latest common ancestor
        commit = run_git(["merge-base", branch_upstream, "HEAD"])[:-1]
-    print("comparing HEAD with: " + commit)
+    log_info("comparing HEAD with: " + commit)

    # Changed files
    ret = set()
-    print("changed file(s):")
+    log_info("changed file(s):")
    for file in run_git(["diff", "--name-only", commit, "HEAD"]).splitlines():
        message = "  " + file
        if not os.path.exists(file):
@@ -117,7 +126,7 @@ def get_changed_files(removed=True):
                ret.add(file)
        else:
            ret.add(file)
-        print(message)
+        log_info(message)
    return ret


@@ -155,9 +164,9 @@ def get_changed_packages_sanity_check(count):
    sys.exit(1)


-def get_changed_packages():
+def get_changed_packages_paths(print_info=False):
    ret = set()
-    for file in get_changed_files():
+    for file in get_changed_files(print_info=print_info):
        dirname, filename = os.path.split(file)

        # Skip files:
@@ -187,11 +196,15 @@ def get_changed_packages():
        elif not os.path.exists(file):
            continue  # APKBUILD was deleted

-        ret.add(os.path.basename(dirname))
+        ret.add(dirname)

    return ret


+def get_changed_packages():
+    return set(map(lambda p: os.path.basename(p), iter(get_changed_packages_paths(print_info=True))))
+
+
 def get_changed_kernels():
    ret = []
    for pkgname in get_changed_packages():
@@ -0,0 +1,15 @@
+#!/bin/sh -ex
+# Copies packages from previous build artifacts into the
+# local binary repo
+
+ARCH="$1"
+
+if [ -z "$ARCH" ]; then
+	echo "Usage: $0 <arch>"
+	exit 1
+fi
+
+mkdir -p /home/pmos/.local/var/pmbootstrap/packages/edge/"$ARCH"
+cp packages/edge/"$ARCH"/*.apk /home/pmos/.local/var/pmbootstrap/packages/edge/"$ARCH"
+chown -R 12345:12345 /home/pmos/.local/var/pmbootstrap/packages/edge/"$ARCH"
+sudo -u pmos -- pmbootstrap index
@@ -0,0 +1,107 @@
+#!/usr/bin/env python3
+# Generate a gitlab CI yaml file for the integration tests pipeline
+# Configures the parallel:matrix variables for the install/upgrade jobs
+# based on the union of all the "test-upgrade" configs in the affected APKBUILDs.
+# And the boot matrix based on the "test-boot" config.
+
+# use the matrix variables in the needs: section to sequence the 3 jobs, otherwise
+# spawn a pipeline for each device (yikes).
+
+import os
+import sys
+import glob
+import json
+
+import common
+
+# Get modified packages
+common.add_upstream_git_remote()
+pkgs = common.get_changed_packages_paths()
+
+devices = {}
+
+
+# We support using "main" as a shortcut for main devices
+def get_device_variants(devices):
+    _devices = []
+    for d in devices:
+        if d == "main":
+            _devices += list(map(lambda x: os.path.basename(x).split("-", 1)[-1],
+                             glob.iglob(os.path.join(common.get_pmaports_dir(),
+                                                     "device", "main", "device-*"))))
+        else:
+            _devices.append(d)
+
+    return _devices
+
+
+# YIKES
+def get_device_arch(device):
+    return common.run_cmd(["sh", "-c",
+                           f"""source {glob.glob(os.path.join(common.get_pmaports_dir(),
+                               'device', '*', f'device-{device}'))[0]}/deviceinfo; echo $deviceinfo_arch"""]).strip()
+
+
+# Add a device that we should test upgrading pkg on
+def add_devices(pkg, devices_upgrade, devices_boot):
+    devices_upgrade = get_device_variants(devices_upgrade)
+    devices_boot = get_device_variants(devices_boot)
+    print(f"Devices for {pkg}: {devices_upgrade} {devices_boot}")
+    for d in set(devices_upgrade + devices_boot):
+        if d not in devices.keys():
+            devices[d] = {"upgrade": False, "boot": False, "arch": get_device_arch(d)}
+
+        if d in devices_boot:
+            devices[d]["boot"] = True
+        if d in devices_upgrade:
+            devices[d]["upgrade"] = True
+
+
+def parse_device_list(key):
+    cfg = line.split(":")[-1]
+    if cfg == f"# {key}:":
+        print(f"Invalid test-upgrade config in {apkbuild}")
+        sys.exit(1)
+    return cfg.strip().split()
+
+
+# Get the union of all the test-upgrade configs
+for pkg in pkgs:
+    apkbuild = os.path.join(pkg, "APKBUILD")
+    with open(apkbuild) as f:
+        # ALWAYS test on qemu
+        upgrade_devices = ["qemu-aarch64", "qemu-amd64"]
+        boot_devices = []
+        for line in f:
+            if line != "\n" and line[0] != "#":
+                break
+            if line.startswith("# test-upgrade"):
+                upgrade_devices += parse_device_list("test-upgrade")
+            if line.startswith("# test-boot"):
+                boot_devices += parse_device_list("test-boot")
+        add_devices(os.path.basename(pkg), upgrade_devices, boot_devices)
+
+print(json.dumps(devices, indent=4))
+
+# Generate the yaml
+template = open(os.path.join(os.path.dirname(__file__), "test-pipeline.template.yml")).read()
+matrix = ""
+for (device, cfg) in devices.items():
+    # FIXME: riscv64 is not well supported..
+    if cfg["arch"] == "riscv64":
+        continue
+    boot = "true" if cfg["boot"] and "qemu" in device else "false"
+    upgrade = "true" if cfg["upgrade"] else "false"
+    print(f"Adding {device} to matrix, upgrade test: {upgrade}, boot test: {boot}")
+    matrix += f"""      - DEVICE: {device}
+        UPGRADE_TEST: \"{upgrade}\"
+        BOOT_TEST: \"{boot}\"
+        BUILD_ARCH_JOB: build-{cfg["arch"]}
+"""
+
+variables = f"  PACKAGES: {' '.join(map(lambda x: os.path.basename(x), pkgs))}\n"
+
+f = open("test-pipeline.yml", "w")
+f.write(template.replace("{{ matrix }}", matrix)
+                .replace("{{ variables }}", variables))
+f.close()
@@ -0,0 +1,123 @@
+# TEMPLATE pipeline for integration tests
+image: alpine:latest
+after_script:
+  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
+
+variables:
+  PYTHONUNBUFFERED: 1
+  # This includes a hack to install the packages that were built in a previous
+  # pipeline (with different signing keys). As for some reason even though we
+  # replace the signing keys in pmbootstrap with the ones from the previous job
+  # BEFORE creating the chroot, apk still rejects the packages :(
+  PMBOOTSTRAP_URL: https://gitlab.com/sdm845-mainline/pmbootstrap.git
+  PMBOOTSTRAP_TAG: caleb/allow-untrusted-hack
+  # defines PACKAGES
+{{ variables }}
+
+# Variables DEVICE, UPGRADE_TEST, and BOOT_TEST are set in the
+# parallel matrix below.
+
+stages:
+  - install
+  - upgrade
+  - boot
+
+workflow:
+  name: "Testing for $PACKAGES"
+  # Default rules for all jobs
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "parent_pipeline"
+
+install:
+  # tags:
+  #   - kvm
+  stage: install
+  # So we can fetch the packages that were built in the parent pipeline
+  # and install them in the chroot
+  needs:
+    - pipeline: $PARENT_PIPELINE_ID
+      job: $BUILD_ARCH_JOB
+  before_script:
+    - apk add curl sudo
+    # Avoid using the local pmaports checkout so we don't build packages (and sidestep annoying permissions issues)
+    - (cd /tmp ; curl -fsSL "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" | sh)
+    # Use the same keys as the build job so we can generate an index
+    - mkdir -p /home/pmos/.local/var/pmbootstrap/config_abuild/
+    - mv packages/config_abuild/* /home/pmos/.local/var/pmbootstrap/config_abuild/
+    - chown -R 12345:12345 /home/pmos/.local/var/pmbootstrap/config_abuild
+    - sudo -u pmos -- pmbootstrap config device ${DEVICE}
+    # Use the console UI so we pull in some additional system packages
+    - sudo -u pmos -- pmbootstrap config ui console
+    # For QEMU (ignored for other devices)
+    - sudo -u pmos -- pmbootstrap config kernel virt
+  script:
+    - ARCH=${BUILD_ARCH_JOB##build-}
+    # For now we only support packages that are pulled in automatically for the device.
+    # Introducing support for testing packages that must be explicitly installed requires
+    # having a job per package and doing dependency/conflict resolution.
+    - .ci/lib/copy-in-packages.sh $ARCH
+    - sudo -u pmos -- pmbootstrap install --no-image --password 147147
+  artifacts:
+    when: on_failure
+    paths:
+      - log.txt
+      - pmbootstrap.cfg
+    expire_in: 1 week
+  parallel:
+    matrix:
+{{ matrix }}
+
+upgrade:
+  # tags:
+  #   - kvm
+  stage: upgrade
+  # So we can fetch the packages that were built in the parent pipeline
+  # and install them in the chroot
+  needs:
+    - pipeline: $PARENT_PIPELINE_ID
+      job: $BUILD_ARCH_JOB
+  rules:
+    - if: $UPGRADE_TEST == "true"
+  before_script:
+    - apk add curl sudo
+    # Avoid using the local pmaports checkout so we don't build packages (and sidestep annoying permissions issues)
+    - (cd /tmp ; curl -fsSL "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" | sh)
+    # Use the same keys as the build job so we can generate an index
+    - mkdir -p /home/pmos/.local/var/pmbootstrap/config_abuild/
+    - mv packages/config_abuild/* /home/pmos/.local/var/pmbootstrap/config_abuild/
+    - chown -R 12345:12345 /home/pmos/.local/var/pmbootstrap/config_abuild
+    - sudo -u pmos -- pmbootstrap -y zap -a
+    - sudo -u pmos -- pmbootstrap config device ${DEVICE}
+    # Use the console UI so we pull in some additional system packages
+    - sudo -u pmos -- pmbootstrap config ui console
+  script:
+    - ARCH=${BUILD_ARCH_JOB##build-}
+    # For now we only support packages that are pulled in automatically for the device.
+    # Introducing support for testing packages that must be explicitly installed requires
+    # having a job per package and doing dependency/conflict resolution.
+    - sudo -u pmos -- pmbootstrap install --no-image --password 147147
+    - .ci/lib/copy-in-packages.sh $ARCH
+    - sudo -u pmos -- pmbootstrap chroot -r -- apk upgrade -a --allow-untrusted
+  artifacts:
+    when: on_failure
+    paths:
+      - log.txt
+      - pmbootstrap.cfg
+    expire_in: 1 week
+  parallel:
+    matrix:
+{{ matrix }}
+
+boot:
+  # tags:
+  #   - kvm
+  stage: boot
+  rules:
+    - if: $BOOT_TEST == "true"
+  script:
+    - echo boot
+  parallel:
+    matrix:
+{{ matrix }}
+
+
@@ -1,61 +1,47 @@
 ---

 # global settings
-image: alpine:edge
+image: alpine:latest
 after_script:
  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
  - lint
  - build
+  - test

-# defaults for "only"
-# We need to run the CI jobs in a "merge request specific context", if CI is
-# running in a merge request. Otherwise the environment variable that holds the
-# merge request ID is not available. This means, we must set the "only"
-# variable accordingly - and if we only do it for one job, all other jobs will
-# not get executed. So have the defaults here, and use them in all jobs that
-# should run on both the master branch, and in merge requests.
-# https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
-.only-default: &only-default
-  only:
-    - master
-    - merge_requests
-    - tags
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_PIPELINE_SOURCE == "push"

 # device documentation
 wiki:
  stage: lint
-  <<: *only-default
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - device/*/device-*/*
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - device/*/device-*/*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/wiki.sh

 # testcases linting
-ruff:
+flake8:
  stage: lint
-  <<: *only-default
-  only:
-    refs:
-      - merge_requests
+  rules:
+  - if: $CI_PIPELINE_SOURCE == "merge_request_event"
    changes:
      - .ci/*
      - .ci/*/*
  before_script:
-    - "echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories"
-    - apk -q add ruff
+    - apk -q add py-flake8
  script:
    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/ruff.sh
+    - .ci/flake8.sh

 # shellcheck and various grep checks
 shellcheck-grep:
  stage: lint
-  <<: *only-default
  image: alpine:edge
  script:
    - .ci/lib/gitlab_prepare_ci.sh
@@ -65,7 +51,6 @@ shellcheck-grep:

 editor-config:
  stage: lint
-  <<: *only-default
  image: alpine:edge
  script:
    - .ci/lib/gitlab_prepare_ci.sh
@@ -74,7 +59,6 @@ editor-config:
 # aports checks (generic)
 pytest-commits:
  stage: lint
-  <<: *only-default
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/pytest.sh
@@ -93,17 +77,15 @@ aport-lint:
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/apkbuild-lint.sh
-  only:
-    - merge_requests
+  rules:
+  - if: $CI_PIPELINE_SOURCE == "merge_request_event"
  allow_failure: true

 # kernel kconfig check
 kernel-kconfig:
  stage: lint
-  only:
-    refs:
-      - master
-      - merge_requests
+  rules:
+  - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
    changes:
      - device/*/linux-*/config-*
      - main/linux-*/config-*
@@ -115,8 +97,8 @@ kernel-kconfig:
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
  stage: lint
-  only:
-    - merge_requests
+  rules:
+  - if: $CI_PIPELINE_SOURCE == "merge_request_event"
  before_script:
    - apk -q add python3
  script:
@@ -126,11 +108,14 @@ mr-settings:
 # build changed aports
 .build:
  stage: build
-  <<: *only-default
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
  before_script:
    - .ci/lib/gitlab_prepare_ci.sh
  after_script:
    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
+    - cp -r /home/pmos/.local/var/pmbootstrap/config_abuild packages/ || true
  artifacts:
    expire_in: 1 week
    paths:
@@ -166,3 +151,32 @@ build-riscv64:
  extends: .build
  script:
    - .ci/build-riscv64.sh
+
+# Generate the test pipeline
+generate-test-pipeline:
+  stage: test
+  # Only test in MRs or when pushing to a stable release branch
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_COMMIT_REF_PROTECTED == 'true' && $CI_COMMIT_BRANCH != '$CI_DEFAULT_BRANCH'
+  before_script:
+    - .ci/lib/gitlab_prepare_ci.sh
+  script:
+    - .ci/generate-test-pipeline.sh
+  artifacts:
+    paths:
+      - test-pipeline.yml
+
+Run tests:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_COMMIT_REF_PROTECTED == 'true' && $CI_COMMIT_BRANCH != '$CI_DEFAULT_BRANCH'
+  needs:
+    - job: generate-test-pipeline
+      artifacts: true
+  trigger:
+    include:
+      - artifact: test-pipeline.yml
+        job: generate-test-pipeline
+  variables:
+    PARENT_PIPELINE_ID: $CI_PIPELINE_ID
@@ -1,7 +1,7 @@
 # https://docs.gitlab.com/ee/user/project/code_owners.html

 device/*/*-htc-golfu/				@Newbyte
-device/*/*-pine64-pinephone/			@craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper @Arnavion
+device/*/*-pine64-pinephone/			@craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
 device/*/*-htc-m8qlul/				@Newbyte
 device/*/*-purism-librem5/			@craftyguy @bshah
 device/*/device-lg-judyln/			@Newbyte
@@ -44,14 +44,11 @@ device/*/device-huawei-plank/			@gtrxAC
 device/*/linux-huawei-plank/			@gtrxAC
 device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
 device/*/linux-samsung-coreprimevelte/		@legolivesmatter @balejk
-device/*/linux-postmarketos-allwinner/		@Arnavion
-device/*/u-boot-pinephone/			@Arnavion

 main/postmarketos-update-depthcharge-kernel/	@jenneron
 main/osk-sdl/					@craftyguy
 main/postmarketos-ui-plasma-mobile/		@bshah
 main/ttyescape/					@calebccff
-main/shutdown-clear-rtc-wakealarm/		@Arnavion
 device/*/u-boot-librem5/			@craftyguy @bshah
 device/*/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
 device/*/alsa-ucm-conf-google-gru/		@jenneron
@@ -15,7 +15,7 @@ branch_aports=3.19-stable
 mirrordir_alpine=v3.19

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

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

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

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

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

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

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

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

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

 sha512sums="
-0d51014e838faf36ffa93b3f91abeb351f1a38f367afd3a31b64273aabd722984680b2495db1f68d7e4fe826e2cbe06c6e6492faca99dc52bb20d2c789c79264  busybox-static-1.36.1-r19-armv7-edge.apk
+8f2fa87d979bdbe88eef0b9dece61001998df960e025902854b2af415b96d63ce9831dbe44d5c32b671c313efdfe9e22743a26de73febcc92d8d45d944ad66c0  busybox-static-1.36.1-r18-armv7-edge.apk
 "
@@ -3,7 +3,7 @@

 pkgname=grub-efi-x86
 pkgver=2.12
-pkgrel=1
+pkgrel=0

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

 sha512sums="
-775d65b51f3438dc05ee26e5a10ae348a045b85b072a3d14714bc89181ba5d26a92e6991b8dafb00a4ff639e8be455b1f2ba5f044b4fa0c4f650a7ab455c4bc2  grub-efi-2.12-r1-x86-edge.apk
+2958746c0c05271d3bb27912973ddf9180bbf060f9909037f0b9dcf3da2036dd81b69a37e1c43414def0e26942f83bccab04554ae6ddd6b3b9dc94d5e3744ac4  grub-efi-2.12-r0-x86-edge.apk
 "
@@ -1,12 +0,0 @@
-diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
-index d2f2cedf..7e2cbc74 100644
--- a/arch/arm64/mm/proc.S
-+++ b/arch/arm64/mm/proc.S
-@@ -171,7 +171,6 @@ ENTRY(cpu_do_switch_mm)
- 	ret
- ENDPROC(cpu_do_switch_mm)
- 
-	.section ".text.init", #alloc, #execinstr
- 
- /*
-  *	__cpu_setup
@@ -1,8 +1,7 @@
-# Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
-# Co-Maintainer: Jenneron <jenneron@protonmail.com>
+# Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=alsa-ucm-conf-google-kukui
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=3
 pkgdesc="ALSA Use Case Manager configuration for Google Kukui Chromebooks"
 url="https://alsa-project.org"
 arch="aarch64"
@@ -34,8 +33,8 @@ package() {
 }

 sha512sums="
-9755c2eaf4bc28a9f3734b6778550ebd77bbee8f6aa353642bc5a35d68e009a17b05d9b09f1c62fe592eb16a2d342e3d2abcda98f2c53142bd4905e4a883a88b  mt8183_da7219_HiFi.conf
-13ffff0471c29d4e624ba7089d8df811f6578bebc4a9da2e8e82e247430fd41dbc95204fdf1891cfb76f1d90303fcdb8501ecf47b8ca40c7429066bf2ff1379b  mt8183_da7219_rt1015p.conf
-3656cb0cc76994aab39bd0d0cfe283339bce0689448612f74a0d09a30b19516950132456945096a13bd5700d0e7f868c413e268ced810046ec70252ca8b07603  mt8183_mt6358_HiFi.conf
-171e9e3376e5bd56e133a5b19309f60f6326f052922064e6f95c53b4345ea12cc205adde7305a7bd840722a29b7fb393c71d2b39e60952b0979ecc2e5ec03efa  mt8183_mt6358_ts3a227_max98357.conf
+d998860ca82ec9277a7b660dbdc644fc8ec84d5f3703dc72eac44a6b70b61ea9f733eeae94d21d9d2cadf25f95e951ce3c804593b4f0a4c715770b4b422d4ca7  mt8183_da7219_HiFi.conf
+c8ce246275beaa3e89eb4e06bed825935122c9f6a9fff9f8e3188dec47f37db92d908148cd7551785de5282c13386134bd6daf8ed033de122218b698d67bab33  mt8183_da7219_rt1015p.conf
+749180019ca12ec342604fc6924aa60c5f4ff2892ce22d2199b78d707947a8b91e71fa7a71643f3475bf2dba6e94c36e4fc57cb98f7a96519c83106b08ebc5c3  mt8183_mt6358_HiFi.conf
+c8ce246275beaa3e89eb4e06bed825935122c9f6a9fff9f8e3188dec47f37db92d908148cd7551785de5282c13386134bd6daf8ed033de122218b698d67bab33  mt8183_mt6358_ts3a227_max98357.conf
 "
@@ -1,90 +1,81 @@
-SectionDevice."Speaker" {
-	Comment "Speaker"
-
-	Value {
-		PlaybackPCM "hw:${CardId},0"
-	}
+SectionVerb {
 	EnableSequence [
+		cdev "hw:mt8183da7219rt1"
+		cset "name='Headphone Volume' 0"
+#		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+#		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
 		cset "name='I2S3_CH1 DL1_CH1' 1"
 		cset "name='I2S3_CH2 DL1_CH2' 1"
-		cset "name='Speakers Switch' 1"
-	]
-	DisableSequence [
-		cset "name='I2S3_CH1 DL1_CH1' 0"
-		cset "name='I2S3_CH2 DL1_CH2' 0"
-		cset "name='Speakers Switch' 0"
-	]
-}
-
-SectionDevice."Headphones" {
-	Comment "Headphones"
-
-	Value {
-		PlaybackPCM "hw:${CardId},0"
-	}
-	EnableSequence [
-		cset "name='Playback Digital Switch' 1"
-		cset "name='Headphone Switch' 1"
-		cset "name='ST Mixer Out FilterL Out FilterL Switch' 1"
-		cset "name='Mixer Out FilterL DACL Switch' 1"
-		cset "name='ST Mixer Out FilterR Out FilterR Switch' 1"
-		cset "name='Mixer Out FilterR DACR Switch' 1"
-		cset "name='Out DACL Mux' DAIL"
-		cset "name='Out DACR Mux' DAIR"
-		cset "name='I2S3_CH1 DL1_CH1' 1"
-		cset "name='I2S3_CH2 DL1_CH2' 1"
-	]
-	DisableSequence [
-		cset "name='Playback Digital Switch' 0"
-		cset "name='Headphone Switch' 0"
-		cset "name='ST Mixer Out FilterL Out FilterL Switch' 0"
-		cset "name='Mixer Out FilterL DACL Switch' 0"
-		cset "name='ST Mixer Out FilterR Out FilterR Switch' 0"
-		cset "name='Mixer Out FilterR DACR Switch' 0"
-		cset "name='I2S3_CH1 DL1_CH1' 0"
-		cset "name='I2S3_CH2 DL1_CH2' 0"
-	]
-}
-
-SectionDevice."Mic" {
-	Comment "Internal Microphone"
-
-	Value {
-		CapturePCM "hw:${CardId},5"
-	}
-	EnableSequence [
 		cset "name='MTKAIF_DMIC' 1"
 		cset "name='Mt6358 Mic Type Mux' 2"
 		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
 		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
 	]
 	DisableSequence [
+	]
+}
+SectionDevice."Headphone" {
+	Value {
+		PlaybackPCM "hw:mt8183da7219rt1,0"
+		JackDev "mt8183_da7219_rt1015p Headset Jack"
+		JackSwitch "2"
+	}
+
+	ConflictingDevice [
+		"Speaker"
+	]
+
+	EnableSequence [
+		cdev "hw:mt8183da7219rt1"
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+	]
+	DisableSequence [
+		cdev "hw:mt8183da7219rt1"
+		cset "name='I2S3_CH1 DL1_CH1' 0"
+		cset "name='I2S3_CH2 DL1_CH2' 0"
+	]
+}
+SectionDevice."Speaker" {
+	Value {
+		PlaybackPCM "hw:mt8183da7219rt1,0"
+		DspName "speaker_eq"
+	}
+
+	ConflictingDevice [
+		"Headphone"
+	]
+
+	EnableSequence [
+		cdev "hw:mt8183da7219rt1"
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+	]
+	DisableSequence [
+		cdev "hw:mt8183da7219rt1"
+		cset "name='I2S3_CH1 DL1_CH1' 0"
+		cset "name='I2S3_CH2 DL1_CH2' 0"
+	]
+}
+
+SectionDevice."Internal Mic" {
+	Value {
+		CapturePCM "hw:mt8183da7219rt1,5"
+		CaptureChannelMap "0 1 -1 -1 -1 -1 -1 -1 -1 -1 -1"
+		IntrinsicSensitivity "-600"
+	}
+	EnableSequence [
+		cdev "hw:mt8183da7219rt1"
+		cset "name='MTKAIF_DMIC' 1"
+		cset "name='Mt6358 Mic Type Mux' 2"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+	]
+	DisableSequence [
+		cdev "hw:mt8183da7219rt1"
 		cset "name='MTKAIF_DMIC' 0"
 		cset "name='Mt6358 Mic Type Mux' 0"
 		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
 		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
 	]
 }
-
-SectionDevice."Headset" {
-	Comment "Headset Microphone"
-
-	Value {
-		CapturePCM "hw:${CardId},5"
-	}
-	EnableSequence [
-		cset "name='Capture Digital Switch' 1"
-		cset "name='Mixin Switch' 1"
-		cset "name='Mic Switch' 1"
-		cset "name='Mixer In Mic Switch' 1"
-		cset "name='Out DAIL Mux' ADC"
-		cset "name='UL3_CH1 I2S2_CH1' 1"
-	]
-	DisableSequence [
-		cset "name='Capture Digital Switch' 0"
-		cset "name='Mixin Switch' 0"
-		cset "name='Mic Switch' 0"
-		cset "name='Mixer In Mic Switch' 0"
-		cset "name='UL3_CH1 I2S2_CH1' 0"
-	]
-}
@@ -1,24 +1,8 @@
-Syntax 6
+Syntax 2
+
+Comment "Kukui internal card"

 SectionUseCase."HiFi" {
 	File "HiFi.conf"
 	Comment "Default"
 }
-
-BootSequence [
-	# Speaker
-	cset "name='I2S3_CH1 DL1_CH1' 1"
-	cset "name='I2S3_CH2 DL1_CH2' 1"
-	cset "name='Speakers Switch' 1"
-
-	# Internal Mic
-	cset "name='MTKAIF_DMIC' 1"
-	cset "name='Mt6358 Mic Type Mux' 2"
-	cset "name='UL3_CH1 ADDA_UL_CH1' 1"
-	cset "name='UL3_CH2 ADDA_UL_CH2' 1"
-
-	# Headset
-	cset "name='Headphone Volume' 56"
-	cset "name='Capture Digital Volume' 113"
-	cset "name='Mic Volume' 3"
-]
@@ -1,86 +1,144 @@
+SectionVerb {
+	EnableSequence [
+		cdev "hw:mt8183mt6358ts3"
+		cset "name='Headphone Volume' 0"
+		cset "name='ADDA_DL_CH1 DL1_CH1' 0"
+		cset "name='ADDA_DL_CH2 DL1_CH2' 0"
+		cset "name='HPL Mux' 0"
+		cset "name='HPR Mux' 0"
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+		cset "name='MTKAIF_DMIC' 1"
+		cset "name='Mic Type Mux' 2"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+# from headset mic - does not work -see below
+#		cset "name='PGA L Mux' 0"
+#		cset "name='ADC L Mux' 0"
+#		cset "name='PGA Volume' 0"
+	]
+
+	DisableSequence [
+	]
+}
+
+SectionDevice."Headphones" {
+	Comment	"Headphones"
+
+	Value {
+		PlaybackPCM "hw:mt8183mt6358ts3,0"
+		JackControl "mt8183_mt6358_ts3a227_max98357 Headset Jack"
+	}
+
+	ConflictingDevice [
+		"Speaker"
+	]
+
+	EnableSequence [
+		cdev "hw:mt8183mt6358ts3"
+		cset "name='ADDA_DL_CH1 DL1_CH1' 1"
+		cset "name='ADDA_DL_CH2 DL1_CH2' 1"
+		cset "name='HPL Mux' 2"
+		cset "name='HPR Mux' 2"
+	]
+
+	DisableSequence [
+		cdev "hw:mt8183mt6358ts3"
+		cset "name='ADDA_DL_CH1 DL1_CH1' 0"
+		cset "name='ADDA_DL_CH2 DL1_CH2' 0"
+		cset "name='HPL Mux' 0"
+		cset "name='HPR Mux' 0"
+	]
+}
+
 SectionDevice."Speaker" {
 	Comment "Speaker"

 	Value {
-		PlaybackPCM "hw:${CardId},0"
+		PlaybackPCM "hw:mt8183mt6358ts3,0"
+		DspName "speaker_eq"
 	}
+
+	ConflictingDevice [
+		"Headphones"
+	]
+
 	EnableSequence [
+		cdev "hw:mt8183mt6358ts3"
 		cset "name='I2S3_CH1 DL1_CH1' 1"
 		cset "name='I2S3_CH2 DL1_CH2' 1"
 	]
+
 	DisableSequence [
+		cdev "hw:mt8183mt6358ts3"
 		cset "name='I2S3_CH1 DL1_CH1' 0"
 		cset "name='I2S3_CH2 DL1_CH2' 0"
 	]
 }

-SectionDevice."Mic" {
-	Comment "Internal Microphone"
+# headset mic does not work for some reason - if enabled there is no signal
+# from it and after switching back to internal mic even that does not give
+# any signal anymore
+#SectionDevice."HeadsetMic" {
+#	Comment	"Headset Microphone"
+#
+#	Value {
+#		CapturePCM "hw:mt8183mt6358ts3,5"
+#		# i guess this one is chromeos specific and not used otherwise
+#		CaptureChannelMap "0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1"
+#		JackControl "mt8183_mt6358_ts3a227_max98357 Headset Jack"
+#	}
+#
+#	ConflictingDevice [
+#		"InternalMic"
+#	]
+#
+#	EnableSequence [
+#		cdev "hw:mt8183mt6358ts3"
+#		cset "name='PGA L Mux' 2"
+#		cset "name='ADC L Mux' 2"
+#		cset "name='Mic Type Mux' 1"
+#		cset "name='PGA Volume' 4"
+#		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+#	]
+#
+#	DisableSequence [
+#		cdev "hw:mt8183mt6358ts3"
+#		cset "name='PGA L Mux' 0"
+#		cset "name='ADC L Mux' 0"
+#		cset "name='Mic Type Mux' 0"
+#		cset "name='PGA Volume' 0"
+#		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+#	]
+#}
+
+SectionDevice."InternalMic" {
+	Comment	"Intrernal Microphone"

 	Value {
-		CapturePCM "hw:${CardId},5"
+		CapturePCM "hw:mt8183mt6358ts3,5"
+		# i guess those two are chromeos specific and not used otherwise
+		CaptureChannelMap "0 1 -1 -1 -1 -1 -1 -1 -1 -1 -1"
+		IntrinsicSensitivity "-2600"
 	}
+
+# from headset mic - does not work -see above
+#	ConflictingDevice [
+#		"HeadsetMic"
+#	]
+
 	EnableSequence [
+		cdev "hw:mt8183mt6358ts3"
 		cset "name='MTKAIF_DMIC' 1"
 		cset "name='Mic Type Mux' 2"
 		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
 		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
 	]
+
 	DisableSequence [
+		cdev "hw:mt8183mt6358ts3"
 		cset "name='MTKAIF_DMIC' 0"
 		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
 		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
 	]
 }
-
-If.krane {
-	Condition {
-		Type String
-		Haystack "${sys:firmware/devicetree/base/compatible}"
-		Needle "google,krane"
-	}
-	False {
-		SectionDevice."Headphones" {
-			Comment "Headphones"
-
-			Value {
-				PlaybackPCM "hw:${CardId},0"
-			}
-			EnableSequence [
-				cset "name='ADDA_DL_CH1 DL1_CH1' 1"
-                		cset "name='ADDA_DL_CH2 DL1_CH2' 1"
-                		cset "name='HPL Mux' 2"
-                		cset "name='HPR Mux' 2"
-			]
-			DisableSequence [
-				cset "name='ADDA_DL_CH1 DL1_CH1' 0"
-                		cset "name='ADDA_DL_CH2 DL1_CH2' 0"
-                		cset "name='HPL Mux' 0"
-                		cset "name='HPR Mux' 0"
-			]
-		}
-
-		SectionDevice."Headset" {
-			Comment "Headset Microphone"
-
-			Value {
-				CapturePCM "hw:${CardId},5"
-			}
-			EnableSequence [
-				cset "name='PGA L Mux' 2"
-                		cset "name='ADC L Mux' 2"
-                		cset "name='Mic Type Mux' 1"
-                		cset "name='PGA Volume' 4"
-                		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
-			]
-			DisableSequence [
-				cset "name='PGA L Mux' 0"
-		                cset "name='ADC L Mux' 0"
-		                cset "name='Mic Type Mux' 0"
-                		cset "name='PGA Volume' 0"
-		                cset "name='UL3_CH1 ADDA_UL_CH1' 0"
-
-			]
-		}
-	}
-}
@@ -1,31 +1,8 @@
-Syntax 6
+Syntax 2
+
+Comment "Kukui internal card"

 SectionUseCase."HiFi" {
 	File "HiFi.conf"
 	Comment "Default"
 }
-
-BootSequence [
-	# Speakers
-	cset "name='I2S3_CH1 DL1_CH1' 1"
-	cset "name='I2S3_CH2 DL1_CH2' 1"
-
-	# Headphones
-	cset "name='Headphone Volume' 17"
-	cset "name='ADDA_DL_CH1 DL1_CH1' 0"
-	cset "name='ADDA_DL_CH2 DL1_CH2' 0"
-	cset "name='HPL Mux' 0"
-	cset "name='HPR Mux' 0"
-
-	# Internal Mic
-	cset "name='MTKAIF_DMIC' 1" 
-	cset "name='Mic Type Mux' 2"
-	cset "name='UL3_CH1 ADDA_UL_CH1' 1"
-	cset "name='UL3_CH2 ADDA_UL_CH2' 1"
-
-	# Headset Mic
-	cset "name='PGA L Mux' 0"
-	cset "name='ADC L Mux' 0"
-	cset "name='PGA Volume' 0"
-	cset "name='UL3_CH1 ADDA_UL_CH1' 0"
-]
@@ -3,7 +3,7 @@
 pkgname=device-arrow-db410c
 pkgdesc="Arrow DragonBoard 410c"
 pkgver=3
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
 pkgver=6
-pkgrel=4
+pkgrel=3
 _commit=3155254999ac36c3051a2118c415de25a072c0f6
 url="https://postmarketos.org"
 license="MIT"
@@ -3,7 +3,7 @@
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
 pkgver=7
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=2
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=5
-pkgrel=6
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-google-kukui
 pkgdesc="Google Kukui Chromebooks"
 pkgver=6
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-google-oak
 pkgdesc="Google Oak Chromebooks"
 pkgver=4
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-google-peach-pit
 pkgdesc="Samsung Chromebook 2 (11.6 inch)"
 pkgver=5
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -3,7 +3,7 @@
 pkgname=device-google-snow
 pkgdesc="Samsung Chromebook"
 pkgver=4
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -3,7 +3,7 @@
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
 pkgver=1
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-google-veyron
 pkgdesc="Google Veyron Chromebooks"
 pkgver=5
-pkgrel=5
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -4,7 +4,7 @@
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
 pkgver=3
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -4,7 +4,7 @@
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
 pkgver=7
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -4,7 +4,7 @@
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
 pkgver=7
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
 pkgver=8
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
 pkgver=10
-pkgrel=1
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -6,7 +6,7 @@

 pkgname=device-nvidia-tegra-armv7
 pkgdesc="NVIDIA Tegra ARMv7"
-pkgver=1.2
+pkgver=1.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -45,6 +45,6 @@ x11() {
 }

 sha512sums="
-b5f81887b9d78906a880d89b862dbe445129e8444fa7e41b17deaa0ff494e25455bf47f5864a219ae394b660f63061c01c00ef370e88086367a3efcbf12a4f91  deviceinfo
+e8d7c637130642a5ee5438e7f401c1870ecd1dcdca0305ab73fabf3d8548db5f054aeeacaf48abc46189bc1efdcbb5549e8afed263880e07b4932aee418041fc  deviceinfo
 8ea2030fb0c1ae181778b86dc36ed71a904dd51e1fb08114c2a124a693fc7b464cfbb14efa8422db716fb9a647afa367df094abcc14f1ccc51af8b9063de8847  modules-initfs
 "
@@ -16,6 +16,8 @@ deviceinfo_chassis="tablet"
 deviceinfo_external_storage="true"

 # Bootloader related
-deviceinfo_flash_method="none"
+deviceinfo_flash_method="fastboot-bootpart"
+deviceinfo_flash_fastboot_partition_kernel="system"
+deviceinfo_flash_fastboot_partition_system="userdata"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_kernel_cmdline="console=ttyS0,115200n8 rw gpt"
@@ -4,7 +4,7 @@
 pkgname=device-odroid-xu4
 pkgdesc="ODROID XU4"
 pkgver=0.2
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=13
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -4,7 +4,7 @@
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=13
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -1,9 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Quade Curry <qc8086@qc8086.com>
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=16
-pkgrel=5
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
 pkgver=3.8
-pkgrel=6
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=device-pine64-rockpro64
 pkgver=3
-pkgrel=7
+pkgrel=6
 pkgdesc="PINE64 ROCKPro64"
 url="https://postmarketos.org"
 license="MIT"
@@ -5,7 +5,7 @@
 pkgname=device-samsung-a3
 pkgdesc="Samsung Galaxy A3 (2015)"
 pkgver=11.2
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -4,7 +4,7 @@
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
 pkgver=10.2
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-samsung-e7
 pkgdesc="Samsung Galaxy E7"
 pkgver=1.2
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -3,7 +3,7 @@
 pkgname=device-samsung-espresso10
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
 pkgver=1
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -4,7 +4,7 @@
 pkgname=device-samsung-espresso7
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
 pkgver=1
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -3,7 +3,7 @@
 pkgname=device-samsung-grandmax
 pkgdesc="Samsung Galaxy Grand Max"
 pkgver=1.2
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -3,7 +3,7 @@
 pkgname=device-samsung-gt510
 pkgdesc="Samsung Galaxy Tab A 9.7 (2015)"
 pkgver=5
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
 pkgver=5
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-samsung-m0
 pkgdesc="Samsung Galaxy S III"
 pkgver=6.3
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -3,7 +3,7 @@
 pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
 pkgver=12.2
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -5,7 +5,7 @@
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
 pkgver=14
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -4,7 +4,7 @@
 pkgname=device-wileyfox-crackling
 pkgdesc="Wileyfox Swift"
 pkgver=7
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
 pkgver=10
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
-pkgver=9
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -46,5 +46,5 @@ nonfree_firmware() {

 sha512sums="
 8c5980c1da9e5bc91f11bb8056ac9a225cb84a90a42a964dc0dc2966220c105683081055fdcb1caa8c198019d8373d8c5fe27155429c17814d34075d5f961aa4  deviceinfo
-7202f0a55dfe43348940412fc38e59c855594b070db8742419feadb2299086d5810107201a228b7137b7cc7a97c94afac95d81c0cd65c52f31dbcb619b0a4279  modules-initfs
+fd74576998cbfb970a1ac997206504797cba07ede87c94f4d77245f8105cd23cf64bce144483c76372998a1750786fd4b693f092888863390b0736906f1b16a4  modules-initfs
 "
@@ -1,5 +1,4 @@
 edt_ft5x06
-goodix_ts
 msm
 panel_himax_hx8399c_fhdplus
 panel_mdss_ili7807_fhdplus
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-markw
 pkgdesc="Xiaomi Redmi 4 Prime"
 pkgver=4
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -2,7 +2,7 @@
 pkgname=device-xiaomi-mido
 pkgdesc="Xiaomi Redmi Note 4X"
 pkgver=5
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=10
+pkgrel=9
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -5,7 +5,7 @@
 pkgname=device-xiaomi-tissot
 pkgdesc="Xiaomi Mi A1"
 pkgver=6
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-vince
 pkgdesc="Xiaomi Redmi 5 Plus"
 pkgver=11
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-wt88047
 pkgdesc="Xiaomi Redmi 2"
 pkgver=8
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-ysl
 pkgdesc="Xiaomi Redmi S2/Y2"
 pkgver=3
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -4,7 +4,7 @@
 # Co-Maintainer: Maxim Schwalm <maxim.schwalm@gmail.com>

 pkgname=firmware-nvidia-tegra-armv7
-pkgver=4
+pkgver=3
 pkgrel=0
 pkgdesc="Firmware files for Tegra devices supported by GRATE project"
 url="https://gitlab.com/grate-driver/firmware"
@@ -14,7 +14,7 @@ makedepends="coreutils"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"

 # source
-_commit="1ce8924c74afc7f3bb37151d9d16295049063788"
+_commit="b1a06c42ff16a814a3c8044143151f3df48a7df2"
 _repo="firmware"
 source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$_repo-$_commit.tar.gz"

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

 sha512sums="
-14c3eedd90f7ce22bd2efba124a57bd673b449cdd889eb4009aa4d7f64d950bccd176acf2c05694a7ebd12ad979f4a37f12ada72331a2e142330e4b95024750c  firmware-nvidia-tegra-armv7-1ce8924c74afc7f3bb37151d9d16295049063788.tar.gz
+e20b40a290faf54ddfe9502f91cc6108b79a19a322696c7460e6b455319bcfe4583933fa43a5e5e82e968562666404e40d6ca5a6bd401e09d0fdcc30707e6786  firmware-nvidia-tegra-armv7-b1a06c42ff16a814a3c8044143151f3df48a7df2.tar.gz
 "
@@ -4,7 +4,7 @@

 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
-pkgver=6.6.12
+pkgver=6.6.10
 pkgrel=0
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
@@ -60,6 +60,6 @@ package() {
 }

 sha512sums="
-050a9bc3a9150d9dd3c9cf9c2399a3c8f72afd815c3e181040e624966015c1464971363c16cb0d918564e906ac5b18c6fc17270657274810974fc2baf9a228e9  linux-postmarketos-qcom-msm8953-v6.6.12-r0.tar.gz
-ee4dbb4e3f9a5326790277104d3c0566b4e7a1d70cbc84b03733626d500fb9a8bad85a823594dd9bff4337bdd08e7befc43772852213fa8613ce51a107464aea  config-postmarketos-qcom-msm8953.aarch64
+5114a563f14b391503b392ad7b72faefbe964c2530d75197fbe4d7c6f6acfcb606b511eda338923a297e4e0c84407edbe129c59988a094c449b37d1f5cac0120  linux-postmarketos-qcom-msm8953-v6.6.10-r0.tar.gz
+76351c35b7c39cbd37bbc675c32432ad53b8580593003d04a1b486b6bd911803b24da78ec6c995766a20806588806548b213a0be902166de1514b7004afed02b  config-postmarketos-qcom-msm8953.aarch64
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.12 Kernel Configuration
+# Linux/arm64 6.6.10 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
@@ -3715,8 +3715,6 @@ CONFIG_SND_PCM=y
 CONFIG_SND_PCM_ELD=y
 CONFIG_SND_PCM_IEC958=y
 CONFIG_SND_DMAENGINE_PCM=y
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
 CONFIG_SND_COMPRESS_OFFLOAD=y
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
@@ -3750,9 +3748,7 @@ CONFIG_SND_DRIVERS=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-# CONFIG_SND_USB_AUDIO_MIDI_V2 is not set
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+# CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_USB_UA101 is not set
 # CONFIG_SND_USB_CAIAQ is not set
 # CONFIG_SND_USB_6FIRE is not set
@@ -3,7 +3,7 @@
 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
 pkgver=6.7.0
-pkgrel=1
+pkgrel=0
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -55,5 +55,5 @@ package() {

 sha512sums="
 2129b3fbf2ac585130ef53c768597fe7d4372b3f1fbbcafeae4ed781d2643884735d349aae72c885a510f28179fb37d5c1075c75e8f72676b8ab4600ededaba8  linux-v6.7.0-sm6350.tar.gz
-2f3ce14bc425c26604ba1a40d014d005a6fbba206ed16d519b86279e29c10b55a31653899ed373464d7f7e92bcaa7d8552f01d8e405e5706bbb28695ad0ed0c8  config-postmarketos-qcom-sm6350.aarch64
+0c1969970c48e9e589cc27896606bef0af5e389a0ee606b3f4468e844ea098f1f443edba8bfaa7d3edaaf877eb827bc148fbe6bae77dd3890980c9ebd10df3df  config-postmarketos-qcom-sm6350.aarch64
 "
@@ -1903,7 +1903,7 @@ CONFIG_NET_VENDOR_PENSANDO=y
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_UART is not set
 # CONFIG_QCOM_EMAC is not set
-CONFIG_RMNET=m
+# CONFIG_RMNET is not set
 CONFIG_NET_VENDOR_RENESAS=y
 CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SAMSUNG=y
@@ -1,5 +1,4 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
-# Co-Maintainer: Quade Curry <qc8086@qc8086.com>

 # This is seperate from linux-edge so we can control the release cycle better.
 # If this kernel is updated and fails to boot it's quite hard to recover the
@@ -1,4 +1,4 @@
-# Maintainer: Quade Curry <qc8086@qc8086.com>
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
 # Seperate u-boot package for the pine64-pinebookpro because this includes
 # a driver for the display and supports efi loading operating systems
 pkgname=u-boot-pinebookpro
@@ -3,7 +3,7 @@
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
 pkgver=0.47
-pkgrel=1
+pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -4,7 +4,7 @@
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=device-purism-librem5
 pkgver=1.51
-pkgrel=2
+pkgrel=1
 _confver=64
 _purismrel=1
 # <librem5-base ver>.<purism release>
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 # Co-Maintainer: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-qemu-aarch64
-pkgver=4
-pkgrel=1
+pkgver=3
+pkgrel=5
 pkgdesc="Simulated device in QEMU (aarch64)"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -16,12 +16,14 @@ subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-mce
 	$pkgname-sway
+	$pkgname-weston
 	"

 source="
 	deviceinfo
 	modules-initfs
 	mce-display-blanking.conf
+	weston.ini
 	"
 options="!check !archcheck"

@@ -46,6 +48,12 @@ sway() {
 	mkdir "$subpkgdir"
 }

+weston() {
+	install_if="$pkgname=$pkgver-r$pkgrel weston"
+	install -Dm644 "$srcdir"/weston.ini \
+		"$subpkgdir"/etc/xdg/weston/weston.ini
+}
+
 kernel_virt() {
 	pkgdesc="Alpine Virt kernel (minimal, no audio)"
 	depends="linux-virt"
@@ -68,4 +76,5 @@ sha512sums="
 806e06840e026af6d6da506faaa2617b560eaa27d33c29da2151ebee39fadd783cfe0d30998d64b82a166a1d13830862f32eadf22a1b45465a5951bc05209904  deviceinfo
 8129439ec53e76e714b2d3dac97bbe702822d6f6642ea6b631aa26001fec85ca310fbe9eeb04c2bd849145a1137b7934c21b704524f3a98b96b7c6f71c2ca992  modules-initfs
 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf
+de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
 "
@@ -0,0 +1,5 @@
+[core]
+xwayland=true
+backend=drm-backend.so
+[shell]
+background-image=/usr/share/wallpapers/postmarketos.jpg
@@ -2,7 +2,7 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 # Co-Maintainer: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-qemu-amd64
-pkgver=6
+pkgver=5
 pkgrel=1
 pkgdesc="Simulated device in QEMU (x86_64)"
 url="https://postmarketos.org"
@@ -17,11 +17,13 @@ subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-mce
 	$pkgname-sway
+	$pkgname-weston
 	"
 source="
 	deviceinfo
 	modules-initfs
 	mce-display-blanking.conf
+	weston.ini
 	"
 options="!check !archcheck"

@@ -46,6 +48,12 @@ sway() {
 	mkdir "$subpkgdir"
 }

+weston() {
+	install_if="$pkgname=$pkgver-r$pkgrel weston"
+	install -Dm644 "$srcdir"/weston.ini \
+		"$subpkgdir"/etc/xdg/weston/weston.ini
+}
+
 kernel_none() {
 	pkgdesc="No kernel (does not boot! can be used during pmbootstrap testing to save time)"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
@@ -73,4 +81,5 @@ sha512sums="
 94f8f9ad44ba6ffe55a07a5bce11351f89a7d97e0c52931c573ea21ff7416cc3ede800da94611e04ebfed6914f8d5edb9614f8c0847b53b09ae168a8607f6195  deviceinfo
 29766094e64a7ce881c8e96433203ea538057b8fd1d577fc69b9add6bc1217af04ddf60cbcf82333811c627897eda7537b0b1f862899e1fdfd93403b3f6425d7  modules-initfs
 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf
+de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
 "
@@ -0,0 +1,5 @@
+[core]
+xwayland=true
+backend=drm-backend.so
+[shell]
+background-image=/usr/share/wallpapers/postmarketos.jpg
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 # Co-Maintainer: Luca Weiss <luca@z3ntu.xyz>
 pkgname=device-qemu-riscv64
-pkgver=2
-pkgrel=1
+pkgver=1
+pkgrel=3
 pkgdesc="Simulated device in QEMU (riscv64)"
 url="https://postmarketos.org"
 arch="riscv64"
@@ -14,12 +14,14 @@ subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-mce
 	$pkgname-sway
+	$pkgname-weston
 	"

 source="
 	deviceinfo
 	modules-initfs
 	mce-display-blanking.conf
+	weston.ini
 	"
 options="!check !archcheck"

@@ -44,6 +46,12 @@ sway() {
 	mkdir "$subpkgdir"
 }

+weston() {
+	install_if="$pkgname=$pkgver-r$pkgrel weston"
+	install -Dm644 "$srcdir"/weston.ini \
+		"$subpkgdir"/etc/xdg/weston/weston.ini
+}
+
 kernel_edge() {
 	pkgdesc="Alpine Edge kernel"
 	depends="linux-edge linux-firmware-none"
@@ -54,4 +62,5 @@ sha512sums="
 85763f167819f8b53101e2d5de2eb9a9162f0f88a51e57f2faf7aae62c70350c5618d2d0e1bc045b0ff4b411df16cbaa6e097cc65094c446f302adb17ce51957  deviceinfo
 8129439ec53e76e714b2d3dac97bbe702822d6f6642ea6b631aa26001fec85ca310fbe9eeb04c2bd849145a1137b7934c21b704524f3a98b96b7c6f71c2ca992  modules-initfs
 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf
+de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
 "
@@ -0,0 +1,5 @@
+[core]
+xwayland=true
+backend=drm-backend.so
+[shell]
+background-image=/usr/share/wallpapers/postmarketos.jpg
@@ -1,4 +1,4 @@
-From 04a2ff0c2ee51393f00bc34e07fdac190eb6978b Mon Sep 17 00:00:00 2001
+From c0e6e18c3d4acc79f34af16d76e8af39c275f5bb Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:42:01 +0200
 Subject: [PATCH] dts: add pinetab-dev (old display panel)
@@ -10,11 +10,11 @@ Subject: [PATCH] dts: add pinetab-dev (old display panel)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts

 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index df6eaa6f60..15e3339c90 100644
+index 6740e6a97161..bd9d8fa9738f 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
-@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.2.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.2b.dtb
+@@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.1.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinetab.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinetab-early-adopter.dtb
 +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinetab-dev.dtb
@@ -23,7 +23,7 @@ index df6eaa6f60..15e3339c90 100644
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a100-allwinner-perf1.dtb
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
 new file mode 100644
-index 0000000000..1e287f2fb9
+index 000000000000..1e287f2fb9f3
 --- /dev/null
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
@@ -0,0 +1,29 @@
@@ -57,5 +57,5 @@ index 0000000000..1e287f2fb9
 +	};
 +};
 -- 
-2.43.0
+2.31.1

@@ -1,4 +1,4 @@
-From 3806b6eec5badaf3aee06460ac578b19124048ce Mon Sep 17 00:00:00 2001
+From a76ae09d570406690bde1436aa910e76ae179716 Mon Sep 17 00:00:00 2001
 From: Oliver Smith <ollieparanoid@postmarketos.org>
 Date: Tue, 20 Oct 2020 11:11:48 +0200
 Subject: [PATCH] dts: pinetab: add missing bma223, ohci1
@@ -13,10 +13,10 @@ https://gitlab.com/pine64-org/linux/-/commit/69ae7087ec51b09bb6a0afb53dddb5eb030
 1 file changed, 13 insertions(+), 1 deletion(-)

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index 5d8081a093..26ca14a664 100644
+index 91d27bc93a3e..c33c5690a87b 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-@@ -237,7 +237,15 @@ &i2c0_pins {
+@@ -225,7 +225,15 @@ &i2c0_pins {
 &i2c1 {
 	status = "okay";
 
@@ -33,7 +33,7 @@ index 5d8081a093..26ca14a664 100644
 };
 
 &lradc {
-@@ -303,6 +311,10 @@ &ohci0 {
+@@ -291,6 +299,10 @@ &ohci0 {
 	status = "okay";
 };
 
@@ -45,5 +45,5 @@ index 5d8081a093..26ca14a664 100644
 	status = "okay";
 };
 -- 
-2.43.0
+2.31.1

@@ -1,4 +1,4 @@
-From 4886da94b7d5fec7029ea27df107715c13c4ac10 Mon Sep 17 00:00:00 2001
+From bf487dec17b09c377e8661c18af8b1b746e02142 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 16:12:08 +0200
 Subject: [PATCH] arm64: dts: allwinner: Add bluetooth node to the PineTab
@@ -8,10 +8,10 @@ Subject: [PATCH] arm64: dts: allwinner: Add bluetooth node to the PineTab
 1 file changed, 13 insertions(+)

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index 26ca14a664..ffb36f69f5 100644
+index c33c5690a87b..ac66fd12f59f 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-@@ -514,6 +514,19 @@ &uart0 {
+@@ -487,6 +487,19 @@ &uart0 {
 	status = "okay";
 };
 
@@ -32,5 +32,5 @@ index 26ca14a664..ffb36f69f5 100644
 	dr_mode = "otg";
 	status = "okay";
 -- 
-2.43.0
+2.31.1

@@ -1,4 +1,4 @@
-From db2418dca1b2daadafe6e55dca4e81da959f1ca1 Mon Sep 17 00:00:00 2001
+From 77f6107336aa2171c4b3086f8a98af42b93f65f5 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:44:51 +0200
 Subject: [PATCH] dts: pinetab: make audio routing consistent with pinephone
@@ -8,10 +8,10 @@ Subject: [PATCH] dts: pinetab: make audio routing consistent with pinephone
 1 file changed, 6 insertions(+), 5 deletions(-)

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index ffb36f69f5..faa0eb2e57 100644
+index ac66fd12f59f..1923c6d0debe 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-@@ -487,19 +487,20 @@ hdmi_out_con: endpoint {
+@@ -460,19 +460,20 @@ &reg_rtc_ldo {
 
 &sound {
 	status = "okay";
@@ -38,5 +38,5 @@ index ffb36f69f5..faa0eb2e57 100644
 			"ADCR", "Right ADC",
 			"Internal Microphone Left", "MBIAS",
 -- 
-2.43.0
+2.31.1

@@ -1,4 +1,4 @@
-From 999793e3f4f3e807ba478c4585650a1277a7dd16 Mon Sep 17 00:00:00 2001
+From 1879de83c95ba0e133b2ed8c945fe1be3b46f8f1 Mon Sep 17 00:00:00 2001
 From: Clayton Craft <clayton@craftyguy.net>
 Date: Wed, 16 Dec 2020 20:16:14 -0800
 Subject: [PATCH] dts: pinephone: drop modem-power node
@@ -11,10 +11,10 @@ Subject: [PATCH] dts: pinephone: drop modem-power node
 4 files changed, 24 insertions(+), 68 deletions(-)

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
-index 0530881d84..144f1eca9f 100644
+index a21c6d78a0ef..7f0cfdafed15 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
-@@ -87,28 +87,6 @@ &reg_drivevbus {
+@@ -86,28 +86,6 @@ &reg_drivevbus {
 	status = "okay";
 };
 
@@ -43,8 +43,8 @@ index 0530881d84..144f1eca9f 100644
 &usbphy {
 	usb-role-switch;
 
-@@ -123,6 +101,10 @@ &codec_analog {
- 	allwinner,internal-bias-resistor;
+@@ -118,6 +96,10 @@ usb0_drd_sw: endpoint {
+ 	};
 };
 
 +&ring_indicator {
@@ -55,10 +55,10 @@ index 0530881d84..144f1eca9f 100644
 	enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
 	flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-index 053e4add99..78982fe051 100644
+index d67f31ef529e..e7b636299d15 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-@@ -101,29 +101,6 @@ &sgm3140 {
+@@ -114,29 +114,6 @@ &sgm3140 {
 	flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
 };
 
@@ -88,19 +88,19 @@ index 053e4add99..78982fe051 100644
 &usbphy {
 	usb-role-switch;
 
-@@ -137,3 +114,7 @@ usb0_drd_sw: endpoint {
- &hdmi {
- 	extcon = <&anx7688 0>;
+@@ -146,3 +123,7 @@ usb0_drd_sw: endpoint {
+ 		};
+ 	};
 };
 +
 +&ring_indicator {
 +	gpios = <&pio 1 2 GPIO_ACTIVE_LOW>; /* PB2 */
 +};
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
-index ec4927dfe9..57b651d695 100644
+index 9b33186c7e7d..44b3d6555ff7 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
-@@ -93,29 +93,6 @@ &sgm3140 {
+@@ -107,29 +107,6 @@ &sgm3140 {
 	flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
 };
 
@@ -130,19 +130,19 @@ index ec4927dfe9..57b651d695 100644
 &usbphy {
 	usb-role-switch;
 
-@@ -129,3 +106,7 @@ usb0_drd_sw: endpoint {
- &hdmi {
- 	extcon = <&anx7688 0>;
+@@ -139,3 +116,7 @@ usb0_drd_sw: endpoint {
+ 		};
+ 	};
 };
 +
 +&ring_indicator {
 +	gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
 +};
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index 1886a1f9a4..5b0b5a5f97 100644
+index d3d4f1a53c8d..3cf2f3e6a41a 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -310,6 +310,17 @@ ec25_codec: ec25-codec {
+@@ -192,6 +192,17 @@ ec25_codec: ec25-codec {
 		sound-name-prefix = "Modem";
 	};
 
@@ -160,7 +160,7 @@ index 1886a1f9a4..5b0b5a5f97 100644
 	i2c_csi: i2c-csi {
 		compatible = "i2c-gpio";
 		sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PE13 */
-@@ -382,6 +393,7 @@ reg_usb_5v: usb-5v {
+@@ -264,6 +275,7 @@ reg_usb_5v: usb-5v {
 	reg_vbat_bb: vbat-bb {
 		compatible = "regulator-fixed";
 		regulator-name = "vbat-bb";
@@ -169,5 +169,5 @@ index 1886a1f9a4..5b0b5a5f97 100644
 		regulator-max-microvolt = <3500000>;
 		gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
 -- 
-2.43.0
+2.31.1

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

 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 9367a4572d..62cdd63859 100644
+index 4e2dad314c79..cd507bf895f5 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2213,6 +2213,30 @@ static const struct panel_desc hannstar_hsd101pww2 = {
+@@ -2179,6 +2179,30 @@ static const struct panel_desc hannstar_hsd100pxn1 = {
 	.connector_type = DRM_MODE_CONNECTOR_LVDS,
 };
 
@@ -42,7 +42,7 @@ index 9367a4572d..62cdd63859 100644
 static const struct drm_display_mode hitachi_tx23d38vm0caa_mode = {
 	.clock = 33333,
 	.hdisplay = 800,
-@@ -4364,6 +4388,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4265,6 +4289,9 @@ static const struct of_device_id platform_of_match[] = {
 	}, {
 		.compatible = "hit,tx23d38vm0caa",
 		.data = &hitachi_tx23d38vm0caa
@@ -53,5 +53,5 @@ index 9367a4572d..62cdd63859 100644
 		.compatible = "innolux,at043tn24",
 		.data = &innolux_at043tn24,
 -- 
-2.43.0
+2.31.1

@@ -1,19 +1,19 @@
-From c6699422d09b6a70bbbf8a64558d456f1b6584e1 Mon Sep 17 00:00:00 2001
+From cd06dec28f2c6a61cb3c2ef00c2a68efe4c26db6 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:29:37 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet

 ---
- arch/arm/boot/dts/allwinner/Makefile          |   1 +
- .../sun6i-a31s-goclever-gcta741l.dts          | 103 ++++++++++++++++++
+ arch/arm/boot/dts/allwinner/Makefile                    |   1 +
+ .../boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts | 103 ++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts

 diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index 7c7fb94d21..097614b95f 100644
+index 127a10cb590d..ba31b42f1e18 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
-@@ -110,6 +110,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
+@@ -1136,6 +1136,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
 	sun6i-a31-mele-a1000g-quad.dtb \
 	sun6i-a31s-colorfly-e708-q1.dtb \
 	sun6i-a31s-cs908.dtb \
@@ -23,7 +23,7 @@ index 7c7fb94d21..097614b95f 100644
 	sun6i-a31s-sina31s.dtb \
 diff --git a/arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts b/arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts
 new file mode 100644
-index 0000000000..4fcba20ffe
+index 000000000000..7fb95aef4c74
 --- /dev/null
 +++ b/arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts
@@ -0,0 +1,103 @@
@@ -38,7 +38,7 @@ index 0000000000..4fcba20ffe
 +/ {
 +	model = "GoClever Orion 70L";
 +	compatible = "goclever,gcta741l", "allwinner,sun6i-a31s";
-+
+	
 +	panel {
 +		compatible = "hannstar,tqtm070cb501";
 +		power-supply = <&reg_dc1sw>;
@@ -50,7 +50,7 @@ index 0000000000..4fcba20ffe
 +			};
 +		};
 +	};
-+
+	
 +	// PWM not supported by sun6i at the moment
 +	//backlight {
 +	//	compatible = "pwm-backlight";
@@ -131,5 +131,5 @@ index 0000000000..4fcba20ffe
 +	status = "okay";
 +};
 -- 
-2.43.0
+2.31.1

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

 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 62cdd63859..a11265c813 100644
+index cd507bf895f5..ac8cfb3ce163 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2133,6 +2133,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
+@@ -2124,6 +2124,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
 	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
 };
 
@@ -37,12 +37,12 @@ index 62cdd63859..a11265c813 100644
 +	},
 +	.bus_format = MEDIA_BUS_FMT_RGB666_1X18,
 +	.connector_type = DRM_MODE_CONNECTOR_DPI,
-+};
+}; 
 +
 static const struct display_timing hannstar_hsd070pww1_timing = {
 	.pixelclock = { 64300000, 71100000, 82000000 },
 	.hactive = { 1280, 1280, 1280 },
-@@ -4376,6 +4400,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4280,6 +4304,9 @@ static const struct of_device_id platform_of_match[] = {
 	}, {
 		.compatible = "giantplus,gpm940b0",
 		.data = &giantplus_gpm940b0,
@@ -53,5 +53,5 @@ index 62cdd63859..a11265c813 100644
 		.compatible = "hannstar,hsd070pww1",
 		.data = &hannstar_hsd070pww1,
 -- 
-2.43.0
+2.31.1

@@ -1,19 +1,19 @@
-From 00b0bb6210bd15f21be74b89809300c4e8a4c335 Mon Sep 17 00:00:00 2001
+From e9ac5ae02481dfe87335d9f2033785f0263c820d Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:18:58 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet

 ---
- arch/arm/boot/dts/allwinner/Makefile          |   1 +
- .../allwinner/sun4i-a10-lark-freeme-70-2s.dts | 246 ++++++++++++++++++
+ arch/arm/boot/dts/allwinner/Makefile                    |   1 +
+ .../boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts  | 246 ++++++++++++++++++
 2 files changed, 247 insertions(+)
 create mode 100644 arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts

 diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index 097614b95f..902b8f6752 100644
+index ba31b42f1e18..f5df06c4d564 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
-@@ -36,6 +36,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
+@@ -1098,6 +1098,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
 	sun4i-a10-inet9f-rev03.dtb \
 	sun4i-a10-itead-iteaduino-plus.dtb \
 	sun4i-a10-jesurun-q5.dtb \
@@ -23,7 +23,7 @@ index 097614b95f..902b8f6752 100644
 	sun4i-a10-mk802.dtb \
 diff --git a/arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts b/arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts
 new file mode 100644
-index 0000000000..5f17902410
+index 000000000000..fcba874976fa
 --- /dev/null
 +++ b/arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts
@@ -0,0 +1,246 @@
@@ -62,7 +62,7 @@ index 0000000000..5f17902410
 +			};
 +		};
 +	};
-+
+	
 +	backlight: backlight {
 +		compatible = "pwm-backlight";
 +		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
@@ -70,7 +70,7 @@ index 0000000000..5f17902410
 +		default-brightness-level = <8>;
 +		enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
 +	};
-+
+	
 +	panel: panel {
 +		compatible = "hannstar,hsd070idw1-a";
 +		power-supply = <&reg_vcc3v3>;
@@ -274,5 +274,5 @@ index 0000000000..5f17902410
 +	status = "okay";
 +};
 -- 
-2.43.0
+2.31.1

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

 diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
-index e9370c7364..a4abd589e9 100644
+index 55ca34803a3f..962c948fef17 100644
 --- a/drivers/mmc/host/sunxi-mmc.c
 +++ b/drivers/mmc/host/sunxi-mmc.c
-@@ -1436,15 +1436,17 @@ static int sunxi_mmc_probe(struct platform_device *pdev)
+@@ -1426,15 +1426,17 @@ static int sunxi_mmc_probe(struct platform_device *pdev)
 				  MMC_CAP_SDIO_IRQ;
 
 	/*
@@ -34,5 +34,5 @@ index e9370c7364..a4abd589e9 100644
 
 	ret = mmc_of_parse(mmc);
 -- 
-2.43.0
+2.33.0

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

 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-index 218c26c594..a424eded00 100644
+index adf2134ec1a4..82740a8aef9b 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-@@ -145,7 +145,7 @@ hdmi_out_con: endpoint {
+@@ -141,7 +141,7 @@ hdmi_out_con: endpoint {
 &emac {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ext_rgmii_pins>;
@@ -22,7 +22,7 @@ index 218c26c594..a424eded00 100644
 	phy-handle = <&ext_rgmii_phy>;
 	/*
 	 * The board uses 2.5V RGMII signalling. Power sequence to enable
-@@ -155,8 +155,8 @@ &emac {
+@@ -151,8 +151,8 @@ &emac {
 	 */
 	phy-supply = <&reg_aldo2>;
 	phy-io-supply = <&reg_gmac_2v5>;
@@ -34,5 +34,5 @@ index 218c26c594..a424eded00 100644
 };
 
 -- 
-2.43.0
+2.33.0

@@ -1,4 +1,4 @@
-From cfad20d85c87e6e489c4f2e45bfe4664a60736a2 Mon Sep 17 00:00:00 2001
+From fedafc567167a7a0d10ddc5657dd3f32a872ec86 Mon Sep 17 00:00:00 2001
 From: marcin <marcin@ipv8.pl>
 Date: Sat, 6 Aug 2022 00:17:40 +0200
 Subject: [PATCH] Revert "usb: quirks: Add USB_QUIRK_RESET for Quectel EG25G
@@ -10,10 +10,10 @@ This reverts commit 62867934f6251349e1352a345f827ba8de514a36.
 1 file changed, 3 deletions(-)

 diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 7e42d7322e..15e9bd180a 100644
+index 631c3313c37bc..079e183cf3bff 100644
 --- a/drivers/usb/core/quirks.c
 +++ b/drivers/usb/core/quirks.c
-@@ -542,9 +542,6 @@ static const struct usb_device_id usb_quirk_list[] = {
+@@ -535,9 +535,6 @@ static const struct usb_device_id usb_quirk_list[] = {
 	/* INTEL VALUE SSD */
 	{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
 
@@ -24,5 +24,4 @@ index 7e42d7322e..15e9bd180a 100644
 };
 
 -- 
-2.43.0
-
+GitLab
@@ -1,4 +1,3 @@
-From d9a65f76763df1828644d0210fe747e67ba32fb3 Mon Sep 17 00:00:00 2001
 From: Thomas Thorne <Thomas.Thorne@Net2Edge.com>
 Date: Tue, 20 Sep 2022 20:34:57 -0400
 Subject: usb: serial: option: add 'reset_resume' callback for WWAN devices
@@ -17,17 +16,13 @@ However the rest of the patch is not needed/already upstreamed.
 1 file changed, 1 insertion(+)

 diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 72390dbf07..71a2d6d61b 100644
+index 6b69d05..f5d797d 100644
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -2314,6 +2314,7 @@ static struct usb_serial_driver option_1port_device = {
+@@ -2244,6 +2244,7 @@ static struct usb_serial_driver option_1port_device = {
 #ifdef CONFIG_PM
 	.suspend           = usb_wwan_suspend,
 	.resume            = usb_wwan_resume,
 +	.reset_resume	   = usb_wwan_resume,
 #endif
 };
- 
-- 
-2.43.0
-
@@ -3,9 +3,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=6.7.2_git20240127
+pkgver=6.6.3_git20231128
 pkgrel=0
-_tag="orange-pi-6.7-20240127-1717"
+_tag="orange-pi-6.6-20231128-2239"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -83,21 +83,21 @@ package() {
 }

 sha512sums="
-0135ca518e82c7f858a7892b87c79e875d5f3f8d3ea884a969e6f3bb7f2a1fe260058debecce286e00a96b03c297533e4edf1859095837bd664793a29aaca41b  linux-postmarketos-allwinner-orange-pi-6.7-20240127-1717.tar.gz
-71c0d95567a6682ded7ac1e67415e27ed5a0490eeebe6c3169839dd30c18365f04e581b44dc9f3d8f27416e9950de24362b0cc11ad9316ca115008ffe8cd8683  config-postmarketos-allwinner.aarch64
-5c3dd13d2bba99d476697873c24ef46dd1cc76c9b6babd0afedf6ed50f35044e9bc3ca29d7b5d3d795227878442d2c62e1eae4a27eab8d506770add4cb8ba41f  config-postmarketos-allwinner.armv7
+d192e12dee5dcb7792e2d78e97324fe17cb962e83f31ab7955a716624d1dea650e309a172448e2b6bc21c42ec7629ed7b9a6d083e1c8775598b69d6448e71ab2  linux-postmarketos-allwinner-orange-pi-6.6-20231128-2239.tar.gz
+4da887f87dde1a3732ff663455e0e6f98df95936d55845d72991cacbc8c1d9dd489e53ac11b59f7355d24eba42f128ed8997460830b86bae44ede85f04857ec8  config-postmarketos-allwinner.aarch64
+682e62c6d98a9f74ed7bd569d7193f2b2fd87b150d5dc215963c5faafdd901706992626642d52a7bb026981f8036116c8b53062e1383bbcbd108ebb4a3c276d1  config-postmarketos-allwinner.armv7
 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367  0001-dts-add-dontbeevil-pinephone-devkit.patch
-99edeccdee7beae5dc7337d78ba92de2f3d724b7648ede30ab040a66bdac0e38a6595e212e26011d608ccb8a92ffa9e393965f936dfead65ffe9b7eb31dfa345  0002-dts-add-pinetab-dev-old-display-panel.patch
-82c0203b02c671934d62e52311827ac1cc5b358e0843715ea2235117e4b47d6de63b29fdfc7c1adfc550cc7eb363c384de8276be1ca17da6e48916020124022d  0003-dts-pinetab-add-missing-bma223-ohci1.patch
-1fcfcc448424af475efd7f848eec04763c5930070f54fdb487e6f28717df7e20b73c0f444e9322d362deeedfd87b4e91c6e61e274d23206fafef36ca97ff95d6  0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
-16373f069c8a3b110f68cce6d60a7b75af32635467454f4203ceeae2f7f3a74dce73f9c41b00bc340fae580cff335f0fa8d4b033cb31907b69e7a05030461b0f  0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
-681c945abdb8dd595d505a36ef84100b968754a1c861e7525c00185f19aa431304ff3c3258750d2d67a8aa2fd8e078a9bbc4b5cabb1802c24637ce26ecd3ee2d  0006-dts-pinephone-drop-modem-power-node.patch
-c4ab9d65b4cd6ebe443cef51693ddaddfd55d3f73b5955b2c0211ecbc69054b17e875905f56c503873bb61f6fdb39e097d85d264d6e1bd6b7ab6526076ccd535  0007-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
-943f8a9791461621c20b1dd0db9946a31734c4fe316626d045de2e2207e6f099d469e1a5b9ab9bd93cd5fca85b6422a211d435c6124aea1a2ecee818c7b35ac2  0008-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
-952e2332cbc85e69259b037302411520d46c18bb90371492b6cfcc9eeeaf96d030875bf0a17edea756c9744faee38fd42288345681e5e903f6e64d0849f76db2  0009-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
-b7c084bb32cfc18defcec77966f1944fd3b33bb48769a4c0e257709d0f3898c5e0ca2a50c39a5d4513463580eef58b5301e75345bd36d6cc5f84347f7d241a8c  0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
-8ee720bc6195b1b454a274e7ad9a245107aa6d127018b98909c5f105d608568bcf1651343bf9633f4804d5649f4df7e3390d6eb72a708666e89337e39427943a  0011-sunxi-mmc-h6-fix.patch
-370e963805a4c984dc501a6a6f686cac059485a275370c5f55de0841e227c5f6652abb38ad935c8dd046014e632e70129d3f8fbeae9650fe7de6f0d10e9cdc3a  0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
-c766911f76d36b997582533707d7d7a089ed1272e49a79dbe75f7c1eafef0ba3f1417d6c66f25e12e56124e0cd4bb9f443d400236e252ef1c43d53def9392a87  0013-Revert-usb-quirks-Add-USB_QUIRK_RESET-for-Quectel-EG25G-Modem.patch
-382e6e8785235788101459ae47c940ec85831007c61e3f14c4e3a43abfa21b95cdaa6bdd1b7fdd6fd26944f4c629d41b9ab776e89d9a18778fbc9f6a7785444b  0014-usb-serial-option-add-reset-resume-callback-for-WWAN.patch
+1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04  0002-dts-add-pinetab-dev-old-display-panel.patch
+96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa  0003-dts-pinetab-add-missing-bma223-ohci1.patch
+925bd630f3694d118b24f2f5a838ba105e4ca9ed8dd4294b6632310d8d6b1f421cdd673e2013758f9de7159050aa54e0f76e04edcff65f755842b1c95b6637e7  0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
+9bc6c2afadae8d367471f901b86a94be7fa70daf7a4bdde5bc6d4b1458b5ddd0e063a7765d962c68231c8f022d1c660d422124c31a2c899de768985d91d377ea  0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+62809ac84db9d684b02d56dfc543451a1a13f319287466cfe913a847b945584ec60f7f556b1259ad3e26a44259a3fe587eeabeef6333f73a77204c3d3573f2ab  0006-dts-pinephone-drop-modem-power-node.patch
+c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e9b07db67019104d98933e31457891a5ce1e6010e06232875  0007-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+1fd9a225d2bdf6ed25994105ac769df0ed9804320115a94ce67afad5a23f21edeaa355bcab99184c29a10a773db337c2b5d2176cfad9ce251169730754114673  0008-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+71fad7ecff66a2cb692f3dd3d02301c4b419873f27693de81f50226b8ab93c229299e7dc663fdd07a7e8f03a6541527f3bb449626f865fcfde6a780ef1b91976  0009-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+4274e0312664b8326b0070bcae8424909e778086cfeccdc262c52cf17acfc5ba7b6a4b687009308ab27117a3c00a268b7c7ce1265c157400a68a6b9edde99795  0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+2feeab0a6c3db46e514d45c9708f351c6d7dfb0bf951a5cb6f2dc01b4bdc8d4c46931000758a819a6d7317b16cb1933bb3946e6a78cbf448cc77f57a56c503bf  0011-sunxi-mmc-h6-fix.patch
+22af33264090dac027ee054b4345a07f0b2ee077e2ae1620e83960bfeea096169aec710973fdd50531ed4f1db6cfd59b5796cd235316cb3512aee034f741a694  0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+bc7d41b0e1b9f2c3f4d860f07c9fd1621c3f07e16e7ab48f80cedfccb81af263b0f4dc0964baeebdc03eddaacfc3bc9c090863d3748891709e1b2c32840ea16f  0013-Revert-usb-quirks-Add-USB_QUIRK_RESET-for-Quectel-EG25G-Modem.patch
+15062c72ba74ff5ca69a640e3a5fbf07f981a2b6129eb9c96ea83a62987c7b4fd99cb9e90b73021deaa7f08aa8c332683674287b285432f62cd0ddcc8932eb56  0014-usb-serial-option-add-reset-resume-callback-for-WWAN.patch
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.7.2 Kernel Configuration
+# Linux/arm64 6.6.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
@@ -323,7 +323,6 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_NXP is not set
 # CONFIG_ARCH_MA35 is not set
 # CONFIG_ARCH_NPCM is not set
-# CONFIG_ARCH_PENSANDO is not set
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
@@ -860,7 +859,6 @@ CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_ARCH_ENABLE_THP_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
-CONFIG_PCP_BATCH_SCALE_MAX=5
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -975,7 +973,6 @@ CONFIG_INET_DIAG_DESTROY=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_AO is not set
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 CONFIG_IPV6_ROUTER_PREF=y
@@ -1515,6 +1512,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
@@ -1588,6 +1586,7 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 #
 # Bus devices
 #
+# CONFIG_BRCMSTB_GISB_ARB is not set
 CONFIG_SUN50I_DE2_BUS=y
 CONFIG_SUNXI_RSB=y
 # CONFIG_VEXPRESS_CONFIG is not set
@@ -1618,12 +1617,6 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=y
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
-
-#
-# Qualcomm firmware drivers
-#
-# end of Qualcomm firmware drivers
-
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
 CONFIG_ARM_SMCCC_SOC_ID=y
@@ -1707,6 +1700,7 @@ CONFIG_PPKB_POWER_MANAGER=m
 # EEPROM support
 #
 # CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
@@ -1836,7 +1830,6 @@ CONFIG_TUN=y
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 # CONFIG_NLMON is not set
-# CONFIG_NETKIT is not set
 # CONFIG_NET_VRF is not set
 CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
@@ -2618,6 +2611,7 @@ CONFIG_GPIO_PCA953X_IRQ=y

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

@@ -2725,13 +2718,11 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_POWERZ is not set
 # CONFIG_SENSORS_POWR1220 is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LTC2945 is not set
 # CONFIG_SENSORS_LTC2947_I2C is not set
 # CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC2991 is not set
 # CONFIG_SENSORS_LTC2992 is not set
 # CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
@@ -3038,7 +3029,6 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX77503 is not set
 # CONFIG_REGULATOR_MAX77857 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
@@ -3286,10 +3276,6 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
 # Microchip Technology, Inc. media platform drivers
 #

-#
-# Nuvoton media platform drivers
-#
-
 #
 # NVidia media platform drivers
 #
@@ -3377,7 +3363,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_IMX415 is not set
 # CONFIG_VIDEO_MT9M001 is not set
 # CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9M114 is not set
 # CONFIG_VIDEO_MT9P031 is not set
 # CONFIG_VIDEO_MT9T112 is not set
 # CONFIG_VIDEO_MT9V011 is not set
@@ -3625,11 +3610,9 @@ CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=y
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=y
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
-# CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
-# CONFIG_DRM_PANEL_JDI_LPM102A188A is not set
 # CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
@@ -3649,7 +3632,6 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
-# CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
@@ -3772,7 +3754,6 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
-CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
@@ -3957,8 +3938,6 @@ CONFIG_SND_SOC_AK4613=m
 # CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_AW88395 is not set
 # CONFIG_SND_SOC_AW88261 is not set
-# CONFIG_SND_SOC_AW87390 is not set
-# CONFIG_SND_SOC_AW88399 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 CONFIG_SND_SOC_BT_SCO=m
 # CONFIG_SND_SOC_CHV3_CODEC is not set
@@ -4027,7 +4006,6 @@ CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_RT5640 is not set
 # CONFIG_SND_SOC_RT5659 is not set
 # CONFIG_SND_SOC_RT9120 is not set
-# CONFIG_SND_SOC_RTQ9128 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
@@ -4376,7 +4354,6 @@ CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_CHIPIDEA_MSM=y
-CONFIG_USB_CHIPIDEA_NPCM=y
 CONFIG_USB_CHIPIDEA_IMX=y
 CONFIG_USB_CHIPIDEA_GENERIC=y
 CONFIG_USB_CHIPIDEA_TEGRA=y
@@ -4588,7 +4565,6 @@ CONFIG_TYPEC_ANX7688=m
 # CONFIG_TYPEC_MUX_GPIO_SBU is not set
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
 # CONFIG_TYPEC_MUX_NB7VPQ904M is not set
-# CONFIG_TYPEC_MUX_PTN36502 is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support

 #
@@ -4636,6 +4612,8 @@ CONFIG_MMC_CQHCI=y
 # CONFIG_MMC_HSQ is not set
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_SDHCI_XENON=y
+# CONFIG_MMC_SDHCI_OMAP is not set
+# CONFIG_MMC_SDHCI_AM654 is not set
 CONFIG_SCSI_UFSHCD=m
 # CONFIG_SCSI_UFS_BSG is not set
 # CONFIG_SCSI_UFS_HWMON is not set
@@ -4717,7 +4695,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 CONFIG_LEDS_TRIGGER_CPU=y
 # CONFIG_LEDS_TRIGGER_ACTIVITY is not set
-# CONFIG_LEDS_TRIGGER_GPIO is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

 #
@@ -4956,6 +4933,11 @@ CONFIG_RTL8723BS=m
 #
 # CONFIG_AD5933 is not set
 # end of Network Analyzer, Impedance Converters
+
+#
+# Resolver to digital converters
+#
+# end of Resolver to digital converters
 # end of IIO staging drivers

 CONFIG_STAGING_MEDIA=y
@@ -5099,6 +5081,7 @@ CONFIG_ARM_SMMU_V3=y
 #
 # Broadcom SoC drivers
 #
+# CONFIG_SOC_BRCMSTB is not set
 # end of Broadcom SoC drivers

 #
@@ -5133,6 +5116,7 @@ CONFIG_ARM_SMMU_V3=y

 CONFIG_SUNXI_MBUS=y
 CONFIG_SUNXI_SRAM=y
+# CONFIG_SUN20I_PPU is not set
 # CONFIG_SOC_TI is not set

 #
@@ -5141,33 +5125,6 @@ CONFIG_SUNXI_SRAM=y
 # end of Xilinx SoC drivers
 # end of SOC (System On Chip) specific Drivers

-#
-# PM Domains
-#
-
-#
-# Amlogic PM Domains
-#
-# end of Amlogic PM Domains
-
-#
-# Broadcom PM Domains
-#
-# end of Broadcom PM Domains
-
-#
-# i.MX PM Domains
-#
-# end of i.MX PM Domains
-
-#
-# Qualcomm PM Domains
-#
-# end of Qualcomm PM Domains
-
-# CONFIG_SUN20I_PPU is not set
-# end of PM Domains
-
 CONFIG_PM_DEVFREQ=y

 #
@@ -5264,7 +5221,6 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_LTC2309 is not set
 # CONFIG_LTC2471 is not set
 # CONFIG_LTC2485 is not set
 # CONFIG_LTC2497 is not set
@@ -5562,7 +5518,6 @@ CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 # Pressure sensors
 #
 # CONFIG_ABP060MG is not set
-# CONFIG_ROHM_BM1390 is not set
 # CONFIG_BMP280 is not set
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
@@ -5779,6 +5734,7 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
@@ -5799,7 +5755,6 @@ CONFIG_F2FS_FS_LZ4HC=y
 CONFIG_F2FS_FS_ZSTD=y
 CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
-# CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
@@ -6250,9 +6205,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
-CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
-CONFIG_CRYPTO_JITTERENTROPY_OSR=1
+# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
 CONFIG_CRYPTO_KDF800108_CTR=y
 # end of Random number generation

@@ -6409,6 +6362,7 @@ CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
@@ -6486,7 +6440,6 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
 CONFIG_SBITMAP=y
-# CONFIG_LWQ_TEST is not set
 # end of Library routines

 CONFIG_GENERIC_IOREMAP=y
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.7.2 Kernel Configuration
+# Linux/arm 6.6.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
@@ -788,7 +788,6 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 # CONFIG_PAGE_REPORTING is not set
 CONFIG_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
-CONFIG_PCP_BATCH_SCALE_MAX=5
 CONFIG_BOUNCE=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -1402,6 +1401,7 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCI400_COMMON=y
 CONFIG_ARM_CCI400_PORT_CTRL=y
+# CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_MOXTET is not set
 # CONFIG_SUN50I_DE2_BUS is not set
 CONFIG_SUNXI_RSB=y
@@ -1432,12 +1432,6 @@ CONFIG_SUNXI_RSB=y
 # CONFIG_TRUSTED_FOUNDATIONS is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_ARM_PSCI_FW=y
-
-#
-# Qualcomm firmware drivers
-#
-# end of Qualcomm firmware drivers
-
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
 CONFIG_ARM_SMCCC_SOC_ID=y
@@ -1520,6 +1514,7 @@ CONFIG_BLK_DEV_NBD=m
 #
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_93XX46 is not set
@@ -1684,7 +1679,6 @@ CONFIG_TUN=y
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=y
 # CONFIG_NLMON is not set
-# CONFIG_NETKIT is not set
 # CONFIG_NET_VRF is not set
 CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_ALACRITECH=y
@@ -2053,7 +2047,6 @@ CONFIG_MT7663U=m
 CONFIG_MT7663S=m
 # CONFIG_MT7921S is not set
 # CONFIG_MT7921U is not set
-# CONFIG_MT7925U is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 CONFIG_WILC1000=m
 CONFIG_WILC1000_SDIO=m
@@ -2493,6 +2486,7 @@ CONFIG_SPI_SUN6I=y
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
 # CONFIG_SPI_AMD is not set

 #
@@ -2705,7 +2699,6 @@ CONFIG_AXP20X_POWER=y
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set
-# CONFIG_FUEL_GAUGE_MM8013 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set

@@ -2753,14 +2746,12 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_POWERZ is not set
 # CONFIG_SENSORS_POWR1220 is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LTC2945 is not set
 # CONFIG_SENSORS_LTC2947_I2C is not set
 # CONFIG_SENSORS_LTC2947_SPI is not set
 # CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC2991 is not set
 # CONFIG_SENSORS_LTC2992 is not set
 # CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
@@ -3085,7 +3076,6 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX77503 is not set
 # CONFIG_REGULATOR_MAX77857 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
@@ -3269,10 +3259,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # Microchip Technology, Inc. media platform drivers
 #

-#
-# Nuvoton media platform drivers
-#
-
 #
 # NVidia media platform drivers
 #
@@ -3454,12 +3440,10 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
-# CONFIG_DRM_PANEL_JDI_LPM102A188A is not set
 # CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
@@ -3487,7 +3471,6 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
-# CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
@@ -3628,7 +3611,6 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
-CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
@@ -3664,8 +3646,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=30
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
@@ -3808,8 +3788,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_AW88395 is not set
 # CONFIG_SND_SOC_AW88261 is not set
-# CONFIG_SND_SOC_AW87390 is not set
-# CONFIG_SND_SOC_AW88399 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CHV3_CODEC is not set
@@ -3888,7 +3866,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_RT5640 is not set
 # CONFIG_SND_SOC_RT5659 is not set
 # CONFIG_SND_SOC_RT9120 is not set
-# CONFIG_SND_SOC_RTQ9128 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
@@ -4391,7 +4368,6 @@ CONFIG_TYPEC_STUSB160X=m
 # CONFIG_TYPEC_MUX_GPIO_SBU is not set
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_MUX_NB7VPQ904M is not set
-# CONFIG_TYPEC_MUX_PTN36502 is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support

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

 #
@@ -4743,6 +4718,12 @@ CONFIG_R8712U=m
 #
 # CONFIG_AD5933 is not set
 # end of Network Analyzer, Impedance Converters
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
 # end of IIO staging drivers

 CONFIG_STAGING_MEDIA=y
@@ -4863,6 +4844,7 @@ CONFIG_SUN6I_MSGBOX=y
 #
 # Broadcom SoC drivers
 #
+# CONFIG_SOC_BRCMSTB is not set
 # end of Broadcom SoC drivers

 #
@@ -4897,6 +4879,7 @@ CONFIG_SUN6I_MSGBOX=y

 CONFIG_SUNXI_MBUS=y
 CONFIG_SUNXI_SRAM=y
+# CONFIG_SUN20I_PPU is not set
 # CONFIG_SOC_TI is not set

 #
@@ -4905,33 +4888,6 @@ CONFIG_SUNXI_SRAM=y
 # end of Xilinx SoC drivers
 # end of SOC (System On Chip) specific Drivers

-#
-# PM Domains
-#
-
-#
-# Amlogic PM Domains
-#
-# end of Amlogic PM Domains
-
-#
-# Broadcom PM Domains
-#
-# end of Broadcom PM Domains
-
-#
-# i.MX PM Domains
-#
-# end of i.MX PM Domains
-
-#
-# Qualcomm PM Domains
-#
-# end of Qualcomm PM Domains
-
-# CONFIG_SUN20I_PPU is not set
-# end of PM Domains
-
 CONFIG_PM_DEVFREQ=y

 #
@@ -5051,7 +5007,6 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_LTC2309 is not set
 # CONFIG_LTC2471 is not set
 # CONFIG_LTC2485 is not set
 # CONFIG_LTC2496 is not set
@@ -5066,7 +5021,6 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_MAX9611 is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
-# CONFIG_MCP3564 is not set
 # CONFIG_MCP3911 is not set
 # CONFIG_NAU7802 is not set
 # CONFIG_RICHTEK_RTQ6056 is not set
@@ -5415,7 +5369,6 @@ CONFIG_AXP20X_ADC=y
 # Pressure sensors
 #
 # CONFIG_ABP060MG is not set
-# CONFIG_ROHM_BM1390 is not set
 # CONFIG_BMP280 is not set
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
@@ -5463,7 +5416,6 @@ CONFIG_AXP20X_ADC=y
 #
 # CONFIG_AD2S90 is not set
 # CONFIG_AD2S1200 is not set
-# CONFIG_AD2S1210 is not set
 # end of Resolver to digital converters

 #
@@ -5628,6 +5580,7 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_FS_POSIX_ACL is not set
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
@@ -5643,7 +5596,6 @@ CONFIG_F2FS_FS_POSIX_ACL=y
 # CONFIG_F2FS_FS_COMPRESSION is not set
 CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
-# CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
@@ -6185,6 +6137,7 @@ CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
@@ -6215,7 +6168,6 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
-CONFIG_ARCH_HAS_DMA_ALLOC=y
 CONFIG_DMA_CMA=y

 #
@@ -6251,7 +6203,6 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
 CONFIG_SBITMAP=y
-# CONFIG_LWQ_TEST is not set
 # end of Library routines

 CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
@@ -3,7 +3,7 @@
 # Co-Maintainer: Alistair Francis <alistair@alistair23.me>
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=linux-purism-librem5
-pkgver=6.6.13
+pkgver=6.6.6
 pkgrel=0
 # NOTE: Don't forget to rebase the config! See prepare() for instructions.
 _purismrel=1
@@ -83,6 +83,6 @@ package() {
 }

 sha512sums="
-83f4329cdf2c8d31386a9ff12ac054341345bf6c889c711d69ab5be6d2ea013a9769d72594ffd0dca55890673dec091c549eb36bbd7f1831661b398252c453c7  linux-purism-librem5-6.6.13pureos1.tar.gz
-336bbf465a5ed51147722bea843393ad3581700ab2ed3e4dfc019e8150e75aa82d2c1695d9379497f92cd0141deceb92680d08750462b7b40872dd6e4cb5ed3a  config-purism-librem5.aarch64
+5beee3b13b1ae54c88644407d3bfa2ff6b858a15e75a93154534c4e08b724d8f798c8bac1e342ff2501dbda89e51dbeade52df6ee57d167bfb6c81fc816ad6cb  linux-purism-librem5-6.6.6pureos1.tar.gz
+cf10149cf60b93bfc86325f7f299e207c1e682ef0f864d5c9caa43ecdb554d3eb04c1bda1b3320c207ae853f552f11b1e816a03bb971446c0f42981a5df27537  config-purism-librem5.aarch64
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.13 Kernel Configuration
+# Linux/arm64 6.6.6 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
@@ -7609,6 +7609,8 @@ CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_MAPLE_TREE is not set
 # end of Debug kernel data structures

+# CONFIG_DEBUG_CREDENTIALS is not set
+
 #
 # RCU Debugging
 #
@@ -3,7 +3,7 @@
 pkgname=device-acer-aspire1
 pkgdesc="Acer Aspire 1"
 pkgver=2
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"