main/pmos-base-ui: use dnsane for DNS

Fixes #1430 by basically filtering DNS queries to remove any with addresses that might cause traffic to go over a lower priority interface. See that issue for a more detailed explanation of the problem. It does this by: 1) configuring NetworkManager to send DNS config to resolvconf, instead of writing to resolv.conf directly. In my (limited) testing, this seems to be necessary to get NM to trigger resolvconf which is needed for... 2) configuring resolvconf to ignore any DNS it receives and use localhost, when writing resolv.conf openresolv is used because the alternative of modifying resolv.conf manually gets messy, specifically with apk where it may not replace /etc/resolv.conf if the user / something else has modified it... Note that there's still some possibilities for apps that have hardcoded DNS nameservers to bypass dnsane. It's not trivial to catch this. The most straight forward way is to use a firewall rule to redirect all outbound DNS to dnsane. But this would break mmsd and any other apps that actually need to query specific nameservers to function properly. I used a SIM that had a mobile data connection, but traffic was dropped by the carrier outside of the phone. In other words, my phone was often in the exact situation described in #1430. When connected to wifi, I could very easily notice when traffic was being routed incorrectly because anything destined for mobile data would fail (pages stopped loading, etc). After some amount of casual testing while using the phone "normally", I haven't noticed any failures yet from that problem.
2023-01-13 13:58:42 -08:00
561 changed files with 9320 additions and 79197 deletions
@@ -12,7 +12,7 @@ if [ "$(id -u)" = 0 ]; then
 fi

 # Wrap pmbootstrap to use this repository for --aports
-pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
+pmaports="$(cd $(dirname $0)/..; pwd -P)"
 _pmbootstrap="$(command -v pmbootstrap)"
 pmbootstrap() {
 	"$_pmbootstrap" --aports="$pmaports" "$@"
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2023 Oliver Smith
+# Copyright 2022 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Description: check pkgver/pkgrel bumps, amount of changed pkgs etc
 # Options: native
@@ -9,32 +9,16 @@ if [ "$(id -u)" = 0 ]; then
 fi

 # Find CHANGEMEs in APKBUILDs
-if grep -qr '(CHANGEME!)' -- *; then
+if grep -qr '(CHANGEME!)' *; then
 	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
-	grep --color=always -r '(CHANGEME!)' -- *
+	grep --color=always -r '(CHANGEME!)' *
 	exit 1
 fi

 # DTBs installed to /usr/share/db
-# shellcheck disable=SC2016
-if grep -qr 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/; then
-	echo 'ERROR: Please do not install dtbs to /usr/share/dtb!'
-	echo 'ERROR: Unless you have a good reason not to, please put them in /boot/dtbs'
-	echo 'ERROR: Files that need fixing:'
-	# shellcheck disable=SC2016
-	grep --color=always -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/
-	exit 1
-fi
-
-
-# Find old mkinitfs paths (pre mkinitfs 2.0)
-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 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 1
-fi
+# FIXME: doesn't pass currently, fix it and enable it afterwards
+# if grep -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb'; then
+# 	echo 'Please do not install dtbs to /usr/share/dtb!'
+# 	echo 'Unless you have a good reason not to, please put them in /boot/dtbs'
+# 	exit 1
+# fi
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Description: check modified kernel configs
+# Description: check all kernel configs with 'pmbootstrap kconfig check'
 # Options: native
 # Use 'native' because it requires running pmbootstrap.
 # https://postmarketos.org/pmb-ci
@@ -11,6 +11,12 @@ if [ "$(id -u)" = 0 ]; then
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

-export PYTHONUNBUFFERED=1
+# Wrap pmbootstrap to use this repository for --aports
+pmaports="$(cd $(dirname $0)/..; pwd -P)"
+_pmbootstrap="$(command -v pmbootstrap)"
+pmbootstrap() {
+	"$_pmbootstrap" --aports="$pmaports" "$@"
+}

-.ci/lib/check_changed_kernels.py
+set -x
+pmbootstrap kconfig check
@@ -1,83 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2023 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import tempfile
-import sys
-import subprocess
-
-# Same dir
-import common
-
-# pmbootstrap
-import add_pmbootstrap_to_import_path  # noqa
-import pmb.parse
-import pmb.helpers.logging
-
-
-def check_kconfig(args, pkgnames):
-    last_failed = None
-    for i in range(len(pkgnames)):
-        pkgname = pkgnames[i]
-        print(f"  ({i+1}/{len(pkgnames)}) {pkgname}")
-
-        apkbuild_path = pmb.helpers.pmaports.find(args, pkgname)
-        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")
-
-        options = []
-
-        for opt in apkbuild["options"]:
-            if "pmb:kconfigcheck" in opt:
-                options += [opt]
-
-        if len(options):
-            options.sort()
-            print(f'options="{" ".join(options)}"')
-
-        if "!pmb:kconfigcheck" in apkbuild["options"]:
-            print("skipped (!pmb:kconfigcheck)")
-            continue
-
-        if not pmb.parse.kconfig.check(args, pkgname, details=True):
-            last_failed = pkgname
-
-    return last_failed
-
-
-def show_error(last_failed):
-    print("")
-    print("Please adjust your kernel config. This is required for getting your"
-          " patch merged.")
-    print("")
-    print("Edit your kernel config:")
-    print(f"  pmbootstrap kconfig edit {last_failed}")
-    print("")
-    print("Test this kernel config again:")
-    print(f"  pmbootstrap kconfig check {last_failed}")
-    print("")
-    print("Run this check again (on all kernels you modified):")
-    print("  pmbootstrap ci kconfig")
-    print("")
-
-
-if __name__ == "__main__":
-    common.add_upstream_git_remote()
-    pkgnames = common.get_changed_kernels()
-    print(f"Changed kernels: {pkgnames}")
-
-    if len(pkgnames) == 0:
-        print("No kernels changed in this branch")
-        exit(0)
-
-    # Initialize args (so we can use pmbootstrap's kconfig parsing)
-    sys.argv = ["pmbootstrap", "kconfig", "check"]
-    args = pmb.parse.arguments()
-    pmb.helpers.logging.init(args)
-
-    print("Running kconfig check on changed kernels...")
-    last_failed = check_kconfig(args, pkgnames)
-
-    if last_failed:
-        show_error(last_failed)
-        exit(1)
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2023 Oliver Smith
+# Copyright 2022 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

 import argparse
@@ -190,11 +190,3 @@ def get_changed_packages():
        ret.add(os.path.basename(dirname))

    return ret
-
-
-def get_changed_kernels():
-    ret = []
-    for pkgname in get_changed_packages():
-        if pkgname.startswith("linux-"):
-            ret += [pkgname]
-    return ret
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2023 Oliver Smith
+# Copyright 2022 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

 if ! mount | grep -q /proc/sys/fs/binfmt_misc; then
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 if [ -z "$1" ]; then
-	echo "usage: $(basename "$0") \$CI_PROJECT_DIR"
+	echo "usage: $(basename $0) \$CI_PROJECT_DIR"
 	exit 1
 fi

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2023 Oliver Smith
+# Copyright 2022 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Description: lint with various python tests
 # Options: native
@@ -20,7 +20,7 @@ if [ -z "$(command -v pytest)" ]; then
 fi

 # Wrap pmbootstrap to use this repository for --aports
-pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
+pmaports="$(cd $(dirname $0)/..; pwd -P)"
 _pmbootstrap="$(command -v pmbootstrap)"
 pmbootstrap() {
 	"$_pmbootstrap" --aports="$pmaports" "$@"
@@ -34,7 +34,6 @@ pmbootstrap -q shutdown
 # Make sure we have a valid device (pmbootstrap#1128)
 device="$(pmbootstrap config device)"
 deviceinfo="$pmaports/device/*/device-$device/deviceinfo"
-# shellcheck disable=SC2086
 if ! [ -e $deviceinfo ]; then
 	echo "ERROR: Could not find deviceinfo file for selected device '$device'."
 	echo "Expected path: $deviceinfo"
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2023 Oliver Smith
+# Copyright 2022 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Description: lint all shell scripts
 # https://postmarketos.org/pmb-ci
@@ -18,8 +18,8 @@ sh_files="
 	./main/osk-sdl/unlock.sh
 	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
 	./main/postmarketos-installkernel/installkernel-pmos
-	./main/postmarketos-initramfs/init.sh
-	./main/postmarketos-initramfs/init_functions.sh
+	./main/postmarketos-mkinitfs/init.sh
+	./main/postmarketos-mkinitfs/init_functions.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/postmarketos-update-kernel/update-kernel.sh
@@ -40,7 +40,7 @@ sh_files="
 	$(find . -path './main/devicepkg-dev/*.sh')
 	$(find . -path './main/postmarketos-mvcfg/*.sh')

-	$(find . -path './.ci/**.sh')
+	$(find . -path '.ci/*.sh')
 "

 for file in $sh_files; do
@@ -15,10 +15,8 @@ def path_pmbootstrap():
        code from there.
        returns: pmbootstrap installation folder
    """
-    # This variable is set by pmbootstrap 1.52 and later
-    # If it's undefined, try to find 'pmbootstrap' in path
-    bin = os.environ.get("PMBOOTSTRAP_CMD") or shutil.which("pmbootstrap")
-
+    # Find 'pmbootstrap' executable
+    bin = shutil.which("pmbootstrap")
    if not bin:
        print("ERROR: 'pmbootstrap' not found in $PATH")
        sys.exit(1)
@@ -38,11 +38,7 @@ def test_aports_device(args):
        apkbuild = pmb.parse.apkbuild(path)

        # Depends: Require "postmarketos-base"
-        depend_flag = False
-        for dependency in apkbuild["depends"]:
-            if "postmarketos-base" == dependency or "postmarketos-base>" in dependency:
-                depend_flag = True
-        if not depend_flag:
+        if "postmarketos-base" not in apkbuild["depends"]:
            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
                               path)

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2023 Oliver Smith
+# Copyright 2022 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import glob
 import logging
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2023 Oliver Smith
+# Copyright 2022 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Various checks on source= in the APKBUILDs

@@ -1,3 +1,4 @@
 {
+  "Version": "2.6.0",
  "SpacesAftertabs": true
 }
@@ -1,46 +0,0 @@
-<!--
-	Thank you for using postmarketOS! In order to speed up process of resolving your issue,
-	we would like you to fill in the following :
-->
-### Describe your issue
-#### What's the expected behaviour?
-
-#### What's the current behaviour?
-
-#### How to reproduce your issue?
-
-### What device are you using?
-<!--
-	Leave name of your device in vendor-codename format.
-	If unsure, check name in the device package or leave full name of device
-	PinePhone: which revision exactly? See https://wiki.pine64.org/index.php/PinePhone#Hardware_revisions
-->
-
-### On what postmarketOS version did you encounter the issue?
-<!--
-	Replace space inside `[ ]` with `x` to fill the checkbox
-->
-* [ ] edge (`master` branch)
-* [ ] `v22.12`
-
-* [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
-
-### On what environment did you encounter the issue?
-#### Environments
-* [ ] Phosh
-* [ ] Plasma Mobile
-* [ ] Sxmo (Wayland/Sway) **Please post the output of `sxmo_version.sh`**
-* [ ] Other: **Please fill out**
-### How did you get postmarketOS image?
-* [ ] from https://images.postmarketos.org
-* [ ] I built it using pmbootstrap
-* [ ] It was preinstalled on my device
-### What's the build date of the image? (in yyyy-mm-dd format)
-<!--
-	Notes:
-		can be left empty if unsure
-		If you downloaded image from images.postmarketos.org, date will be in yyyymmdd format
-->
-
-### Additional information
-<!-- logs, etc. -- make use <details> for long listings -->
@@ -1,7 +1,12 @@
 {
    "subject_format": {
        "pass": [
-            "^(([a-z]+\\/[a-z\\-0-9*{}]+),?)+: [A-Za-z\\/\\-0-9*{}\\(\\)\\.,_&:=' ]+( \\(MR \\d+\\)|)$",
+            "^[a-z]+/[a-z-0-9*{}]+: new aport(s|)( \\(MR \\d+\\)|)$",
+            "^[a-z]+/[a-z-0-9*{}]+: pkgrel bump( \\(MR \\d+\\)|)$",
+            "^[a-z-0-9*{}]+: new device \\([^\\)]+\\)( \\(MR \\d+\\)|)",
+            "^[a-z]+/[a-z-0-9*{}]+: upgrade to [0-9\\.a-z\\-_]+( \\(MR \\d+\\)|)$",
+            "^[a-z]+/[a-z-0-9*{}]+: remove( \\(MR \\d+\\)|)$",
+            "^[a-z]+/[a-z-0-9*{}]+: remove, upstreamed( \\(MR \\d+\\)|)$",
            "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
            "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
            "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
@@ -79,8 +79,5 @@ main/ttyescape					@calebccff
 temp/u-boot-librem5/				@craftyguy @bshah
 temp/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
 temp/alsa-ucm-conf-google-gru/			@jenneron
-device/*/*-videostrong-kii-pro/                 @vitali64yt
-device/*/*-amlogic-s905*                        @vitali64yt
-device/*/linux-postmarketos-amlogic/            @vitali64yt @exkc

 # vim: ts=8 sw=4 et
@@ -1,89 +0,0 @@
-# Policy for commits in pmaports
-
-This document defines policy for organising and titling commits for
-inclusion in pmaports.
-
-## Definitions
-
-### Device-specific package
-
-A device-specific package is used to apply configuration and
-functionality specifically for device support in postmarketOS.
-This is in contrast to other packages
-(e.g. main/postmarketos-ui-phosh) in postmarketOS that are used
-for configuring the distribution without consideration of the
-target device.
-
-## General policy
-
-We follow Alpine's aports commit style with some minor exceptions
-and additions. Alpine's commit style can be found here:
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/COMMITSTYLE.md
-
-## Exceptions
-
-### Changes to packages inside of the device directory
-
-While Alpine has the policy of always prefixing package names with
-the name of the repository they are in, in the case of pmaports
-this can lead to excessively long commit titles due to the nested
-subfolders of the device directory. As such, commits changing
-packages inside of the device directory should omit the directory
-prefix, for example:
-
-	device-pine64-pinephone: description of change
-
-Or:
-
-	soc-qcom-msm8996: description of change
-
-If the commit only makes device-specific changes, the
-commit title can opt to use the following format:
-
-	manufacturer-codename: description of change
-
-### Moving devices between categories
-
-As we do not include directory prefixes in device-related commits,
-Alpine's commit style for moving packages does not apply. Instead,
-we do the following:
-
-	manufacturer-codename: move from category to category
-
-For example:
-
-	samsung-m0: move from testing to community
-
-## Additions
-
-### Forking packages from Alpine
-
-Run `pmbootstrap aportgen --fork-alpine package` and modify it.
-
-#### Template
-
- - temp/package-name: fork from Alpine
-
-Example: temp/pulseaudio: fork from Alpine
-
-#### Rules
-
-One commit per forked package.
-
-### Adding new devices
-
-Adding a new device package and optionally also a device-specific
-Linux and firmware package.
-
-#### Template
-
- - manufacturer-codename: new device
-
-Example: htc-m8qlul: new device
-
-#### Rules
-
-If the device has the option of making use of a device-specific
-kernel and/or firmware package, those packages should be included
-in the same commit that adds the device package. One device per
-commit.
@@ -15,7 +15,7 @@ branch_aports=3.17-stable
 mirrordir_alpine=v3.17

 [v22.06]
-description=Old release (unsupported)
+description=Old release (supported until 2023-01-18)
 branch_pmaports=v22.06
 branch_aports=3.16-stable
 mirrordir_alpine=v3.16
@@ -7,19 +7,23 @@ CTARGET_ARCH=aarch64
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"

 pkgname=binutils-aarch64
-pkgver=2.40
+pkgver=2.39
 pkgrel=3
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev zstd-dev"
+makedepends_host="zlib-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
+	gold-mips.patch
+	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	binutils-mips-disable-assert.patch
+	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"

@@ -86,6 +90,11 @@ build() {
 		_gold_configure="--disable-gold"
 	fi

+	case "$CTARGET_ARCH" in
+	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
+	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
+	esac
+
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -106,7 +115,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		--enable-default-hash-style=gnu \
+		$_hash_style_configure \
 		$no_textrels \
 		--with-pic \
 		--disable-werror \
@@ -131,17 +140,30 @@ package() {
 	fi
 }

+libs() {
+	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
+
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
+}
+
 gold() {
 	pkgdesc="GNU binutils - gold linker"

 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		amove usr/bin/ld.gold
+		mkdir -p "$subpkgdir"/usr/bin
+		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
 	fi
-	amove usr/$CTARGET/bin/ld.gold
+	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
+	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
 }

 sha512sums="
-a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
+68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
+314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "
@@ -0,0 +1,22 @@
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
+
+diff --git a/bfd/coffcode.h b/bfd/coffcode.h
+index 67aaf158ca1..52027981c3f 100644
+--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
+@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
+ 
+ 	rec = (bfd_byte *) location;
+ 	recend = rec + count;
+-	while (rec < recend)
+	while (recend - rec >= 4)
+ 	  {
+	    size_t len = bfd_get_32 (abfd, rec);
+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
+	      break;
+	    rec += len * 4;
+ 	    ++section->lma;
+-	    rec += bfd_get_32 (abfd, rec) * 4;
+ 	  }
+ 
+ 	BFD_ASSERT (rec == recend);
@@ -0,0 +1,14 @@
+diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
+--- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
+@@ -6744,8 +6744,10 @@
+      in the relocation.  */
+   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
+     {
+#if 0
+       BFD_ASSERT (htab->root.target_os == is_vxworks
+ 		  || h->global_got_area != GGA_NONE);
+#endif
+       indx = h->root.dynindx;
+       if (SGI_COMPAT (output_bfd))
+ 	defined_p = h->root.def_regular;
@@ -0,0 +1,39 @@
+# DP: Fix gold on mips64 targets.
+
+gold/
+
+2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
+
+ 
+--- a/gold/configure.tgt
+++ b/gold/configure.tgt
+@@ -153,6 +153,13 @@ aarch64*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
+mips*64*el*-*-*|mips*64*le*-*-*)
+ targ_obj=mips
+ targ_machine=EM_MIPS_RS3_LE
+ targ_size=64
+ targ_big_endian=false
+ targ_extra_big_endian=true
+ ;;
+ mips*el*-*-*|mips*le*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS_RS3_LE
+@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
+mips*64*-*-*)
+ targ_obj=mips
+ targ_machine=EM_MIPS
+ targ_size=64
+ targ_big_endian=true
+ targ_extra_big_endian=false
+ ;;
+ mips*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS
@@ -0,0 +1,19 @@
+--- ./ld/configure.tgt.orig
+++ ./ld/configure.tgt
+@@ -541,12 +541,12 @@
+ 			;;
+ mips*-*-windiss)	targ_emul=elf32mipswindiss
+ 			;;
+-mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
+-			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+-mips64*-*-linux-*)	targ_emul=elf32btsmipn32
+-			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
+mips64*-*-linux-*)	targ_emul=elf64btsmip
+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+ mips*el-*-linux-*)	targ_emul=elf32ltsmip
@@ -7,19 +7,23 @@ CTARGET_ARCH=armhf
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"

 pkgname=binutils-armhf
-pkgver=2.40
+pkgver=2.39
 pkgrel=3
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev zstd-dev"
+makedepends_host="zlib-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
+	gold-mips.patch
+	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	binutils-mips-disable-assert.patch
+	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"

@@ -86,6 +90,11 @@ build() {
 		_gold_configure="--disable-gold"
 	fi

+	case "$CTARGET_ARCH" in
+	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
+	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
+	esac
+
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -106,7 +115,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		--enable-default-hash-style=gnu \
+		$_hash_style_configure \
 		$no_textrels \
 		--with-pic \
 		--disable-werror \
@@ -131,17 +140,30 @@ package() {
 	fi
 }

+libs() {
+	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
+
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
+}
+
 gold() {
 	pkgdesc="GNU binutils - gold linker"

 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		amove usr/bin/ld.gold
+		mkdir -p "$subpkgdir"/usr/bin
+		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
 	fi
-	amove usr/$CTARGET/bin/ld.gold
+	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
+	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
 }

 sha512sums="
-a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
+68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
+314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "
@@ -0,0 +1,22 @@
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
+
+diff --git a/bfd/coffcode.h b/bfd/coffcode.h
+index 67aaf158ca1..52027981c3f 100644
+--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
+@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
+ 
+ 	rec = (bfd_byte *) location;
+ 	recend = rec + count;
+-	while (rec < recend)
+	while (recend - rec >= 4)
+ 	  {
+	    size_t len = bfd_get_32 (abfd, rec);
+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
+	      break;
+	    rec += len * 4;
+ 	    ++section->lma;
+-	    rec += bfd_get_32 (abfd, rec) * 4;
+ 	  }
+ 
+ 	BFD_ASSERT (rec == recend);
@@ -0,0 +1,14 @@
+diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
+--- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
+@@ -6744,8 +6744,10 @@
+      in the relocation.  */
+   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
+     {
+#if 0
+       BFD_ASSERT (htab->root.target_os == is_vxworks
+ 		  || h->global_got_area != GGA_NONE);
+#endif
+       indx = h->root.dynindx;
+       if (SGI_COMPAT (output_bfd))
+ 	defined_p = h->root.def_regular;
@@ -0,0 +1,39 @@
+# DP: Fix gold on mips64 targets.
+
+gold/
+
+2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
+
+ 
+--- a/gold/configure.tgt
+++ b/gold/configure.tgt
+@@ -153,6 +153,13 @@ aarch64*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
+mips*64*el*-*-*|mips*64*le*-*-*)
+ targ_obj=mips
+ targ_machine=EM_MIPS_RS3_LE
+ targ_size=64
+ targ_big_endian=false
+ targ_extra_big_endian=true
+ ;;
+ mips*el*-*-*|mips*le*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS_RS3_LE
+@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
+mips*64*-*-*)
+ targ_obj=mips
+ targ_machine=EM_MIPS
+ targ_size=64
+ targ_big_endian=true
+ targ_extra_big_endian=false
+ ;;
+ mips*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS
@@ -0,0 +1,19 @@
+--- ./ld/configure.tgt.orig
+++ ./ld/configure.tgt
+@@ -541,12 +541,12 @@
+ 			;;
+ mips*-*-windiss)	targ_emul=elf32mipswindiss
+ 			;;
+-mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
+-			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+-mips64*-*-linux-*)	targ_emul=elf32btsmipn32
+-			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
+mips64*-*-linux-*)	targ_emul=elf64btsmip
+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+ mips*el-*-linux-*)	targ_emul=elf32ltsmip
@@ -7,19 +7,23 @@ CTARGET_ARCH=armv7
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"

 pkgname=binutils-armv7
-pkgver=2.40
+pkgver=2.39
 pkgrel=3
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev zstd-dev"
+makedepends_host="zlib-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
+	gold-mips.patch
+	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	binutils-mips-disable-assert.patch
+	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"

@@ -86,6 +90,11 @@ build() {
 		_gold_configure="--disable-gold"
 	fi

+	case "$CTARGET_ARCH" in
+	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
+	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
+	esac
+
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -106,7 +115,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		--enable-default-hash-style=gnu \
+		$_hash_style_configure \
 		$no_textrels \
 		--with-pic \
 		--disable-werror \
@@ -131,17 +140,30 @@ package() {
 	fi
 }

+libs() {
+	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
+
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
+}
+
 gold() {
 	pkgdesc="GNU binutils - gold linker"

 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		amove usr/bin/ld.gold
+		mkdir -p "$subpkgdir"/usr/bin
+		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
 	fi
-	amove usr/$CTARGET/bin/ld.gold
+	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
+	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
 }

 sha512sums="
-a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
+68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
+314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "
@@ -0,0 +1,22 @@
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
+
+diff --git a/bfd/coffcode.h b/bfd/coffcode.h
+index 67aaf158ca1..52027981c3f 100644
+--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
+@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
+ 
+ 	rec = (bfd_byte *) location;
+ 	recend = rec + count;
+-	while (rec < recend)
+	while (recend - rec >= 4)
+ 	  {
+	    size_t len = bfd_get_32 (abfd, rec);
+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
+	      break;
+	    rec += len * 4;
+ 	    ++section->lma;
+-	    rec += bfd_get_32 (abfd, rec) * 4;
+ 	  }
+ 
+ 	BFD_ASSERT (rec == recend);
@@ -0,0 +1,14 @@
+diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
+--- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
+@@ -6744,8 +6744,10 @@
+      in the relocation.  */
+   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
+     {
+#if 0
+       BFD_ASSERT (htab->root.target_os == is_vxworks
+ 		  || h->global_got_area != GGA_NONE);
+#endif
+       indx = h->root.dynindx;
+       if (SGI_COMPAT (output_bfd))
+ 	defined_p = h->root.def_regular;
@@ -0,0 +1,39 @@
+# DP: Fix gold on mips64 targets.
+
+gold/
+
+2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
+
+ 
+--- a/gold/configure.tgt
+++ b/gold/configure.tgt
+@@ -153,6 +153,13 @@ aarch64*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
+mips*64*el*-*-*|mips*64*le*-*-*)
+ targ_obj=mips
+ targ_machine=EM_MIPS_RS3_LE
+ targ_size=64
+ targ_big_endian=false
+ targ_extra_big_endian=true
+ ;;
+ mips*el*-*-*|mips*le*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS_RS3_LE
+@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
+mips*64*-*-*)
+ targ_obj=mips
+ targ_machine=EM_MIPS
+ targ_size=64
+ targ_big_endian=true
+ targ_extra_big_endian=false
+ ;;
+ mips*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS
@@ -0,0 +1,19 @@
+--- ./ld/configure.tgt.orig
+++ ./ld/configure.tgt
+@@ -541,12 +541,12 @@
+ 			;;
+ mips*-*-windiss)	targ_emul=elf32mipswindiss
+ 			;;
+-mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
+-			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+-mips64*-*-linux-*)	targ_emul=elf32btsmipn32
+-			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
+mips64*-*-linux-*)	targ_emul=elf64btsmip
+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+ mips*el-*-linux-*)	targ_emul=elf32ltsmip
@@ -7,19 +7,23 @@ CTARGET_ARCH=riscv64
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"

 pkgname=binutils-riscv64
-pkgver=2.40
+pkgver=2.39
 pkgrel=3
 pkgdesc="Tools necessary to build programs for riscv64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev zstd-dev"
+makedepends_host="zlib-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
+	gold-mips.patch
+	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	binutils-mips-disable-assert.patch
+	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"

@@ -86,6 +90,11 @@ build() {
 		_gold_configure="--disable-gold"
 	fi

+	case "$CTARGET_ARCH" in
+	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
+	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
+	esac
+
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -106,7 +115,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		--enable-default-hash-style=gnu \
+		$_hash_style_configure \
 		$no_textrels \
 		--with-pic \
 		--disable-werror \
@@ -131,17 +140,30 @@ package() {
 	fi
 }

+libs() {
+	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
+
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
+}
+
 gold() {
 	pkgdesc="GNU binutils - gold linker"

 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		amove usr/bin/ld.gold
+		mkdir -p "$subpkgdir"/usr/bin
+		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
 	fi
-	amove usr/$CTARGET/bin/ld.gold
+	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
+	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
 }

 sha512sums="
-a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
+68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
+314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "
@@ -0,0 +1,22 @@
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
+
+diff --git a/bfd/coffcode.h b/bfd/coffcode.h
+index 67aaf158ca1..52027981c3f 100644
+--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
+@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
+ 
+ 	rec = (bfd_byte *) location;
+ 	recend = rec + count;
+-	while (rec < recend)
+	while (recend - rec >= 4)
+ 	  {
+	    size_t len = bfd_get_32 (abfd, rec);
+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
+	      break;
+	    rec += len * 4;
+ 	    ++section->lma;
+-	    rec += bfd_get_32 (abfd, rec) * 4;
+ 	  }
+ 
+ 	BFD_ASSERT (rec == recend);
@@ -0,0 +1,14 @@
+diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
+--- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
+@@ -6744,8 +6744,10 @@
+      in the relocation.  */
+   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
+     {
+#if 0
+       BFD_ASSERT (htab->root.target_os == is_vxworks
+ 		  || h->global_got_area != GGA_NONE);
+#endif
+       indx = h->root.dynindx;
+       if (SGI_COMPAT (output_bfd))
+ 	defined_p = h->root.def_regular;
@@ -0,0 +1,39 @@
+# DP: Fix gold on mips64 targets.
+
+gold/
+
+2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
+
+ 
+--- a/gold/configure.tgt
+++ b/gold/configure.tgt
+@@ -153,6 +153,13 @@ aarch64*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
+mips*64*el*-*-*|mips*64*le*-*-*)
+ targ_obj=mips
+ targ_machine=EM_MIPS_RS3_LE
+ targ_size=64
+ targ_big_endian=false
+ targ_extra_big_endian=true
+ ;;
+ mips*el*-*-*|mips*le*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS_RS3_LE
+@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
+mips*64*-*-*)
+ targ_obj=mips
+ targ_machine=EM_MIPS
+ targ_size=64
+ targ_big_endian=true
+ targ_extra_big_endian=false
+ ;;
+ mips*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS
@@ -0,0 +1,19 @@
+--- ./ld/configure.tgt.orig
+++ ./ld/configure.tgt
+@@ -541,12 +541,12 @@
+ 			;;
+ mips*-*-windiss)	targ_emul=elf32mipswindiss
+ 			;;
+-mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
+-			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+-mips64*-*-linux-*)	targ_emul=elf32btsmipn32
+-			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
+mips64*-*-linux-*)	targ_emul=elf64btsmip
+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+ mips*el-*-linux-*)	targ_emul=elf32ltsmip
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-aarch64
-pkgver=1.36.0
-pkgrel=6
+pkgver=1.35.0
+pkgrel=30

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

 sha512sums="
-85af89c440bdb347190466d8521ce59b28dd713bfb7a4adf750e51c9f8099348c6c417eeb744b402ee84314ea6e8e9718ee40bc64ef051ef6f57af126c7a4e74  busybox-static-1.36.0-r6-aarch64-edge.apk
+d34c0d16d77bd18548e4b2764ab4bde59611480aaaab5a47f585158a91fad413ccfb7954d5ebcf4aa6e04fdda4621832f46e8b13e313ce1fd7b4b96b3298d425  busybox-static-1.35.0-r30-aarch64-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-armhf
-pkgver=1.36.0
-pkgrel=6
+pkgver=1.35.0
+pkgrel=30

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

 sha512sums="
-146709b156c917e61051f6aa61f9208b39b6bd5922e2a92370251d9a8fbfc4240647f550cd13483d0bbd3b844841049cb87b72febf126742fd04c8235293ab3a  busybox-static-1.36.0-r6-armhf-edge.apk
+805bcf5416d70db8a68a90e85dbf9728213f4e996862ce9d4af3eea35ac25bc1bf6ecddb7dc18d2881dfda59ecfbc64bfbaf148022209f26eb034a10e65494aa  busybox-static-1.35.0-r30-armhf-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-armv7
-pkgver=1.36.0
-pkgrel=6
+pkgver=1.35.0
+pkgrel=30

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

 sha512sums="
-e3ee6e88fe6d38762650fa3c81e1fd3abb43c537beccd828e49c73b29b4760f9f244ec74fe35038899b66ee9e8cbfcbad5da6bfda453f0a6ff57e5eedcbf056a  busybox-static-1.36.0-r6-armv7-edge.apk
+1beffa9f0b7a93d72b793c3ebac99a6243ca1a385064388fe6189753210775ff65bd4be30a540b5e0fa85ea795b7e3ad42cf4f9446c52ca1db285eea59a84c1a  busybox-static-1.35.0-r30-armv7-edge.apk
 "
@@ -32,11 +32,11 @@ pkgver=${_pkgbase}_git$_pkgsnap
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=9
+pkgrel=8
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+license="GPL-2.0-or-later LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-aarch64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
@@ -32,11 +32,11 @@ pkgver=${_pkgbase}_git$_pkgsnap
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=9
+pkgrel=8
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+license="GPL-2.0-or-later LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-armhf mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
@@ -32,11 +32,11 @@ pkgver=${_pkgbase}_git$_pkgsnap
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=9
+pkgrel=8
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+license="GPL-2.0-or-later LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-armv7 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
@@ -32,11 +32,11 @@ pkgver=${_pkgbase}_git$_pkgsnap
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-riscv64
-pkgrel=9
+pkgrel=8
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+license="GPL-2.0-or-later LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-riscv64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
@@ -3,7 +3,7 @@

 pkgname=grub-efi-x86
 pkgver=2.06
-pkgrel=10
+pkgrel=7

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

 sha512sums="
-df1b1755f7120d02192ae3f6ebada76c71e6814b9f9eacade2e27290bd23e01ff6afcfc0b45dd2b4638286f86eedbcc357f1a9b9b1b51f8f45e4dd4a9335156d  grub-efi-2.06-r10-x86-edge.apk
+f748735b1b15d7424640a22c00b2c0ea23f392521ae0839f6a582bb1a67410da46bf51274991eb88d7a36a5f7036b7ed89b965cccf0dab293a692dd0d73c467c  grub-efi-2.06-r7-x86-edge.apk
 "
@@ -1,17 +0,0 @@
-Fixes "ld: read-only segment has dynamic relocations" error caused by "main/binutils: add -z text by default":
-https://gitlab.alpinelinux.org/alpine/aports/-/commit/a737d101cad8c0acf782d9a0ec38cf8d3432b6ff
-https://gitlab.alpinelinux.org/alpine/aports/-/commit/098309ba27bbb71f3723aa2e6e180776e0396b86
-
-diff --git a/Makefile b/Makefile
-index 4ee2a6394ec3..3fbced2573d1 100644
--- a/Makefile
-+++ b/Makefile
-@@ -969,6 +969,8 @@ ifeq ($(CONFIG_STRIP_ASM_SYMS),y)
- LDFLAGS_vmlinux	+= $(call ld-option, -X,)
- endif
- 
-+LDFLAGS_vmlinux += -z notext
-+
- ifneq ($(SEC_BUILD_CONF_USE_FINGERPRINT_TZ), false)
-   ifeq ($(CONFIG_SENSORS_FINGERPRINT), y)
-     ifneq ($(CONFIG_SEC_FACTORY), y)
@@ -1,11 +0,0 @@
--- a/Makefile
-+++ b/Makefile
-@@ -970,6 +970,8 @@
- # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards.
- LDFLAGS_u-boot += $(call ld-option, --no-dynamic-linker)
- 
-+LDFLAGS_u-boot += -z notext $(call ld-option, --apply-dynamic-relocs)
-+
- ifeq ($(CONFIG_ARC)$(CONFIG_NIOS2)$(CONFIG_X86)$(CONFIG_XTENSA),)
- LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE)
- endif
@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@z3ntu.xyz>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=1.0
+pkgver=0.9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -71,7 +71,7 @@ phosh() {

 sha512sums="
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
-7a54c90ebe68b2fe1c59ef3b94bfdac0e0e7833eb881d8dcff86d61dc0d45a606d498aa10cefcc68a82bdbc4130091e036867fdb429ed314b9b46100c55a21d7  deviceinfo
+584d14a61b9d3ee436725a5b4fd9e7e1fde8764bb7e1872e4a20115ad767e1d87ab2c2023d5f941217579ef915b6a6011f6ae61487102f690bd532368a090c8a  deviceinfo
 25a93dcbe6dbc6cff24f57cbf5539bc475c5fe0f6bf5e8374c7032b9c38a939bef0aa0cde1707afcc16b1ec2d0859c03c6ee92d80d8048d1c6adc6e25178b85f  gtk.css
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "
@@ -24,7 +24,7 @@ deviceinfo_getty="ttyMSM0;115200"

 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT sdhci.debug_quirks=0x40"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"
@@ -1,9 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Minecrell <minecrell@minecrell.net>
+# Maintainer: Ruby Iris Juric <ruby@srxl.me>
+# Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
 pkgver=7
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -2,13 +2,13 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=9.0
+pkgver=8.4
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-postmarketos-omap u-boot-tools kbd kbd-bkeymaps ofono alsa-utils"
+depends="postmarketos-base linux-nokia-n900 u-boot-tools kbd kbd-bkeymaps ofono alsa-utils"
 makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
 install="$pkgname.pre-upgrade $pkgname.post-install"
 subpackages="
@@ -75,7 +75,7 @@ package() {
 	install -D -m644 "$srcdir"/boot.scr \
 		"$pkgdir"/boot/boot.scr
 	install -D -m644 "$srcdir"/backlight-enable.sh \
-		"$pkgdir"/usr/share/mkinitfs/hooks/00-$pkgname-backlight.sh
+		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-$pkgname-backlight.sh
 	install -D -m644 "$srcdir"/pointercal \
 		"$pkgdir"/etc/pointercal
 	install -D -m644 "$srcdir"/asound.state.speakers \
@@ -83,9 +83,9 @@ package() {
 	install -D -m644 "$srcdir"/asound.state.headset \
 		"$pkgdir"/var/lib/alsa/asound.state.headset
 	install -Dm644 "$srcdir"/10-initfs-keymap.files \
-		"$pkgdir"/usr/share/mkinitfs/files/10-initfs-keymap.files
+		"$pkgdir"/etc/postmarketos-mkinitfs/files/10-initfs-keymap.files
 	install -Dm644 "$srcdir"/10-initfs-keymap.sh \
-		"$pkgdir"/usr/share/mkinitfs/hooks/10-initfs-keymap.sh
+		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/10-initfs-keymap.sh
 	install -Dm755 "$srcdir"/$pkgname.start \
 		"$pkgdir"/etc/local.d/$pkgname.start

@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=11
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ depends="
 	alsa-ucm-conf>=1.2.7
 	linux-postmarketos-rockchip>=5.14
 	nvme-cli
-	postmarketos-base>=25-r1
+	postmarketos-base
 	u-boot-pinebookpro
 	iw
 	"
@@ -2,7 +2,7 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
-pkgver=3.7
+pkgver=3.6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -13,7 +13,7 @@ depends="
 	alsa-ucm-conf>=1.2.6.2
 	eg25-manager>=0.4.2
 	linux-pine64-pinephonepro
-	postmarketos-base>=25-r1
+	postmarketos-base
 	fwupd>=1.8.6
 	"
 makedepends="
@@ -121,7 +121,7 @@ gnome() {
 sha512sums="
 2d68ffe143f633a86670f30e45dbad1cc313f219f22b7cd3319ab44bb7209c20cb29f2ff2c60c92390154af9c9a6815c4186be555364cf31552005eba024c0e7  51_keyboard.gschema.override
 98e9dcfb36dd5843ff441b148e3bffb70757c59601c5f01f55a584e8f017c7ca73f2275c1bff46e4236dd8174df36a43d10abf9b8dadee988b962036846dc6ed  90-modem-eg25.rules
-a2fec232778b5ba493c7a8b85b2121cdd19778cce0dac25f51ac3d2f1b48fb55b602ae62ae7d6a1a39af9310e4c05f04faf82c2b3f24698a0bee8cf303a115bb  deviceinfo
+969e0b786e1697f1071e443e1bc5c08253b78c0ecdb410cfc70eeb4216ac464c18d02f543bd5d707fc8bb4ecbff52a6b4be18a94c26e6522b12ec0a38cb0eaaf  deviceinfo
 c5006c38828eb519917d57756f7831c4552feffef2d4922a384073f6a551535f615ad397d784e313818e0b943e1f6212bcca0aff9ce37da60b29547b1631f24b  modemmanager.conf
 43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh
 420ee1d7522d4d56c2909580fd6ba7580483ca5455b13eb6d22e700063ce0c1a5c6d2f5b161dfce0d777636fe9a712aa82f38a0585f2feabea3785b02bae7515  setup-modem.sh
@@ -20,7 +20,7 @@ deviceinfo_screen_height="1440"
 deviceinfo_getty="ttyS2;115200"

 # Installer related
-deviceinfo_dev_internal_storage="/dev/mmcblk2"
+deviceinfo_dev_internal_storage="/dev/mmcblk0"
 deviceinfo_dev_internal_storage_repartition="true"

 # Bootloader related
@@ -1,17 +1,20 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Jean Lucas <jean@4ray.co>
+# Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=device-pine64-rockpro64
-pkgver=3
+pkgver=2
 pkgrel=2
 pkgdesc="PINE64 ROCKPro64"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base>=25-r1 linux-postmarketos-rockchip u-boot-rockchip"
+depends="postmarketos-base linux-postmarketos-rockchip u-boot-rockpro64"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo"
+source="deviceinfo
+	extlinux.conf
+	"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -19,6 +22,8 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
+	install -D -m644 "$srcdir"/extlinux.conf \
+		"$pkgdir"/boot/extlinux/extlinux.conf
 }

 nonfree_firmware() {
@@ -28,5 +33,6 @@ nonfree_firmware() {
 }

 sha512sums="
-eda78fea2ccd53b2edb3895919ecaa6831c815509d2324bca8e23a6c901100215f4df5b63aa1a8e0a47a879af258c86cd84f661042088b67b5de566a49afc4a8  deviceinfo
+7457107f8fcf27962474d2625c582eb9e7889d0306e3bee79b98037a0ac81a9a72b61acbfeb865eec4cd8f927c30597234889bd1eac1781b4be9766ed5cb124b  deviceinfo
+ad3a7a7d62af0d1be8a9e3fa93d155b96002a666f475be568902311f76ad2ef306570e49fc2734ef24bd9fc0be849747aa3824917405fa1ab8d22c2ff869d3e3  extlinux.conf
 "
@@ -6,7 +6,6 @@ deviceinfo_name="PINE64 RockPro64"
 deviceinfo_manufacturer="PINE64"
 deviceinfo_codename="pine64-rockpro64"
 deviceinfo_year="2017"
-deviceinfo_dtb="rockchip/rk3399-rockpro64"
 deviceinfo_arch="aarch64"

 # Device related
@@ -19,7 +18,5 @@ deviceinfo_screen_height="1080"

 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_sd_embed_firmware="u-boot/rockpro64-rk3399/idbloader.img:32,u-boot/rockpro64-rk3399/u-boot.itb:8192"
+deviceinfo_sd_embed_firmware="u-boot/pine64-rockpro64/u-boot-rockchip.bin:32"
 deviceinfo_boot_part_start="32768"
-deviceinfo_kernel_cmdline="console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5 PMOS_NO_OUTPUT_REDIRECT"
-deviceinfo_generate_extlinux_config="true"
@@ -0,0 +1,9 @@
+timeout 10
+default POSTMARKETOS
+menu title boot prev kernel
+
+label POSTMARKETOS
+  kernel /vmlinuz
+  fdt /dtbs-postmarketos-rockchip/rockchip/rk3399-rockpro64.dtb
+  initrd /initramfs
+  append console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5 PMOS_NO_OUTPUT_REDIRECT
@@ -1,4 +1,4 @@
-/lib/firmware/qcom/a530_pfp.fw
-/lib/firmware/qcom/a530_pm4.fw
-/lib/firmware/qcom/a530v3_gpmu.fw2
-/lib/firmware/qcom/msm8996/scorpio/a530_zap.mbn
+./lib/firmware/qcom/a530_pfp.fw
+./lib/firmware/qcom/a530_pm4.fw
+./lib/firmware/qcom/a530v3_gpmu.fw2
+./lib/firmware/qcom/msm8996/scorpio/a530_zap.mbn
@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=7
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,11 +19,7 @@ depends="
 	soc-qcom-msm8996-ucm
 	"
 makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-camera
-	$pkgname-phosh
-	$pkgname-nonfree-firmware:nonfree_firmware
-	"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"

 source="
 	30-gpu-firmware.files
@@ -59,7 +55,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"

 	install -Dm644 "$srcdir/30-gpu-firmware.files" -t \
-		"$subpkgdir/usr/share/mkinitfs/files"
+		"$subpkgdir/etc/postmarketos-mkinitfs/files"
 }

 phosh() {
@@ -68,14 +64,9 @@ phosh() {
 		"$subpkgdir"/etc/phosh/phoc.ini
 }

-camera() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
-	depends="megapixels"
-	mkdir -p "$subpkgdir"
-}

 sha512sums="
-b033e7357c4ef91ba84f6f715e96e67637c2631d4746402f8a92333ba8974bbee7736a7bc081b0f84a84dc5b555a7db4dbb4f14f628bbfc42cbfa501c4f0ed36  30-gpu-firmware.files
+a1ca623314e80045ea8d64be06d12ffc091a5585ca40f9713039883e20889ba47f4a3f9c3bd92bd3b616bb6bb621e87409b6b6fa43bfe566a2a46468609c16f4  30-gpu-firmware.files
 52ba13a75f14c8d75a719f463a870df34eb59765bd43f29a49fb0dff201410fa388a04f73ec8e6e86d634547bf6ef0164466333b24da36d882b0d7254bfbe213  deviceinfo
 ecd40b8f9bc17f383c52aa96ad23ceec41be75a4500d5e7a67f2f59875bf9f72eb35686a0b6e4949b45fd589c5da409d1212c52172fef94de2d1655b28c339b4  gpu-nobin.sh
 e9ee9c1404b41ba15eafff3f728ff6e0e78dc17e9a88483fca92db1aa3efe0e4d5bf26142e533c4ff12b1bf8ce04ccabb7ca0f93aaea586d5b30910282aad237  pointercal
@@ -1,6 +1,7 @@
+# Maintainer: Ruby Iris Juric <ruby@srxl.me>
 pkgname=firmware-motorola-harpia
 pkgver=3
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware for Motorola Moto G4 Play"
 url="https://github.com/Sorixelle/vendor_motorola_harpia"
 subpackages="$pkgname-wcnss-nv:wcnss_nv $pkgname-venus"
@@ -2,7 +2,7 @@

 pkgname=firmware-oneplus-sdm845
 pkgver=7
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware for OnePlus 6 / 6T"
 url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845"
 arch="aarch64"
@@ -32,7 +32,7 @@ firmware_initramfs() {
 	mkdir "$subpkgdir"

 	install -Dm644 "$srcdir/30-gpu-firmware.files" \
-		"$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files"
+		"$subpkgdir/etc/postmarketos-mkinitfs/files/30-gpu-firmware.files"
 }

 sha512sums="
@@ -1,7 +1,7 @@
-# Maintainer: @exkc <exkc@exkc.moe>
+# Maintainer: Jean Lucas <jean@4ray.co>
 pkgname=firmware-pine64-rockpro64
 pkgver=1
-pkgrel=1
+pkgrel=0
 _commit="4b370cd415a2dd7b0ecdbe8bbf1d86fb35ce6985"
 pkgdesc="Firmware for the RockPro64 (pine64-rockpro64)"
 url="https://github.com/LibreELEC/brcmfmac_sdio-firmware"
@@ -2,7 +2,7 @@

 pkgname=firmware-shift-sdm845
 pkgver=0.3
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware for SHIFT sdm845 devices"
 url="https://gitlab.com/sdm845-mainline/firmware-shift-sdm845"
 arch="aarch64"
@@ -37,7 +37,7 @@ firmware_initramfs() {
 	mkdir "$subpkgdir"

 	install -Dm644 "$srcdir/30-gpu-firmware.files" \
-		"$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files"
+		"$subpkgdir/etc/postmarketos-mkinitfs/files/30-gpu-firmware.files"
 }

 sha512sums="
@@ -0,0 +1,23 @@
+From fbc4ce7a84e59215914a8981afe918002b191493 Mon Sep 17 00:00:00 2001
+From: Arthur Demchenkov <spinal.by@gmail.com>
+Date: Fri, 21 Dec 2018 09:23:57 +0300
+Subject: [PATCH] ARM: dts: n900: increase charge current limit to 950mA
+
+That was default in Maemo Fremantle
+---
+ arch/arm/boot/dts/omap3-n900.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
+index de7a31ae72207..7028a7cb2849e 100644
+--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
+@@ -700,7 +700,7 @@
+ 		ti,current-limit = <100>;
+ 		ti,weak-battery-voltage = <3400>;
+ 		ti,battery-regulation-voltage = <4200>;
+-		ti,charge-current = <650>;
+		ti,charge-current = <950>;
+ 		ti,termination-current = <100>;
+ 		ti,resistor-sense = <68>;
+ 
@@ -0,0 +1,115 @@
+commit 68fdbe090c362e8be23890a7333d156e18c27781
+Author: Sicelo A. Mhlongo <absicsz@gmail.com>
+Date:   Wed Apr 20 14:30:59 2022 +0200
+
+    power: supply: bq27xxx: expose battery data when CI=1
+    
+    When the Capacity Inaccurate flag is set, the chip still provides data
+    about the battery, albeit inaccurate. Instead of discarding capacity
+    values for CI=1, expose the stale data and use the
+    POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED property to indicate that the
+    values should be used with care.
+    
+    Reviewed-by: Pali Rohár <pali@kernel.org>
+    Signed-off-by: Sicelo A. Mhlongo <absicsz@gmail.com>
+    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
+
+diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
+index 72e727cd31e8..35e6a394c0df 100644
+--- a/drivers/power/supply/bq27xxx_battery.c
+++ b/drivers/power/supply/bq27xxx_battery.c
+@@ -1572,14 +1572,6 @@ static int bq27xxx_battery_read_charge(struct bq27xxx_device_info *di, u8 reg)
+  */
+ static inline int bq27xxx_battery_read_nac(struct bq27xxx_device_info *di)
+ {
+-	int flags;
+-
+-	if (di->opts & BQ27XXX_O_ZERO) {
+-		flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, true);
+-		if (flags >= 0 && (flags & BQ27000_FLAG_CI))
+-			return -ENODATA;
+-	}
+-
+ 	return bq27xxx_battery_read_charge(di, BQ27XXX_REG_NAC);
+ }
+ 
+@@ -1742,6 +1734,18 @@ static bool bq27xxx_battery_dead(struct bq27xxx_device_info *di, u16 flags)
+ 		return flags & (BQ27XXX_FLAG_SOC1 | BQ27XXX_FLAG_SOCF);
+ }
+ 
+/*
+ * Returns true if reported battery capacity is inaccurate
+ */
+static bool bq27xxx_battery_capacity_inaccurate(struct bq27xxx_device_info *di,
+						 u16 flags)
+{
+	if (di->opts & BQ27XXX_O_HAS_CI)
+		return (flags & BQ27000_FLAG_CI);
+	else
+		return false;
+}
+
+ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
+ {
+ 	/* Unlikely but important to return first */
+@@ -1751,6 +1755,8 @@ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
+ 		return POWER_SUPPLY_HEALTH_COLD;
+ 	if (unlikely(bq27xxx_battery_dead(di, di->cache.flags)))
+ 		return POWER_SUPPLY_HEALTH_DEAD;
+	if (unlikely(bq27xxx_battery_capacity_inaccurate(di, di->cache.flags)))
+		return POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED;
+ 
+ 	return POWER_SUPPLY_HEALTH_GOOD;
+ }
+@@ -1758,7 +1764,6 @@ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
+ void bq27xxx_battery_update(struct bq27xxx_device_info *di)
+ {
+ 	struct bq27xxx_reg_cache cache = {0, };
+-	bool has_ci_flag = di->opts & BQ27XXX_O_HAS_CI;
+ 	bool has_singe_flag = di->opts & BQ27XXX_O_ZERO;
+ 
+ 	cache.flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, has_singe_flag);
+@@ -1766,30 +1771,19 @@ void bq27xxx_battery_update(struct bq27xxx_device_info *di)
+ 		cache.flags = -1; /* read error */
+ 	if (cache.flags >= 0) {
+ 		cache.temperature = bq27xxx_battery_read_temperature(di);
+-		if (has_ci_flag && (cache.flags & BQ27000_FLAG_CI)) {
+-			dev_info_once(di->dev, "battery is not calibrated! ignoring capacity values\n");
+-			cache.capacity = -ENODATA;
+-			cache.energy = -ENODATA;
+-			cache.time_to_empty = -ENODATA;
+-			cache.time_to_empty_avg = -ENODATA;
+-			cache.time_to_full = -ENODATA;
+-			cache.charge_full = -ENODATA;
+-			cache.health = -ENODATA;
+-		} else {
+-			if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)
+-				cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);
+-			if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)
+-				cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);
+-			if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)
+-				cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);
+-
+-			cache.charge_full = bq27xxx_battery_read_fcc(di);
+-			cache.capacity = bq27xxx_battery_read_soc(di);
+-			if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)
+-				cache.energy = bq27xxx_battery_read_energy(di);
+-			di->cache.flags = cache.flags;
+-			cache.health = bq27xxx_battery_read_health(di);
+-		}
+		if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)
+			cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);
+		if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)
+			cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);
+		if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)
+			cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);
+
+		cache.charge_full = bq27xxx_battery_read_fcc(di);
+		cache.capacity = bq27xxx_battery_read_soc(di);
+		if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)
+			cache.energy = bq27xxx_battery_read_energy(di);
+		di->cache.flags = cache.flags;
+		cache.health = bq27xxx_battery_read_health(di);
+ 		if (di->regs[BQ27XXX_REG_CYCT] != INVALID_REG_ADDR)
+ 			cache.cycle_count = bq27xxx_battery_read_cyct(di);
+ 
@@ -0,0 +1,49 @@
+diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
+index 18aade195884..6eb8f8ae76da 100644
+--- a/include/linux/dma-direct.h
+++ b/include/linux/dma-direct.h
+@@ -103,6 +103,10 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size,
+ 
+ 	if (addr == DMA_MAPPING_ERROR)
+ 		return false;
+
+	if (!dev->dma_mask)
+		return false;
+
+ 	if (is_ram && !IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) &&
+ 	    min(addr, end) < phys_to_dma(dev, PFN_PHYS(min_low_pfn)))
+ 		return false;
+diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
+index 559461a826ba..389fc0faaa47 100644
+--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
+@@ -148,9 +148,6 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page,
+ 
+ 	BUG_ON(!valid_dma_direction(dir));
+ 
+-	if (WARN_ON_ONCE(!dev->dma_mask))
+-		return DMA_MAPPING_ERROR;
+-
+ 	if (dma_map_direct(dev, ops) ||
+ 	    arch_dma_map_page_direct(dev, page_to_phys(page) + offset + size))
+ 		addr = dma_direct_map_page(dev, page, offset, size, dir, attrs);
+@@ -185,9 +182,6 @@ static int __dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
+ 
+ 	BUG_ON(!valid_dma_direction(dir));
+ 
+-	if (WARN_ON_ONCE(!dev->dma_mask))
+-		return 0;
+-
+ 	if (dma_map_direct(dev, ops) ||
+ 	    arch_dma_map_sg_direct(dev, sg, nents))
+ 		ents = dma_direct_map_sg(dev, sg, nents, dir, attrs);
+@@ -293,9 +287,6 @@ dma_addr_t dma_map_resource(struct device *dev, phys_addr_t phys_addr,
+ 
+ 	BUG_ON(!valid_dma_direction(dir));
+ 
+-	if (WARN_ON_ONCE(!dev->dma_mask))
+-		return DMA_MAPPING_ERROR;
+-
+ 	if (dma_map_direct(dev, ops))
+ 		addr = dma_direct_map_resource(dev, phys_addr, size, dir, attrs);
+ 	else if (ops->map_resource)
@@ -0,0 +1,38 @@
+From 5f13cdce615165f5a623faa4a642ecc723202b0f Mon Sep 17 00:00:00 2001
+From: Merlijn Wajer <merlijn@wizzup.org>
+Date: Mon, 20 Dec 2021 22:27:03 +0100
+Subject: [PATCH] ARM: dts: omap3-n900: disable thermal for now
+
+See "Oops while booting 5.15.2 on Nokia N900" on linux-omap mailing list
+---
+ arch/arm/boot/dts/omap3-n900.dts | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
+index 1746a44e96bc..fe7c884da27c 100644
+--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
+@@ -28,6 +28,23 @@
+ 	status = "disabled";
+ };
+ 
+/* Disable cpu_thermal and bandgap, they causes oopses on mmc access in OFF
+   mode at the moment. Let's just disable thermal_zones as well, although the
+   system works without it...
+*/
+&cpu_thermal {
+	status = "disabled";
+};
+
+&bandgap {
+	status = "disabled";
+};
+
+&thermal_zones {
+	status = "disabled";
+};
+
+
+ / {
+ 	model = "Nokia N900";
+ 	compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
@@ -0,0 +1,39 @@
+diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
+index 8750dea56fcb..586146ac6884 100644
+--- a/drivers/iio/accel/st_accel.h
+++ b/drivers/iio/accel/st_accel.h
+@@ -61,6 +61,7 @@ enum st_accel_type {
+ #define LIS3DE_ACCEL_DEV_NAME		"lis3de"
+ #define LIS2DE12_ACCEL_DEV_NAME		"lis2de12"
+ #define LIS2HH12_ACCEL_DEV_NAME		"lis2hh12"
+#define LIS302DL_ACCEL_DEV_NAME		"lis302dl"
+ 
+ #ifdef CONFIG_IIO_BUFFER
+ int st_accel_allocate_ring(struct iio_dev *indio_dev);
+diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
+index f1e6ec380667..2adf8cf7307b 100644
+--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
+@@ -444,6 +444,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
+ 		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
+ 		.sensors_supported = {
+ 			[0] = LIS331DL_ACCEL_DEV_NAME,
+			[1] = LIS302DL_ACCEL_DEV_NAME,
+ 		},
+ 		.ch = (struct iio_chan_spec *)st_accel_8bit_channels,
+ 		.odr = {
+diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
+index cba57459e90a..466443101e8a 100644
+--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
+@@ -107,6 +107,10 @@ static const struct of_device_id st_accel_of_match[] = {
+ 		.compatible = "st,lis2hh12",
+ 		.data = LIS2HH12_ACCEL_DEV_NAME,
+ 	},
+	{
+		.compatible = "st,lis302dl",
+		.data = LIS302DL_ACCEL_DEV_NAME,
+	},
+ 	{},
+ };
+ MODULE_DEVICE_TABLE(of, st_accel_of_match);
@@ -0,0 +1,117 @@
+From d3b8625fd76fc839fc95e90b9117fafaf2d377bb Mon Sep 17 00:00:00 2001
+From: Merlijn Wajer <merlijn@wizzup.org>
+Date: Wed, 8 Dec 2021 15:28:59 +0100
+Subject: [PATCH] Revert "ARM: omap3: enable off mode automatically"
+
+This reverts commit fb2c599f056640d289b2147fbe6d9eaee689f1b2.
+
+This commit surfaces problems on the Nokia N900 when the system is
+actually in idle mode - causing oopses.
+---
+ arch/arm/mach-omap2/pm-debug.c |  2 ++
+ arch/arm/mach-omap2/pm.c       |  2 --
+ arch/arm/mach-omap2/pm.h       |  4 ++++
+ arch/arm/mach-omap2/pm34xx.c   | 27 ++-------------------------
+ 4 files changed, 8 insertions(+), 27 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
+index b3110399a3fb..104634a9b5b3 100644
+--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
+@@ -34,6 +34,8 @@
+ #include "prm2xxx_3xxx.h"
+ #include "pm.h"
+ 
+u32 enable_off_mode;
+
+ #ifdef CONFIG_DEBUG_FS
+ #include <linux/debugfs.h>
+ #include <linux/seq_file.h>
+diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
+index da829a90fe8c..01ec1ba4878b 100644
+--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
+@@ -28,8 +28,6 @@
+ #include "clockdomain.h"
+ #include "pm.h"
+ 
+-u32 enable_off_mode;
+-
+ #ifdef CONFIG_SUSPEND
+ /*
+  * omap_pm_suspend: points to a function that does the SoC-specific
+diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
+index 80e84ae66aee..2a883a0c1fcd 100644
+--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
+@@ -49,7 +49,11 @@ static inline int omap4_opp_init(void)
+ extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);
+ extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);
+ 
+#ifdef CONFIG_PM_DEBUG
+ extern u32 enable_off_mode;
+#else
+#define enable_off_mode 0
+#endif
+ 
+ #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
+ extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev);
+diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
+index d73c7b692116..d37fb3304a2e 100644
+--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
+@@ -25,7 +25,7 @@
+ #include <linux/clk.h>
+ #include <linux/delay.h>
+ #include <linux/slab.h>
+-#include <linux/of.h>
+#include <linux/omap-gpmc.h>
+ 
+ #include <trace/events/power.h>
+ 
+@@ -406,12 +406,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
+ 	if (!pwrst)
+ 		return -ENOMEM;
+ 	pwrst->pwrdm = pwrdm;
+-
+-	if (enable_off_mode)
+-		pwrst->next_state = PWRDM_POWER_OFF;
+-	else
+-		pwrst->next_state = PWRDM_POWER_RET;
+-
+	pwrst->next_state = PWRDM_POWER_RET;
+ 	list_add(&pwrst->node, &pwrst_list);
+ 
+ 	if (pwrdm_has_hdwr_sar(pwrdm))
+@@ -445,22 +440,6 @@ static void __init pm_errata_configure(void)
+ 	}
+ }
+ 
+-static void __init omap3_pm_check_pmic(void)
+-{
+-	struct device_node *np;
+-
+-	np = of_find_compatible_node(NULL, NULL, "ti,twl4030-power-idle");
+-	if (!np)
+-		np = of_find_compatible_node(NULL, NULL, "ti,twl4030-power-idle-osc-off");
+-
+-	if (np) {
+-		of_node_put(np);
+-		enable_off_mode = 1;
+-	} else {
+-		enable_off_mode = 0;
+-	}
+-}
+-
+ int __init omap3_pm_init(void)
+ {
+ 	struct power_state *pwrst, *tmp;
+@@ -494,8 +473,6 @@ int __init omap3_pm_init(void)
+ 		goto err2;
+ 	}
+ 
+-	omap3_pm_check_pmic();
+-
+ 	ret = pwrdm_for_each(pwrdms_setup, NULL);
+ 	if (ret) {
+ 		pr_err("Failed to setup powerdomains\n");
@@ -0,0 +1,41 @@
+From 7538e4ec6211a0d0e3d4f3d3138e9c2a39a38b62 Mon Sep 17 00:00:00 2001
+From: Merlijn Wajer <merlijn@wizzup.org>
+Date: Sun, 12 Dec 2021 23:13:08 +0100
+Subject: [PATCH] wl1251: specify max. IE length
+
+This fix is similar to commit 77c91295ea53 ("wil6210: specify max. IE
+length").  Without the max IE length set, wpa_supplicant cannot operate
+using the nl80211 interface.
+
+This patch is a workaround - the number 512 is taken from the wlcore
+driver, but note that per Paul Fertser:
+
+    there's no correct number because the driver will ignore the data
+    passed in extra IEs.
+
+Suggested-by: Paul Fertser <fercerpav@gmail.com>
+Signed-off-by: Merlijn Wajer <merlijn@wizzup.org>
+---
+ drivers/net/wireless/ti/wl1251/main.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
+index 136a0d3b23c9..a25a6143e65f 100644
+--- a/drivers/net/wireless/ti/wl1251/main.c
+++ b/drivers/net/wireless/ti/wl1251/main.c
+@@ -1520,6 +1520,12 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
+ 	wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
+ 					 BIT(NL80211_IFTYPE_ADHOC);
+ 	wl->hw->wiphy->max_scan_ssids = 1;
+
+	/* We set max_scan_ie_len to a random value to make wpa_supplicant scans not
+	 * fail, as the driver will the ignore the extra passed IEs anyway
+	 */
+	wl->hw->wiphy->max_scan_ie_len = 512;
+
+ 	wl->hw->wiphy->bands[NL80211_BAND_2GHZ] = &wl1251_band_2ghz;
+ 
+ 	wl->hw->queues = 4;
+-- 
+2.34.1
+
@@ -0,0 +1,78 @@
+# Maintainer: Sicelo <absicsz@gmail.com>
+# Co-Maintainer: Danct12 <danct12@disroot.org>
+
+pkgname=linux-nokia-n900
+pkgver=5.15.81
+pkgrel=0
+pkgdesc="Mainline kernel fork for Nokia N900"
+arch="armv7"
+url="https://kernel.org/"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps
+	pmb:cross-native
+	pmb:kconfigcheck-community
+	"
+makedepends="bison findutils flex openssl-dev perl gmp-dev mpc1-dev mpfr-dev postmarketos-installkernel"
+
+_carch="arm"
+_flavor=nokia-n900
+_config="config-$_flavor.armv7"
+case $pkgver in
+	*.*.0)	_kernver=${pkgver%.0};;
+	*.*.*)	_kernver=${pkgver%.*}
+		_patch="
+		linux-$pkgver.patch.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz";;
+	*.*)	_kernver=$pkgver;;
+esac
+source="
+	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
+	$_patch
+	$_config
+	0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
+	0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch
+	0003-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch
+	0004-ARM-dts-omap3_n900-disable-thermal-for-now.patch
+	0005-iio-accel-st-accel-add-lis302dl.patch
+	0006-ARM-dts-N900-use-iio-driver-for-accelerometer.patch
+	0007-Revert-ARM-omap3-enable-off-mode-automatically.patch
+	0008-wl1251-specify-max.-IE-length.patch
+"
+builddir="$srcdir/linux-$_kernver"
+
+prepare() {
+	default_prepare
+	cp -v "$srcdir"/$_config .config
+}
+
+build() {
+	unset LDFLAGS
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+}
+
+package() {
+	mkdir -p "$pkgdir"/boot
+	make zinstall modules_install dtbs_install \
+		ARCH="$_carch" \
+		INSTALL_MOD_STRIP=1 \
+		INSTALL_PATH="$pkgdir"/boot \
+		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
+
+	install -D "$builddir"/include/config/kernel.release \
+		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
+}
+
+sha512sums="
+d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a  linux-5.15.tar.xz
+022a3c82eb31596f9dde69a4c71721284f4129c5efd95fcef0c102ae4f53a70487e3c1ce44d92197510e98fcb0884398fc5b866938f93e542b2b010a592c5c75  linux-5.15.81.patch.xz
+7fbbed5b6488cea6518c91147ae32c56bb113ff83c415d0564d5f442ccfaa7bd847a15351983b4d68c44a9fca764e34e6c3681086069d7cf6da467df6a4fce98  config-nokia-n900.armv7
+04a39253afd25a7de03dc45ff322161672005406543c44b97d2dc293f202de7de446aee9707a690a290641c55c7bed6e78bbe096ca323dd7d88d3207427c8d31  0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
+3cc2036ba264bd855358361aacb309ad1cf1660cb82a0978523508d1b3fe513676c58f6efc5bb64f7601b77392c19d2c609b6d83541db7e418c1737cff3973e8  0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch
+991237276bee4ff7bca24cf3a26afe3f12a2a604452793ad905a605890f761ac98374b5509cfbcab33c7b7ccf3da5cc286e70afe27b8e201387f403bf5025ae9  0003-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch
+ea33adda06e1fb64b763c34f1f598bb00ccfdba5400d0996871138284b4cb8a51e021c7c0ace9d4bc16027530027fb2a443d5013c6f0b22ed3d64f36152c8854  0004-ARM-dts-omap3_n900-disable-thermal-for-now.patch
+eb23d77ef3b03d90af43a22f37556c040f8ba69f91564d443615c9554c6ea4d19578730e8087b88751b5f673143cc557ac50bb81598f7f50aba08953c7604df8  0005-iio-accel-st-accel-add-lis302dl.patch
+302aa8e6677e7ecfae473553806cdf5d47687c4f8e73322d0ace78486f9290ba503069ed6b41250fe38802b6c6091c7c4eac06ab387e011f1316b84ad5e2641d  0006-ARM-dts-N900-use-iio-driver-for-accelerometer.patch
+acf3beef5448da7f3be19b862ac2fef65379d9f1617246baaab296083901174d891526cd9bf781162d4406089969c311701dfded04219bafd3c5c7784bc4c2e6  0007-Revert-ARM-omap3-enable-off-mode-automatically.patch
+acaa153809c390957ee8d80caae440a41d84c78f045268ac226f05019dbdd69959b5cf56b6bac2e2c0300bcdb68649ffb847e7a0a333408bf5b4426fc969afe8  0008-wl1251-specify-max.-IE-length.patch
+"
@@ -2,10 +2,10 @@
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>

 pkgname=linux-pine64-pinephonepro
-pkgver=6.2.7
-_pkgver=6.2
-_tagdate=20230318-0922
-pkgrel=0
+pkgver=6.1
+_pkgver=6.1
+_tagdate=20221212-1243
+pkgrel=1
 pkgdesc="Mainline kernel for the pinephone pro"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -39,12 +39,18 @@ esac

 # Source
 _config="config-$_flavor.$CARCH"
+case $pkgver in
+	*.*rc*)  _kernver=$_pkgver
+	         _rc=1;;
+	*.*.*)	_kernver=${pkgver%.0};;
+	*.*)	_kernver=$pkgver;;
+esac
 source="
-	https://gitlab.com/pine64-org/linux/-/archive/ppp-$_pkgver-$_tagdate/linux-ppp-$_pkgver-$_tagdate.tar.gz
+	https://gitlab.com/pine64-org/linux/-/archive/ppp-$_kernver-$_tagdate/linux-ppp-$_kernver-$_tagdate.tar.gz
 	config-$_flavor.aarch64
 	stk3311-pinctl-patch.patch
 	"
-builddir="$srcdir/linux-ppp-$_pkgver-$_tagdate"
+builddir="$srcdir/linux-ppp-$_kernver-$_tagdate"

 prepare() {
 	default_prepare
@@ -74,7 +80,7 @@ package() {


 sha512sums="
-bd08aa41198a243ac8d59db511ee2500ed3d2f0c48eb4702328b330ef22df8426b6e61a74a39c54c21a645d8d2a15a82c1ae07ee40d4e50b37a9e61c8640dde0  linux-ppp-6.2-20230318-0922.tar.gz
-5941ae6738404afa5ad91f6a806f39dc9bad77bbe41fef5e35546fef64f6683ba1a9346a650cd85c6a14a541c6c6541bb74366e6595008b09a3ad3807f19b99b  config-pine64-pinephonepro.aarch64
+9fe6d47bcd8799a0d1ab4eb8bf0e3c52854b28f4de0f75789c4bb5aad48e76aea4edecfc36350623ed320f43b480c69aa2c83f4244c51f1c0d0cc7f610f5882b  linux-ppp-6.1-20221212-1243.tar.gz
+3223648b5269c902445297a4da4a29cea2e92ced6ca22c1a75cf02b71c21de650b605d6c0a1028f02889ba971bac2e17e0418668dbc020245b4396e52f8bebed  config-pine64-pinephonepro.aarch64
 b04b4081b5716802bfe6323f9b1c5fce503bef92e680e8ee49d3c1bc579bed5e79d23054db11f39620c055167a0444104423ec497bc7b60d7aaa115e2f7db775  stk3311-pinctl-patch.patch
 "
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.2.7 Kernel Configuration
+# Linux/arm64 6.1.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r9) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r5) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24000
+CONFIG_AS_VERSION=23900
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24000
+CONFIG_LD_VERSION=23900
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -57,6 +57,7 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_GENERIC_IRQ_IPI=y
 CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_IRQ_MSI_IOMMU=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
@@ -133,25 +134,15 @@ CONFIG_CPU_ISOLATION=y
 #
 CONFIG_TREE_RCU=y
 CONFIG_PREEMPT_RCU=y
-CONFIG_RCU_EXPERT=y
+# CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
-# CONFIG_FORCE_TASKS_RCU is not set
 CONFIG_TASKS_RCU=y
-# CONFIG_FORCE_TASKS_RUDE_RCU is not set
 CONFIG_TASKS_RUDE_RCU=y
-# CONFIG_FORCE_TASKS_TRACE_RCU is not set
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
-CONFIG_RCU_FANOUT=64
-CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RCU_BOOST is not set
-CONFIG_RCU_NOCB_CPU=y
-# CONFIG_RCU_NOCB_CPU_DEFAULT_ALL is not set
-# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
-CONFIG_RCU_LAZY=y
 # end of RCU Subsystem

 CONFIG_IKCONFIG=y
@@ -172,7 +163,6 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_GCC11_NO_ARRAY_BOUNDS=y
 CONFIG_GCC12_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_ARCH_SUPPORTS_INT128=y
@@ -228,7 +218,6 @@ CONFIG_INITRAMFS_PRESERVE_MTIME=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_LD_ORPHAN_WARN=y
-CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
 CONFIG_SYSCTL=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
@@ -255,7 +244,6 @@ CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
@@ -280,7 +268,7 @@ CONFIG_TRACEPOINTS=y
 # end of General setup

 CONFIG_ARM64=y
-CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
 CONFIG_ARM64_PAGE_SHIFT=12
@@ -382,7 +370,6 @@ CONFIG_ARM64_ERRATUM_2658417=y
 # CONFIG_ARM64_ERRATUM_2054223 is not set
 # CONFIG_ARM64_ERRATUM_2067961 is not set
 CONFIG_ARM64_ERRATUM_2441009=y
-CONFIG_ARM64_ERRATUM_2645198=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 # CONFIG_CAVIUM_ERRATUM_23144 is not set
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
@@ -507,6 +494,7 @@ CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
+CONFIG_ARCH_NR_GPIO=0
 # end of Kernel Features

 #
@@ -613,9 +601,6 @@ CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
 CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_DIRTY_RING=y
-CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y
-CONFIG_NEED_KVM_DIRTY_RING_WITH_BITMAP=y
 CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_MMIO=y
 CONFIG_HAVE_KVM_MSI=y
@@ -671,7 +656,6 @@ CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_MMU_GATHER_TABLE_FREE=y
 CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
@@ -746,7 +730,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-CONFIG_FUNCTION_ALIGNMENT=0
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
@@ -892,8 +875,7 @@ CONFIG_ZSMALLOC=m
 #
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
-# CONFIG_SLOB_DEPRECATED is not set
-# CONFIG_SLUB_TINY is not set
+# CONFIG_SLOB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
@@ -963,7 +945,6 @@ CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
-CONFIG_SECRETMEM=y
 # CONFIG_ANON_VMA_NAME is not set
 CONFIG_USERFAULTFD=y
 CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
@@ -1166,6 +1147,7 @@ CONFIG_NFT_MASQ=y
 # CONFIG_NFT_REDIR is not set
 CONFIG_NFT_NAT=y
 # CONFIG_NFT_TUNNEL is not set
+# CONFIG_NFT_OBJREF is not set
 # CONFIG_NFT_QUOTA is not set
 CONFIG_NFT_REJECT=y
 CONFIG_NFT_REJECT_INET=y
@@ -1479,6 +1461,7 @@ CONFIG_NET_SCH_ETS=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -1570,7 +1553,6 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=m
 CONFIG_BT_HS=y
 CONFIG_BT_LE=y
-CONFIG_BT_LE_L2CAP_ECRED=y
 CONFIG_BT_LEDS=y
 # CONFIG_BT_MSFTEXT is not set
 # CONFIG_BT_AOSPEXT is not set
@@ -1586,7 +1568,6 @@ CONFIG_BT_RTL=m
 CONFIG_BT_MTK=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_POLL_SYNC=y
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
@@ -1772,6 +1753,7 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_GENERIC_STUB=y
 # CONFIG_EFI_ZBOOT is not set
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
+CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 CONFIG_EFI_CAPSULE_LOADER=m
 # CONFIG_EFI_TEST is not set
@@ -1916,7 +1898,6 @@ CONFIG_ZRAM_DEF_COMP_ZSTD=y
 CONFIG_ZRAM_DEF_COMP="zstd"
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
-# CONFIG_ZRAM_MULTI_COMP is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_DRBD is not set
@@ -2427,7 +2408,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP5 is not set
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
 # CONFIG_TOUCHSCREEN_EETI is not set
@@ -2438,7 +2418,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_GOODIX=m
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
 # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set
-# CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set
 # CONFIG_TOUCHSCREEN_ILI210X is not set
 # CONFIG_TOUCHSCREEN_ILITEK is not set
 # CONFIG_TOUCHSCREEN_S6SY761 is not set
@@ -2503,7 +2482,6 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_IQS5XX is not set
 # CONFIG_TOUCHSCREEN_ZINITIX is not set
-# CONFIG_TOUCHSCREEN_HIMAX_HX83112B is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -2582,7 +2560,6 @@ CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
-CONFIG_LEGACY_TIOCSTI=y
 # CONFIG_LDISC_AUTOLOAD is not set

 #
@@ -2645,7 +2622,6 @@ CONFIG_TTY_PRINTK=m
 CONFIG_TTY_PRINTK_LEVEL=6
 CONFIG_VIRTIO_CONSOLE=m
 # CONFIG_IPMI_HANDLER is not set
-# CONFIG_SSIF_IPMI_BMC is not set
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -2668,6 +2644,8 @@ CONFIG_TCG_TPM=y
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
+CONFIG_RANDOM_TRUST_CPU=y
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
 # end of Character devices

 #
@@ -2710,7 +2688,6 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-# CONFIG_I2C_HISI is not set
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
@@ -2769,7 +2746,6 @@ CONFIG_SPI_ROCKCHIP=y
 # CONFIG_SPI_ROCKCHIP_SFC is not set
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_SIFIVE is not set
-# CONFIG_SPI_SN_F_OSPI is not set
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
@@ -2862,7 +2838,6 @@ CONFIG_GPIO_GENERIC=y
 # CONFIG_GPIO_FTGPIO010 is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_HISI is not set
 # CONFIG_GPIO_HLWD is not set
 # CONFIG_GPIO_LOGICVC is not set
 # CONFIG_GPIO_MB86S7X is not set
@@ -2913,7 +2888,6 @@ CONFIG_GPIO_ROCKCHIP=y
 # Virtual GPIO drivers
 #
 # CONFIG_GPIO_AGGREGATOR is not set
-# CONFIG_GPIO_LATCH is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_VIRTIO is not set
 # CONFIG_GPIO_SIM is not set
@@ -3210,7 +3184,6 @@ CONFIG_BCMA_POSSIBLE=y
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_SMPRO is not set
 # CONFIG_MFD_AS3722 is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
@@ -3235,6 +3208,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI6421_SPMI is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_88PM800 is not set
@@ -3289,7 +3263,6 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TI_LP87565 is not set
 # CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS65219 is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
@@ -3375,7 +3348,6 @@ CONFIG_REGULATOR_RK808=y
 # CONFIG_REGULATOR_RT5190A is not set
 # CONFIG_REGULATOR_RT5759 is not set
 # CONFIG_REGULATOR_RT6160 is not set
-# CONFIG_REGULATOR_RT6190 is not set
 # CONFIG_REGULATOR_RT6245 is not set
 # CONFIG_REGULATOR_RTQ2134 is not set
 # CONFIG_REGULATOR_RTMV20 is not set
@@ -3495,6 +3467,7 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 #
 # Aspeed media platform drivers
 #
+# CONFIG_VIDEO_ASPEED is not set

 #
 # Atmel media platform drivers
@@ -3522,10 +3495,6 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 # Mediatek media platform drivers
 #

-#
-# Microchip Technology, Inc. media platform drivers
-#
-
 #
 # NVidia media platform drivers
 #
@@ -3621,14 +3590,12 @@ CONFIG_VIDEO_IMX258=m
 # CONFIG_VIDEO_OG01A1B is not set
 # CONFIG_VIDEO_OV02A10 is not set
 # CONFIG_VIDEO_OV08D10 is not set
-# CONFIG_VIDEO_OV08X40 is not set
 # CONFIG_VIDEO_OV13858 is not set
 # CONFIG_VIDEO_OV13B10 is not set
 # CONFIG_VIDEO_OV2640 is not set
 # CONFIG_VIDEO_OV2659 is not set
 # CONFIG_VIDEO_OV2680 is not set
 # CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV4689 is not set
 # CONFIG_VIDEO_OV5640 is not set
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_OV5647 is not set
@@ -3653,11 +3620,11 @@ CONFIG_VIDEO_OV8858=m
 # CONFIG_VIDEO_RDACM21 is not set
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_S5C73M3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
 # CONFIG_VIDEO_S5K6AA is not set
 # CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_ST_VGXY61 is not set
 # CONFIG_VIDEO_VS6624 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
@@ -3727,7 +3694,6 @@ CONFIG_VIDEO_DW9714=m
 # CONFIG_VIDEO_SAA7110 is not set
 # CONFIG_VIDEO_SAA711X is not set
 # CONFIG_VIDEO_TC358743 is not set
-# CONFIG_VIDEO_TC358746 is not set
 # CONFIG_VIDEO_TVP514X is not set
 # CONFIG_VIDEO_TVP5150 is not set
 # CONFIG_VIDEO_TVP7002 is not set
@@ -3797,10 +3763,10 @@ CONFIG_VIDEO_DW9714=m
 # Graphics support
 #
 CONFIG_APERTURE_HELPERS=y
-CONFIG_VIDEO_NOMODESET=y
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
+CONFIG_DRM_USE_DYNAMIC_DEBUG=y
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
@@ -3876,7 +3842,6 @@ CONFIG_DRM_PANEL_HIMAX_HX8394=y
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C 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_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
@@ -3887,7 +3852,6 @@ CONFIG_DRM_PANEL_HIMAX_HX8394=y
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
-# CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set
@@ -3987,6 +3951,8 @@ CONFIG_DRM_DW_MIPI_DSI=y
 # CONFIG_DRM_ETNAVIV is not set
 # CONFIG_DRM_HISI_KIRIN is not set
 # CONFIG_DRM_LOGICVC is not set
+# CONFIG_DRM_MXSFB is not set
+# CONFIG_DRM_IMX_LCDIF is not set
 # CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_GM12U320 is not set
 # CONFIG_DRM_PANEL_MIPI_DBI is not set
@@ -4008,6 +3974,7 @@ CONFIG_DRM_PANFROST=y
 # CONFIG_DRM_SSD130X is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+CONFIG_DRM_NOMODESET=y

 #
 # Frame buffer Devices
@@ -4083,7 +4050,6 @@ CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 # CONFIG_LOGO is not set
 # end of Graphics support

-# CONFIG_DRM_ACCEL is not set
 CONFIG_SOUND=m
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
@@ -4350,7 +4316,6 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_WM8904 is not set
 # CONFIG_SND_SOC_WM8940 is not set
 # CONFIG_SND_SOC_WM8960 is not set
-# CONFIG_SND_SOC_WM8961 is not set
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
@@ -4570,6 +4535,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_MAX3421_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
@@ -4623,10 +4589,6 @@ CONFIG_USBIP_VHCI_NR_HCS=8
 CONFIG_USBIP_HOST=m
 # CONFIG_USBIP_VUDC is not set
 # CONFIG_USBIP_DEBUG is not set
-
-#
-# USB dual-mode controller drivers
-#
 # CONFIG_USB_CDNS_SUPPORT is not set
 CONFIG_USB_MUSB_HDRC=m
 # CONFIG_USB_MUSB_HOST is not set
@@ -4765,6 +4727,7 @@ CONFIG_USB_CHAOSKEY=m
 #
 CONFIG_USB_PHY=y
 CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_ISP1301 is not set
 CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
@@ -4780,6 +4743,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 #
 # USB Peripheral Controller
 #
+# CONFIG_USB_FOTG210_UDC is not set
 # CONFIG_USB_GR_UDC is not set
 # CONFIG_USB_R8A66597 is not set
 # CONFIG_USB_PXA27X is not set
@@ -5308,7 +5272,6 @@ CONFIG_COMMON_CLK_ROCKCHIP=y
 # CONFIG_CLK_RK3368 is not set
 CONFIG_CLK_RK3399=y
 # CONFIG_CLK_RK3568 is not set
-CONFIG_CLK_RK3588=y
 # CONFIG_XILINX_VCU is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_HWSPINLOCK=y
@@ -5357,7 +5320,6 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
-# CONFIG_IOMMUFD is not set
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_ARM_SMMU=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
@@ -5512,8 +5474,6 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 # CONFIG_FXLS8962AF_SPI is not set
 # CONFIG_HID_SENSOR_ACCEL_3D is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_IIO_KX022A_SPI is not set
-# CONFIG_IIO_KX022A_I2C is not set
 # CONFIG_KXSD9 is not set
 # CONFIG_KXCJK1013 is not set
 # CONFIG_MC3230 is not set
@@ -5535,7 +5495,6 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 #
 # Analog to digital converters
 #
-# CONFIG_AD4130 is not set
 # CONFIG_AD7091R5 is not set
 # CONFIG_AD7124 is not set
 # CONFIG_AD7192 is not set
@@ -5570,7 +5529,6 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 # CONFIG_MAX11100 is not set
 # CONFIG_MAX1118 is not set
 # CONFIG_MAX11205 is not set
-# CONFIG_MAX11410 is not set
 # CONFIG_MAX1241 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MAX9611 is not set
@@ -5606,7 +5564,6 @@ CONFIG_ROCKCHIP_SARADC=m
 #
 # Analog to digital and digital to analog converters
 #
-# CONFIG_AD74115 is not set
 # CONFIG_AD74413R is not set
 # end of Analog to digital and digital to analog converters

@@ -5743,7 +5700,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
-# CONFIG_ADF4377 is not set
 # CONFIG_ADMV1013 is not set
 # CONFIG_ADMV1014 is not set
 # CONFIG_ADMV4420 is not set
@@ -6009,7 +5965,6 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 # CONFIG_TMP117 is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
-# CONFIG_MAX30208 is not set
 # CONFIG_MAX31856 is not set
 # CONFIG_MAX31865 is not set
 # end of Temperature sensors
@@ -6295,6 +6250,9 @@ CONFIG_TMPFS_INODE64=y
 CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
+CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
+CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
+# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set
 CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
@@ -6318,11 +6276,9 @@ CONFIG_CRAMFS_BLOCKDEV=y
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
-# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
@@ -6547,13 +6503,14 @@ CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 # CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
+CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ENGINE=y
+CONFIG_CRYPTO_ENGINE=m
 # end of Crypto core or helper

 #
@@ -6709,7 +6666,6 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=m
 CONFIG_CRYPTO_SHA512_ARM64=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA3_ARM64=y
-# CONFIG_CRYPTO_SM3_NEON is not set
 CONFIG_CRYPTO_SM3_ARM64_CE=y
 # CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 CONFIG_CRYPTO_AES_ARM64=y
@@ -6721,8 +6677,6 @@ CONFIG_CRYPTO_SM4_ARM64_CE=y
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
 # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
-# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
 # end of Accelerated Cryptographic Algorithms for CPU (arm64)

@@ -6731,7 +6685,6 @@ CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 # CONFIG_CRYPTO_DEV_CCP is not set
 CONFIG_CRYPTO_DEV_ROCKCHIP=y
-# CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
@@ -6789,7 +6742,6 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
 CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
@@ -7126,12 +7078,11 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
-# CONFIG_DEBUG_CGROUP_REF is not set
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
@@ -7148,7 +7099,7 @@ CONFIG_BOOTTIME_TRACING=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_FUNCTION_PROFILER is not set
 CONFIG_STACK_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
@@ -1,7 +1,7 @@
-From 9a833a40c7288466318dd10cc8fa7a898613f75a Mon Sep 17 00:00:00 2001
+From c5a7a1f1518e39079260b2c4c53dd0361eed77b8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
 Date: Fri, 30 Nov 2012 17:05:40 -0800
-Subject: [PATCH 01/11] ARM: decompressor: Flush tlb before swiching domain 0
+Subject: [PATCH 01/13] ARM: decompressor: Flush tlb before swiching domain 0
 to client mode
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -20,10 +20,10 @@ Signed-off-by: Arve Hjønnevåg <arve@android.com>
 1 file changed, 2 insertions(+)

 diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
-index 9f406e9c0ea6..750c8c0d5d9e 100644
+index bf79f2f78d23..083e59d474fe 100644
 --- a/arch/arm/boot/compressed/head.S
 +++ b/arch/arm/boot/compressed/head.S
-@@ -892,6 +892,8 @@ __armv7_mmu_cache_on:
+@@ -896,6 +896,8 @@ __armv7_mmu_cache_on:
 		bic     r6, r6, #1 << 31        @ 32-bit translation system
 		bic     r6, r6, #(7 << 0) | (1 << 4)	@ use only ttbr0
 		mcrne	p15, 0, r3, c2, c0, 0	@ load page table pointer
@@ -33,5 +33,5 @@ index 9f406e9c0ea6..750c8c0d5d9e 100644
 		mcrne   p15, 0, r6, c2, c0, 2   @ load ttb control
 #endif
 -- 
-2.38.1
+2.38.0

@@ -1,7 +1,7 @@
-From f58ef6a45f162e2bd1d0c7c0de00f94bccd3b6f5 Mon Sep 17 00:00:00 2001
+From 81d08c1c70aac6ab399eacb6cd393f0de2a64108 Mon Sep 17 00:00:00 2001
 From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 Date: Wed, 4 Nov 2020 00:06:26 +0100
-Subject: [PATCH 02/11] ARM: dts: exynos: Add reboot modes to midas
+Subject: [PATCH 02/13] ARM: dts: exynos: Add reboot modes to midas

 The values have been taken from the sec-reboot.c driver in
 the 3.0.101 smdk4412 kernel used in LineageOS which is based
@@ -23,7 +23,7 @@ Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 1 file changed, 23 insertions(+)

 diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
-index 8e1c19a8ad06..1f9cd7474b16 100644
+index b967397a46c5..3167c51b6296 100644
 --- a/arch/arm/boot/dts/exynos4412-midas.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
@@ -982,6 +982,29 @@ &mshc_0 {
@@ -57,5 +57,5 @@ index 8e1c19a8ad06..1f9cd7474b16 100644
 
 &pinctrl_0 {
 -- 
-2.38.1
+2.38.0

@@ -1,7 +1,7 @@
-From 9d3455e9112fe73fb77bd1237673c6c944375adb Mon Sep 17 00:00:00 2001
+From 743a22734931563687d38c54289eca346eb4f24f Mon Sep 17 00:00:00 2001
 From: belgin <belginstirbu@hotmail.com>
 Date: Tue, 29 Jun 2021 20:31:12 +0300
-Subject: [PATCH 03/11] mmc: core: Workaround VTU00M 0xf1 FTL metadata
+Subject: [PATCH 03/13] mmc: core: Workaround VTU00M 0xf1 FTL metadata
 corruption bug

 Some versions of the 0xf1 revision of the firmware of the
@@ -315,10 +315,10 @@ index 81c55bfd6e0c..07e67b62515d 100644
 {
 	unsigned int busy_timeout_ms = card->ext_csd.out_of_int_time;
 diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
-index c726ea781255..e6e168651b35 100644
+index 8a30de08e913..4f7de8972923 100644
 --- a/include/linux/mmc/card.h
 +++ b/include/linux/mmc/card.h
-@@ -338,6 +338,7 @@ struct mmc_card {
+@@ -337,6 +337,7 @@ struct mmc_card {
 	unsigned int    nr_parts;
 
 	struct workqueue_struct *complete_wq;	/* Private workqueue */
@@ -339,5 +339,5 @@ index 6efec0b9820c..9bfbe8a2d22d 100644
 +
 #endif /* LINUX_MMC_CORE_H */
 -- 
-2.38.1
+2.38.0

@@ -1,7 +1,7 @@
-From 33826a37a40cd49d21f959721478d4cf085cee46 Mon Sep 17 00:00:00 2001
+From 6d0295559393f04ec38372693b4805b57563a29b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@iki.fi>
 Date: Tue, 3 Sep 2019 10:45:08 -0400
-Subject: [PATCH 04/11] drivers: drm: Add backlight control support for s6e8aa0
+Subject: [PATCH 04/13] drivers: drm: Add backlight control support for s6e8aa0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,7 +12,7 @@ Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
 1 file changed, 61 insertions(+), 22 deletions(-)

 diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c b/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
-index 54213beafaf5..635336208fef 100644
+index 9b3599d6d2de..8d9c554835a4 100644
 --- a/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
 +++ b/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
@@ -3,6 +3,8 @@
@@ -178,5 +178,5 @@ index 54213beafaf5..635336208fef 100644
 	drm_panel_init(&ctx->panel, dev, &s6e8aa0_drm_funcs,
 		       DRM_MODE_CONNECTOR_DSI);
 -- 
-2.38.1
+2.38.0

@@ -1,7 +1,7 @@
-From 18c46a9d7aa916d8fe407d01dd0329df7ac8f8e9 Mon Sep 17 00:00:00 2001
+From ca10f3dab78955ce9c780af1c71465b93b3b45df Mon Sep 17 00:00:00 2001
 From: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
 Date: Tue, 27 Sep 2016 00:56:37 +0200
-Subject: [PATCH 05/11] power_supply: max77693: Listen for cable events and
+Subject: [PATCH 05/13] power_supply: max77693: Listen for cable events and
 enable charging

 This patch adds a listener for extcon cable events and enables
@@ -25,7 +25,7 @@ Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 2 files changed, 178 insertions(+), 1 deletion(-)

 diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
-index 0bbfe6a7ce4d..2364095abf31 100644
+index 1aa8323ad9f6..8c25debb6f18 100644
 --- a/drivers/power/supply/Kconfig
 +++ b/drivers/power/supply/Kconfig
@@ -567,7 +567,7 @@ config CHARGER_MAX77650
@@ -296,5 +296,5 @@ index a2c5c9858639..f2b5ef7df446 100644
 
 	return 0;
 -- 
-2.38.1
+2.38.0

@@ -1,7 +1,7 @@
-From b25dcb4f2ece56b03a09680ba933f8788bc64864 Mon Sep 17 00:00:00 2001
+From 336473ac3b3bc538d43fccfc29aa6e40dd869dfd Mon Sep 17 00:00:00 2001
 From: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
 Date: Mon, 26 Sep 2016 23:33:05 +0200
-Subject: [PATCH 06/11] mfd: max77693: Add defines for charger current control
+Subject: [PATCH 06/13] mfd: max77693: Add defines for charger current control

 This prepares for an updated regulator and charger driver. The defines
 are needed to set the maximum input current and the fast charge
@@ -40,5 +40,5 @@ index 311f7d3d2323..f6df8bafe996 100644
 /* MAX77693 CHG_CTRL Register */
 #define SAFEOUT_CTRL_SAFEOUT1_MASK	0x3
 -- 
-2.38.1
+2.38.0

@@ -1,7 +1,7 @@
-From 8ad0b1ba7e2632ac83bcc4f07e0ecde9ed6256eb Mon Sep 17 00:00:00 2001
+From d733e034767619d5fa5e6273f3cdf5bd3ba9fe91 Mon Sep 17 00:00:00 2001
 From: Shilin Victor <chrono.monochrome@gmail.com>
 Date: Fri, 19 Mar 2021 19:10:37 +0300
-Subject: [PATCH 07/11] power_supply: max77693: change the supply type to
+Subject: [PATCH 07/13] power_supply: max77693: change the supply type to
 POWER_SUPPLY_TYPE_MAINS

 ---
@@ -22,5 +22,5 @@ index f2b5ef7df446..3962701989e5 100644
 	.num_properties	= ARRAY_SIZE(max77693_charger_props),
 	.get_property	= max77693_charger_get_property,
 -- 
-2.38.1
+2.38.0

@@ -0,0 +1,906 @@
+From ef45d556725b6e29196e805795a9a2756fa6d706 Mon Sep 17 00:00:00 2001
+From: Jack Knightly <J__A__K@hotmail.com>
+Date: Fri, 14 Oct 2022 20:58:17 +0200
+Subject: [PATCH 08/13] Add s6evr02 panel
+
+This adds the s6evr02 panel which the Samsung Galaxy Note II
+uses. After this is merged I will create another MR for t0lte to be
+added as a new device.
+
+PLEASE NOTE - I did not write the panel driver, but merely brought up
+an old driver that worked with mainline a few years ago. The driver
+was written by forkbomb and can be found here:
+https://github.com/fourkbomb/linux/blob/master/drivers/gpu/drm/panel/panel-samsung-s6evr02.c
+Given it is based on another panel driver that is still in mainline
+today, I applied the commits that that panel driver underwent between
+then and now, and it works.
+---
+ arch/arm/boot/dts/exynos4412-n710x.dts        |  69 ++
+ drivers/gpu/drm/panel/Kconfig                 |   6 +
+ drivers/gpu/drm/panel/Makefile                |   1 +
+ drivers/gpu/drm/panel/panel-samsung-s6evr02.c | 764 ++++++++++++++++++
+ 4 files changed, 840 insertions(+)
+ create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6evr02.c
+
+diff --git a/arch/arm/boot/dts/exynos4412-n710x.dts b/arch/arm/boot/dts/exynos4412-n710x.dts
+index 9ae05b0d684c..da0e475b1063 100644
+--- a/arch/arm/boot/dts/exynos4412-n710x.dts
+++ b/arch/arm/boot/dts/exynos4412-n710x.dts
+@@ -38,6 +38,75 @@ &cam_io_reg {
+ 	status = "okay";
+ };
+ 
+
+&dsi_0 {
+	vddcore-supply = <&ldo8_reg>;
+	vddio-supply = <&ldo10_reg>;
+	samsung,burst-clock-frequency = <500000000>;
+	samsung,esc-clock-frequency = <20000000>;
+	samsung,pll-clock-frequency = <24000000>;
+	status = "okay";
+
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@1 {
+			reg = <1>;
+
+			dsi_out: endpoint@0 {
+				samsung,burst-clock-frequency = <500000000>;
+				samsung,esc-clock-frequency = <20000000>;
+				//status = "disabled";
+				remote-endpoint = <&dsi_in_s6evr02>;
+				status = "okay";
+			};
+
+		};
+
+	};
+
+	s6evr02: panel-s6evr02@0 {
+		compatible = "samsung,s6evr02";
+		reg = <0>;
+		vdd3-supply = <&ldo13_reg>;
+		vci-supply = <&ldo25_reg>;
+		reset-gpios = <&gpf2 1 GPIO_ACTIVE_HIGH>;
+		power-on-delay = <50>;
+		reset-delay = <100>;
+		init-delay = <100>;
+		panel-width-mm = <69>;
+		panel-height-mm = <123>;
+		// HIGH means s6evr02
+		present-gpios = <&gpf1 0 GPIO_ACTIVE_HIGH>;
+		//status = "disabled";
+		status = "okay";
+
+		display-timings {
+			timing0_s6evr02: timing-0 {
+				clock-frequency = <62614944>;
+				hactive = <720>;
+				vactive = <1280>;
+				hfront-porch = <70>;
+				hback-porch = <40>;
+				hsync-len = <3>;
+				vfront-porch = <13>;
+				vback-porch = <1>;
+				vsync-len = <2>;
+			};
+		};
+
+		port {
+			dsi_in_s6evr02: endpoint {
+				//status = "disabled";
+				remote-endpoint = <&dsi_out>;
+				status = "okay";
+			};
+		};
+	};
+
+};
+
+ &i2c_3 {
+ 	samsung,i2c-sda-delay = <100>;
+ 	samsung,i2c-slave-addr = <0x10>;
+diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
+index a9043eacce97..6b7c6ef55a01 100644
+--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
+@@ -536,6 +536,12 @@ config DRM_PANEL_SAMSUNG_S6E8AA0
+ 	depends on OF
+ 	select DRM_MIPI_DSI
+ 	select VIDEOMODE_HELPERS
+	
+config DRM_PANEL_SAMSUNG_S6EVR02
+	tristate "Samsung S6EVR02 DSI video mode panel"
+	depends on OF
+	select DRM_MIPI_DSI
+	select VIDEOMODE_HELPERS
+ 
+ config DRM_PANEL_SAMSUNG_SOFEF00
+ 	tristate "Samsung sofef00/s6e3fc2x01 OnePlus 6/6T DSI cmd mode panels"
+diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
+index 34e717382dbb..b3d149475a38 100644
+--- a/drivers/gpu/drm/panel/Makefile
+++ b/drivers/gpu/drm/panel/Makefile
+@@ -54,6 +54,7 @@ obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E63M0_SPI) += panel-samsung-s6e63m0-spi.o
+ obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E63M0_DSI) += panel-samsung-s6e63m0-dsi.o
+ obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01) += panel-samsung-s6e88a0-ams452ef01.o
+ obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0) += panel-samsung-s6e8aa0.o
+obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6EVR02) += panel-samsung-s6evr02.o
+ obj-$(CONFIG_DRM_PANEL_SAMSUNG_SOFEF00) += panel-samsung-sofef00.o
+ obj-$(CONFIG_DRM_PANEL_SEIKO_43WVF1G) += panel-seiko-43wvf1g.o
+ obj-$(CONFIG_DRM_PANEL_SHARP_LQ101R1SX01) += panel-sharp-lq101r1sx01.o
+diff --git a/drivers/gpu/drm/panel/panel-samsung-s6evr02.c b/drivers/gpu/drm/panel/panel-samsung-s6evr02.c
+new file mode 100644
+index 000000000000..f1612a6c262c
+--- /dev/null
+++ b/drivers/gpu/drm/panel/panel-samsung-s6evr02.c
+@@ -0,0 +1,764 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * MIPI-DSI based S6EVR02 AMOLED LCD 5.5 inch panel driver.
+ *
+ * Copyright (c) 2017 Simon Shields, <simon@lineageos.org>
+ *
+ * Based on the s6e8aa0 panel driver,
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd
+ *
+ * Inki Dae, <inki.dae@samsung.com>
+ * Donghwa Lee, <dh09.lee@samsung.com>
+ * Joongmock Shin <jmock.shin@samsung.com>
+ * Eunchul Kim <chulspro.kim@samsung.com>
+ * Tomasz Figa <t.figa@samsung.com>
+ * Andrzej Hajda <a.hajda@samsung.com>
+*/
+
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regulator/consumer.h>
+
+#include <linux/backlight.h>
+#include <video/mipi_display.h>
+#include <video/of_videomode.h>
+#include <video/videomode.h>
+
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_modes.h>
+#include <drm/drm_panel.h>
+
+#define UB_VERSION 0x10
+
+#define LDI_MTP_LENGTH			24
+#define GAMMA_LEVEL_NUM			33
+#define GAMMA_TABLE_LEN			34
+
+typedef u8 s6evr02_gamma_table[GAMMA_TABLE_LEN];
+
+#define S6EVR02_STATE_BIT_ENABLED	0
+
+struct s6evr02 {
+	struct device *dev;
+	struct drm_panel panel;
+
+	struct regulator_bulk_data supplies[2];
+	struct gpio_desc *reset_gpio;
+	u32 power_on_delay;
+	u32 reset_delay;
+	u32 init_delay;
+	struct videomode vm;
+	u32 width_mm;
+	u32 height_mm;
+
+	unsigned long state;
+	u8 version;
+	u8 id;
+	int brightness;
+
+	/* This field is tested by functions directly accessing DSI bus before
+	 * transfer, transfer is skipped if it is set. In case of transfer
+	 * failure or unexpected response the field is set to error value.
+	 * Such construct allows to eliminate many checks in higher level
+	 * functions.
+	 */
+	int error;
+};
+
+static const s6evr02_gamma_table s6evr02_gamma_tables[GAMMA_LEVEL_NUM] = {
+	{
+		/* 20cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x86, 0x87, 0x87,
+		0x86, 0x86, 0x85, 0x88, 0x8a, 0x88, 0x86, 0x85, 0x88, 0x75,
+		0x63, 0x83, 0x63, 0x60, 0x7d, 0x78, 0x85, 0xb8, 0x33, 0x3f,
+		0x2c, 0x02, 0x03, 0x02
+	}, {
+		/* 30cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x86, 0x87, 0x87,
+		0x86, 0x85, 0x84, 0x88, 0x8a, 0x87, 0x85, 0x84, 0x87, 0x80,
+		0x76, 0x85, 0x68, 0x60, 0x76, 0x78, 0x85, 0xb0, 0x33, 0x3f,
+		0x2c, 0x02, 0x03, 0x02
+	},  {
+		/* 40cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x85, 0x86, 0x87,
+		0x86, 0x86, 0x85, 0x87, 0x88, 0x86, 0x86, 0x85, 0x89, 0x80,
+		0x80, 0x83, 0x6a, 0x5c, 0x71, 0x77, 0x81, 0xaa, 0x37, 0x45,
+		0x2f, 0x02, 0x03, 0x02
+	},  {
+		/* 50cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x85, 0x86, 0x87,
+		0x85, 0x85, 0x84, 0x88, 0x89, 0x87, 0x84, 0x82, 0x86, 0x83,
+		0x84, 0x85, 0x6f, 0x63, 0x71, 0x7d, 0x81, 0xa5, 0x37, 0x45,
+		0x2f, 0x02, 0x03, 0x02
+	},  {
+		/* 60cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x85, 0x86, 0x87,
+		0x85, 0x85, 0x84, 0x86, 0x88, 0x85, 0x83, 0x81, 0x85, 0x81,
+		0x80, 0x83, 0x77, 0x69, 0x76, 0x7f, 0x81, 0xa0, 0x37, 0x45,
+		0x2f, 0x02, 0x03, 0x02
+	},  {
+		/* 70cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x84, 0x85, 0x86,
+		0x85, 0x85, 0x84, 0x87, 0x89, 0x87, 0x83, 0x81, 0x85, 0x81,
+		0x80, 0x83, 0x71, 0x64, 0x6f, 0x89, 0x88, 0xa3, 0x37, 0x45,
+		0x2f, 0x02, 0x03, 0x02
+	},  {
+		/* 80cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x84, 0x85, 0x86,
+		0x85, 0x85, 0x84, 0x86, 0x87, 0x85, 0x84, 0x82, 0x87, 0x81,
+		0x80, 0x83, 0x73, 0x66, 0x6f, 0x8a, 0x88, 0xa0, 0x37, 0x45,
+		0x2f, 0x02, 0x03, 0x02
+	},  {
+		/* 90cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x84, 0x85, 0x86,
+		0x85, 0x85, 0x84, 0x86, 0x87, 0x85, 0x81, 0x7f, 0x85, 0x7e,
+		0x7c, 0x80, 0x7a, 0x6d, 0x75, 0x8b, 0x88, 0x9e, 0x37, 0x45,
+		0x2f, 0x02, 0x03, 0x02
+	},  {
+		/* 100cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x84, 0x85, 0x86,
+		0x84, 0x83, 0x83, 0x87, 0x88, 0x86, 0x81, 0x7f, 0x85, 0x7e,
+		0x7c, 0x80, 0x7a, 0x70, 0x75, 0x86, 0x7d, 0x98, 0x3b, 0x4b,
+		0x33, 0x02, 0x03, 0x02
+	},  {
+		/* 102cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x84, 0x85, 0x86,
+		0x85, 0x85, 0x84, 0x86, 0x87, 0x85, 0x81, 0x7f, 0x85, 0x7e,
+		0x7c, 0x80, 0x7a, 0x70, 0x75, 0x94, 0x93, 0xa1, 0x33, 0x3f,
+		0x2c, 0x02, 0x03, 0x02
+	},  {
+		/* 104cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x84, 0x85, 0x86,
+		0x85, 0x85, 0x84, 0x86, 0x87, 0x85, 0x84, 0x82, 0x87, 0x81,
+		0x80, 0x83, 0x74, 0x6a, 0x6f, 0x94, 0x92, 0xa7, 0x33, 0x3f,
+		0x2c, 0x02, 0x03, 0x02
+	},  {
+		/* 106cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x84, 0x85, 0x86,
+		0x85, 0x85, 0x84, 0x87, 0x89, 0x87, 0x83, 0x81, 0x85, 0x81,
+		0x80, 0x83, 0x74, 0x6a, 0x6f, 0x95, 0x92, 0x9d, 0x33, 0x3f,
+		0x2c, 0x02, 0x03, 0x02
+	},  {
+		/* 108cd */
+		0xca, 0x00, 0xc1, 0x00, 0xba, 0x00, 0xbb, 0x85, 0x86, 0x87,
+		0x84, 0x84, 0x83, 0x87, 0x89, 0x87, 0x83, 0x81, 0x85, 0x81,
+		0x80, 0x83, 0x74, 0x6a, 0x6f, 0x95, 0x91, 0x9d, 0x33, 0x3f,
+		0x2c, 0x02, 0x03, 0x02
+	},  {
+		/* 110cd */
+		0xca, 0x00, 0xd8, 0x00, 0xd4, 0x00, 0xd3, 0x82, 0x84, 0x85,
+		0x82, 0x82, 0x81, 0x84, 0x85, 0x84, 0x82, 0x80, 0x83, 0x81,
+		0x82, 0x83, 0x7b, 0x75, 0x78, 0x85, 0x80, 0x8e, 0x2f, 0x39,
+		0x29, 0x02, 0x03, 0x02
+	},  {
+		/* 120cd */
+		0xca, 0x00, 0xdf, 0x00, 0xdb, 0x00, 0xda, 0x82, 0x83, 0x84,
+		0x81, 0x81, 0x80, 0x83, 0x83, 0x82, 0x82, 0x81, 0x83, 0x80,
+		0x80, 0x82, 0x7e, 0x7a, 0x7b, 0x86, 0x83, 0x8d, 0x2b, 0x34,
+		0x27, 0x02, 0x03, 0x02
+	}, {
+		/* 130cd */
+		0xca, 0x00, 0xe4, 0x00, 0xe0, 0x00, 0xe0, 0x82, 0x83, 0x84,
+		0x81, 0x80, 0x7f, 0x82, 0x82, 0x81, 0x83, 0x82, 0x84, 0x7e,
+		0x7f, 0x80, 0x7b, 0x76, 0x79, 0x86, 0x83, 0x8d, 0x2b, 0x34,
+		0x27, 0x02, 0x03, 0x02
+	},  {
+		/* 140cd */
+		0xca, 0x00, 0xe8, 0x00, 0xe5, 0x00, 0xe5, 0x81, 0x82, 0x82,
+		0x80, 0x80, 0x7f, 0x82, 0x82, 0x82, 0x81, 0x80, 0x82, 0x7f,
+		0x7f, 0x81, 0x7e, 0x7a, 0x7c, 0x81, 0x7d, 0x88, 0x2b, 0x34,
+		0x27, 0x02, 0x03, 0x02
+	},  {
+		/* 150cd */
+		0xca, 0x00, 0xec, 0x00, 0xea, 0x00, 0xe9, 0x81, 0x82, 0x82,
+		0x80, 0x80, 0x7f, 0x81, 0x82, 0x81, 0x81, 0x80, 0x81, 0x80,
+		0x80, 0x81, 0x7a, 0x77, 0x79, 0x87, 0x86, 0x8d, 0x84, 0x86,
+		0x83, 0x02, 0x03, 0x02
+	},  {
+		/* 160cd */
+		0xca, 0x00, 0xf1, 0x00, 0xef, 0x00, 0xef, 0x80, 0x80, 0x81,
+		0x80, 0x80, 0x7f, 0x80, 0x81, 0x80, 0x82, 0x81, 0x82, 0x7f,
+		0x7f, 0x7f, 0x7d, 0x7b, 0x7c, 0x82, 0x80, 0x88, 0x84, 0x86,
+		0x83, 0x02, 0x03, 0x02
+	},  {
+		/* 170cd */
+		0xca, 0x00, 0xf5, 0x00, 0xf3, 0x00, 0xf3, 0x80, 0x80, 0x81,
+		0x7f, 0x7f, 0x7f, 0x82, 0x82, 0x82, 0x80, 0x80, 0x80, 0x80,
+		0x80, 0x80, 0x80, 0x7f, 0x7f, 0x7d, 0x7b, 0x83, 0x84, 0x86,
+		0x83, 0x02, 0x03, 0x02
+	},  {
+		/* 180cd */
+		0xca, 0x00, 0xf9, 0x00, 0xf8, 0x00, 0xf8, 0x80, 0x80, 0x80,
+		0x7f, 0x7f, 0x7f, 0x7f, 0x80, 0x80, 0x81, 0x80, 0x81, 0x81,
+		0x81, 0x81, 0x7d, 0x7c, 0x7d, 0x83, 0x83, 0x87, 0x7f, 0x7f,
+		0x7f, 0x02, 0x03, 0x02
+	},  {
+		/* 182cd */
+		0xca, 0x00, 0xf2, 0x00, 0xf1, 0x00, 0xf0, 0x80, 0x81, 0x81,
+		0x80, 0x7f, 0x7f, 0x81, 0x81, 0x81, 0x81, 0x80, 0x81, 0x7f,
+		0x7f, 0x7f, 0x7d, 0x7b, 0x7c, 0x83, 0x81, 0x87, 0x84, 0x86,
+		0x83, 0x02, 0x03, 0x02
+	},  {
+		/* 184cd */
+		0xca, 0x00, 0xec, 0x00, 0xea, 0x00, 0xe9, 0x81, 0x82, 0x82,
+		0x7f, 0x7f, 0x7f, 0x81, 0x81, 0x81, 0x82, 0x81, 0x83, 0x7d,
+		0x7d, 0x7f, 0x7e, 0x7a, 0x7c, 0x82, 0x7f, 0x86, 0x2b, 0x34,
+		0x27, 0x02, 0x03, 0x02
+	},  {
+		/* 186cd */
+		0xca, 0x00, 0xe8, 0x00, 0xe4, 0x00, 0xe4, 0x81, 0x82, 0x83,
+		0x80, 0x80, 0x7f, 0x82, 0x82, 0x81, 0x80, 0x80, 0x81, 0x7e,
+		0x7f, 0x80, 0x7b, 0x76, 0x79, 0x87, 0x85, 0x8a, 0x2b, 0x34,
+		0x27, 0x02, 0x03, 0x02
+	},  {
+		/* 188cd */
+		0xca, 0x00, 0xe4, 0x00, 0xe0, 0x00, 0xe0, 0x81, 0x82, 0x83,
+		0x80, 0x80, 0x7f, 0x81, 0x82, 0x81, 0x80, 0x7f, 0x82, 0x80,
+		0x80, 0x82, 0x78, 0x72, 0x75, 0x8c, 0x8b, 0x90, 0x2b, 0x34,
+		0x27, 0x02, 0x03, 0x02
+	},  {
+		/* 190cd */
+		0xca, 0x00, 0xde, 0x00, 0xda, 0x00, 0xda, 0x81, 0x82, 0x83,
+		0x81, 0x81, 0x80, 0x83, 0x84, 0x82, 0x81, 0x80, 0x83, 0x7f,
+		0x7f, 0x81, 0x7b, 0x75, 0x78, 0x86, 0x82, 0x8b, 0x2f, 0x39,
+		0x29, 0x02, 0x03, 0x02
+	},  {
+		/* 200cd */
+		0xca, 0x00, 0xe3, 0x00, 0xdf, 0x00, 0xdf, 0x81, 0x82, 0x83,
+		0x80, 0x80, 0x7f, 0x81, 0x82, 0x81, 0x82, 0x81, 0x83, 0x80,
+		0x80, 0x82, 0x78, 0x72, 0x75, 0x86, 0x82, 0x8b, 0x2f, 0x39,
+		0x29, 0x02, 0x03, 0x02
+	},  {
+		/* 210cd */
+		0xca, 0x00, 0xe6, 0x00, 0xe3, 0x00, 0xe3, 0x81, 0x82, 0x82,
+		0x80, 0x7f, 0x7f, 0x81, 0x81, 0x81, 0x81, 0x80, 0x82, 0x7d,
+		0x7e, 0x7f, 0x7e, 0x7a, 0x7b, 0x87, 0x85, 0x8a, 0x2b, 0x34,
+		0x27, 0x02, 0x03, 0x02
+	},  {
+		/* 220cd */
+		0xca, 0x00, 0xea, 0x00, 0xe7, 0x00, 0xe6, 0x80, 0x80, 0x81,
+		0x80, 0x80, 0x7f, 0x81, 0x81, 0x81, 0x80, 0x80, 0x81, 0x7e,
+		0x7f, 0x80, 0x7b, 0x76, 0x79, 0x87, 0x85, 0x8a, 0x2b, 0x34,
+		0x27, 0x02, 0x03, 0x02
+	}, {
+		/* 230cd */
+		0xca, 0x00, 0xec, 0x00, 0xea, 0x00, 0xe9, 0x80, 0x81, 0x82,
+		0x7f, 0x7f, 0x7f, 0x80, 0x81, 0x80, 0x81, 0x80, 0x82, 0x7f,
+		0x7f, 0x81, 0x78, 0x73, 0x76, 0x87, 0x85, 0x8a, 0x2b, 0x34,
+		0x27, 0x02, 0x03, 0x02
+	},  {
+		/* 240cd */
+		0xca, 0x00, 0xef, 0x00, 0xed, 0x00, 0xed, 0x80, 0x80, 0x81,
+		0x80, 0x7f, 0x7f, 0x80, 0x81, 0x80, 0x7e, 0x7e, 0x7f, 0x7f,
+		0x7f, 0x81, 0x7e, 0x7a, 0x7c, 0x82, 0x7f, 0x85, 0x2b, 0x34,
+		0x27, 0x02, 0x03, 0x02
+	},  {
+		/* 250cd */
+		0xca, 0x00, 0xf2, 0x00, 0xf1, 0x00, 0xf0, 0x80, 0x80, 0x81,
+		0x7e, 0x7e, 0x7e, 0x80, 0x80, 0x80, 0x7f, 0x7f, 0x80, 0x80,
+		0x80, 0x81, 0x7a, 0x77, 0x79, 0x82, 0x7f, 0x85, 0x2b, 0x34,
+		0x27, 0x02, 0x03, 0x02
+	},  {
+		/* 300cd */
+		0xca, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x80, 0x7f, 0x7f,
+		0x7e, 0x7e, 0x7e, 0x7f, 0x7f, 0x7f, 0x7f, 0x80, 0x7f, 0x7f,
+		0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x80, 0x7f, 0x7f, 0x7f,
+		0x7f, 0x02, 0x03, 0x02
+	},
+};
+
+static inline struct s6evr02 *panel_to_s6evr02(struct drm_panel *panel)
+{
+	return container_of(panel, struct s6evr02, panel);
+}
+
+static int s6evr02_clear_error(struct s6evr02 *ctx)
+{
+	int ret = ctx->error;
+
+	ctx->error = 0;
+	return ret;
+}
+
+static void s6evr02_dcs_write(struct s6evr02 *ctx, const void *data, size_t len)
+{
+	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
+	ssize_t ret;
+
+	if (ctx->error < 0)
+		return;
+
+	ret = mipi_dsi_dcs_write_buffer(dsi, data, len);
+	if (ret < 0) {
+		dev_err(ctx->dev, "error %zd writing dcs seq: %*ph\n", ret,
+			(int)len, data);
+		ctx->error = ret;
+	}
+}
+
+static int s6evr02_read(struct s6evr02 *ctx, u8 cmd, void *data, size_t len)
+{
+	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
+	int ret;
+
+	if (ctx->error < 0)
+		return ctx->error;
+
+	ret = mipi_dsi_generic_read(dsi, &cmd, 1, data, len);
+	if (ret < 0) {
+		dev_err(ctx->dev, "error %d reading dcs seq(%#x)\n", ret, cmd);
+		ctx->error = ret;
+	}
+
+	return ret;
+}
+
+#define s6evr02_dcs_write_seq_static(ctx, seq...) \
+({\
+	static const u8 d[] = { seq };\
+	s6evr02_dcs_write(ctx, d, ARRAY_SIZE(d));\
+})
+
+static void s6evr02_apply_level_2_key(struct s6evr02 *ctx)
+{
+	s6evr02_dcs_write_seq_static(ctx, 0xf0, 0x5a, 0x5a);
+}
+
+static void s6evr02_etc_elvss_control(struct s6evr02 *ctx)
+{
+	s6evr02_dcs_write_seq_static(ctx, 0xb6, 0x08, 0x07);
+}
+
+static void s6evr02_aid_set(struct s6evr02 *ctx)
+{
+	u8 aid_cmd[] = {
+		0x51, 0xff, 0x00,
+	};
+
+	const u8 aid_arg[GAMMA_LEVEL_NUM] = {
+		0x28, 0x3c, 0x51, 0x66, 0x7d, 0x93, 0xab, 0xc2, /* 20-90cd */
+		0xda, 0xcd, 0xc0, 0xb3, 0xa6, 0x99, 0x99, 0x99, /* 100-130cd */
+		0x99, 0x99, 0x99, 0x99, 0x99, 0xad, 0xc2, 0xd6, /* 140-186cd */
+		0xea, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 188-250cd */
+		0xff, /* 300cd */
+	};
+
+	if (ctx->error)
+		return;
+
+	aid_cmd[2] = aid_arg[ctx->brightness];
+
+	s6evr02_dcs_write(ctx, aid_cmd, ARRAY_SIZE(aid_cmd));
+}
+
+static void s6evr02_acl_set(struct s6evr02 *ctx)
+{
+	u8 acl_seq[] = {0x55, 0x02, 0x00};
+	if (ctx->error)
+		return;
+
+	switch (ctx->brightness) {
+	case 0:
+		acl_seq[1] = 0x00;
+		break;
+	case 1:
+		acl_seq[1] = 0x01;
+		break;
+	}
+
+	s6evr02_dcs_write(ctx, acl_seq, ARRAY_SIZE(acl_seq));
+}
+
+static void s6evr02_elvss_set(struct s6evr02 *ctx)
+{
+	u8 elvss_cmd[] = {
+		0xb6, 0x08, 0x00,
+	};
+
+	const u8 elvss_arg[GAMMA_LEVEL_NUM] = {
+		0x20, 0x20, 0x20, 0x1f, 0x1f, 0x1f, 0x1e, 0x1c, /* 20-100cd */
+		0x1c, 0x1c, 0x1c, 0x1c, 0x1b, 0x19, 0x17, 0x16, /* 102-140cd */
+		0x14, 0x12, 0x10, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, /* 150-188cd */
+		0x15, 0x14, 0x13, 0x12, 0x11, 0x10, 0x10, 0x0b, /* 190-300cd */
+	};
+
+	if (ctx->error)
+		return;
+
+	elvss_cmd[2] = elvss_arg[ctx->brightness];
+
+	s6evr02_dcs_write(ctx, elvss_cmd, ARRAY_SIZE(elvss_cmd));
+}
+
+
+static void s6evr02_brightness_set(struct s6evr02 *ctx)
+{
+	const u8 *gamma;
+
+	if (ctx->error)
+		return;
+
+	gamma = s6evr02_gamma_tables[ctx->brightness];
+
+	s6evr02_dcs_write(ctx, gamma, GAMMA_TABLE_LEN);
+
+	/* apply gamma table update. */
+	s6evr02_dcs_write_seq_static(ctx, 0xf7, 0x03, 0x00);
+
+	s6evr02_aid_set(ctx);
+	s6evr02_acl_set(ctx);
+	s6evr02_elvss_set(ctx);
+}
+
+static void s6evr02_gamma_cond_set(struct s6evr02 *ctx)
+{
+	s6evr02_dcs_write_seq_static(ctx,
+			0xca, 0x01, 0x27, 0x01, 0x3d, 0x01, 0x47, 0xd1, 0xd7, 0xd1,
+			0xca, 0xce, 0xcc, 0xc4, 0xb3, 0xb1, 0xa1, 0xb9, 0xb8, 0xa2,
+			0xce, 0xba, 0xc8, 0xc9, 0xad, 0x9b, 0x85, 0x53, 0x6a, 0x7e,
+			0xe3, 0x09, 0x09, 0x0b);
+}
+
+static void s6evr02_gamma_update(struct s6evr02 *ctx)
+{
+	s6evr02_dcs_write_seq_static(ctx, 0xf7, 0x03, 0x00);
+}
+
+static void s6evr02_brightness_control_on(struct s6evr02 *ctx)
+{
+	s6evr02_dcs_write_seq_static(ctx, 0x53, 0x20, 0x00);
+}
+
+static void s6evr02_aor_control(struct s6evr02 *ctx)
+{
+	s6evr02_dcs_write_seq_static(ctx, 0x51, 0xff, 0x00);
+}
+
+static void s6evr02_acl_off(struct s6evr02 *ctx)
+{
+	s6evr02_dcs_write_seq_static(ctx, 0x55, 0x00, 0x00);
+}
+
+static void s6evr02_panel_init(struct s6evr02 *ctx)
+{
+	s6evr02_apply_level_2_key(ctx);
+	s6evr02_dcs_write_seq_static(ctx, MIPI_DCS_EXIT_SLEEP_MODE);
+	msleep(20);
+
+	if (ctx->version == UB_VERSION) {
+		s6evr02_gamma_cond_set(ctx);
+		s6evr02_gamma_update(ctx);
+	}
+
+	s6evr02_brightness_control_on(ctx);
+	s6evr02_aor_control(ctx);
+	s6evr02_etc_elvss_control(ctx);
+	s6evr02_acl_off(ctx);
+}
+
+static void s6evr02_set_maximum_return_packet_size(struct s6evr02 *ctx,
+						   u16 size)
+{
+	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
+	int ret;
+
+	if (ctx->error < 0)
+		return;
+
+	ret = mipi_dsi_set_maximum_return_packet_size(dsi, size);
+	if (ret < 0) {
+		dev_err(ctx->dev,
+			"error %d setting maximum return packet size to %d\n",
+			ret, size);
+		ctx->error = ret;
+	}
+}
+
+static void s6evr02_read_mtp_id(struct s6evr02 *ctx)
+{
+	u8 id[3] = {0, 0, 0};
+	int ret;
+
+	/* the panel seems not to respond properly
+	 * to read commands until we write something to it
+	 */
+	s6evr02_apply_level_2_key(ctx);
+
+	ret = s6evr02_read(ctx, 0xd7, id, ARRAY_SIZE(id));
+	if (ret < 0 || ret < ARRAY_SIZE(id) || id[0] == 0x00) {
+		dev_err(ctx->dev, "failed to read ID from panel\n");
+		ctx->error = -EIO;
+		return;
+	}
+
+	dev_info(ctx->dev, "ID: 0x%2x, 0x%2x, 0x%2x\n", id[0], id[1], id[2]);
+
+	ctx->version = id[1];
+	ctx->id = id[2];
+}
+
+static void s6evr02_set_sequence(struct s6evr02 *ctx)
+{
+	s6evr02_set_maximum_return_packet_size(ctx, 3);
+	s6evr02_read_mtp_id(ctx);
+	s6evr02_panel_init(ctx);
+	s6evr02_dcs_write_seq_static(ctx, MIPI_DCS_SET_DISPLAY_ON);
+}
+
+static int s6evr02_power_on(struct s6evr02 *ctx)
+{
+	int ret;
+
+	ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
+	if (ret < 0)
+		return ret;
+
+	msleep(ctx->power_on_delay);
+
+	gpiod_set_value(ctx->reset_gpio, 0);
+	usleep_range(5000, 6000);
+	gpiod_set_value(ctx->reset_gpio, 1);
+	usleep_range(5000, 6000);
+
+	msleep(ctx->reset_delay);
+
+	return 0;
+}
+
+static int s6evr02_power_off(struct s6evr02 *ctx)
+{
+	return regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
+}
+
+static int s6evr02_disable(struct drm_panel *panel)
+{
+	return 0;
+}
+
+static int s6evr02_unprepare(struct drm_panel *panel)
+{
+	struct s6evr02 *ctx = panel_to_s6evr02(panel);
+
+	clear_bit(S6EVR02_STATE_BIT_ENABLED, &ctx->state);
+	s6evr02_dcs_write_seq_static(ctx, MIPI_DCS_SET_DISPLAY_OFF);
+	s6evr02_dcs_write_seq_static(ctx, MIPI_DCS_ENTER_SLEEP_MODE);
+	msleep(40);
+
+	s6evr02_clear_error(ctx);
+
+	return s6evr02_power_off(ctx);
+}
+
+static int s6evr02_prepare(struct drm_panel *panel)
+{
+	struct s6evr02 *ctx = panel_to_s6evr02(panel);
+	int ret;
+
+	ret = s6evr02_power_on(ctx);
+	if (ret < 0)
+		return ret;
+
+	s6evr02_set_sequence(ctx);
+	ret = ctx->error;
+
+	if (ret < 0)
+		s6evr02_unprepare(panel);
+	else
+		set_bit(S6EVR02_STATE_BIT_ENABLED, &ctx->state);
+
+	return ret;
+}
+
+static int s6evr02_enable(struct drm_panel *panel)
+{
+	return 0;
+}
+
+static int s6evr02_get_modes(struct drm_panel *panel,
+			     struct drm_connector *connector)
+{
+	struct s6evr02 *ctx = panel_to_s6evr02(panel);
+	struct drm_display_mode *mode;
+
+	mode = drm_mode_create(connector->dev);
+	if (!mode) {
+		dev_err(panel->dev, "failed to create a new display mode\n");
+		return 0;
+	}
+
+	drm_display_mode_from_videomode(&ctx->vm, mode);
+	mode->width_mm = ctx->width_mm;
+	mode->height_mm = ctx->height_mm;
+	connector->display_info.width_mm = mode->width_mm;
+	connector->display_info.height_mm = mode->height_mm;
+
+	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
+	drm_mode_probed_add(connector, mode);
+
+	return 1;
+}
+
+static const struct drm_panel_funcs s6evr02_drm_funcs = {
+	.disable = s6evr02_disable,
+	.unprepare = s6evr02_unprepare,
+	.prepare = s6evr02_prepare,
+	.enable = s6evr02_enable,
+	.get_modes = s6evr02_get_modes,
+};
+
+static int s6evr02_get_brightness(struct backlight_device *bd)
+{
+	return bd->props.brightness;
+}
+
+static int s6evr02_set_brightness(struct backlight_device *bd)
+{
+	struct s6evr02 *ctx = bl_get_data(bd);
+
+	bd->props.power = FB_BLANK_UNBLANK;
+	if (ctx->brightness != bd->props.brightness) {
+		ctx->brightness = bd->props.brightness;
+		if (test_bit(S6EVR02_STATE_BIT_ENABLED, &ctx->state))
+			s6evr02_brightness_set(ctx);
+	}
+
+	return s6evr02_clear_error(ctx);
+}
+
+static const struct backlight_ops s6evr02_backlight_ops = {
+	.get_brightness = s6evr02_get_brightness,
+	.update_status = s6evr02_set_brightness,
+};
+
+static void s6evr02_backlight_register(struct s6evr02 *ctx)
+{
+	struct backlight_properties props = {
+		.type = BACKLIGHT_RAW,
+		.brightness = ctx->brightness,
+		.max_brightness = GAMMA_LEVEL_NUM - 1
+	};
+	struct device *dev = ctx->dev;
+	struct backlight_device *bd;
+
+	bd = devm_backlight_device_register(dev, "panel", dev, ctx,
+					    &s6evr02_backlight_ops, &props);
+	if (IS_ERR(bd))
+		dev_err(dev, "error registering backlight device (%ld)\n",
+			PTR_ERR(bd));
+}
+
+static int s6evr02_parse_dt(struct s6evr02 *ctx)
+{
+	struct device *dev = ctx->dev;
+	struct device_node *np = dev->of_node;
+	int ret;
+
+	ret = of_get_videomode(np, &ctx->vm, 0);
+	if (ret < 0)
+		return ret;
+
+	of_property_read_u32(np, "power-on-delay", &ctx->power_on_delay);
+	of_property_read_u32(np, "reset-delay", &ctx->reset_delay);
+	of_property_read_u32(np, "init-delay", &ctx->init_delay);
+	of_property_read_u32(np, "panel-width-mm", &ctx->width_mm);
+	of_property_read_u32(np, "panel-height-mm", &ctx->height_mm);
+
+	return 0;
+}
+
+static int s6evr02_probe(struct mipi_dsi_device *dsi)
+{
+	struct device *dev = &dsi->dev;
+	struct s6evr02 *ctx;
+	int ret = 0;
+
+	ctx = devm_kzalloc(dev, sizeof(struct s6evr02), GFP_KERNEL);
+	if (!ctx)
+		return -ENOMEM;
+
+	pr_err("s6evr02 probing\n");
+
+	mipi_dsi_set_drvdata(dsi, ctx);
+
+	ctx->dev = dev;
+
+	dsi->lanes = 4;
+	dsi->format = MIPI_DSI_FMT_RGB888;
+	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST
+		| MIPI_DSI_MODE_VIDEO_NO_HFP | MIPI_DSI_MODE_VIDEO_NO_HBP
+		| MIPI_DSI_MODE_VIDEO_NO_HSA | MIPI_DSI_MODE_NO_EOT_PACKET
+		| MIPI_DSI_MODE_VSYNC_FLUSH | MIPI_DSI_MODE_VIDEO_AUTO_VERT;
+
+	ret = s6evr02_parse_dt(ctx);
+	if (ret < 0)
+		return ret;
+
+	ctx->supplies[0].supply = "vdd3";
+	ctx->supplies[1].supply = "vci";
+	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies),
+				      ctx->supplies);
+	if (ret < 0) {
+		dev_err(dev, "failed to get regulators: %d\n", ret);
+		return ret;
+	}
+
+	ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
+	if (IS_ERR(ctx->reset_gpio)) {
+		dev_err(dev, "cannot get reset-gpios %ld\n",
+			PTR_ERR(ctx->reset_gpio));
+		return PTR_ERR(ctx->reset_gpio);
+	}
+
+	ctx->brightness = GAMMA_LEVEL_NUM - 1;
+
+	drm_panel_init(&ctx->panel, dev, &s6evr02_drm_funcs, DRM_MODE_CONNECTOR_DSI);
+
+	drm_panel_add(&ctx->panel);
+
+	ret = mipi_dsi_attach(dsi);
+	if (ret < 0)
+		drm_panel_remove(&ctx->panel);
+
+	s6evr02_backlight_register(ctx);
+
+	return ret;
+}
+
+static int s6evr02_remove(struct mipi_dsi_device *dsi)
+{
+	struct s6evr02 *ctx = mipi_dsi_get_drvdata(dsi);
+
+	mipi_dsi_detach(dsi);
+	drm_panel_remove(&ctx->panel);
+
+	return 0;
+}
+
+static const struct of_device_id s6evr02_of_match[] = {
+	{ .compatible = "samsung,s6evr02" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, s6evr02_of_match);
+
+static struct mipi_dsi_driver s6evr02_driver = {
+	.probe = s6evr02_probe,
+	.remove = s6evr02_remove,
+	.driver = {
+		.name = "panel-samsung-s6evr02",
+		.of_match_table = s6evr02_of_match,
+	},
+};
+module_mipi_dsi_driver(s6evr02_driver);
+
+MODULE_AUTHOR("Simon Shields <simon@lineageos.org>");
+MODULE_AUTHOR("Donghwa Lee <dh09.lee@samsung.com>");
+MODULE_AUTHOR("Inki Dae <inki.dae@samsung.com>");
+MODULE_AUTHOR("Joongmock Shin <jmock.shin@samsung.com>");
+MODULE_AUTHOR("Eunchul Kim <chulspro.kim@samsung.com>");
+MODULE_AUTHOR("Tomasz Figa <t.figa@samsung.com>");
+MODULE_AUTHOR("Andrzej Hajda <a.hajda@samsung.com>");
+MODULE_DESCRIPTION("MIPI-DSI based s6evr02 AMOLED LCD Panel Driver");
+MODULE_LICENSE("GPL v2");
+
+-- 
+2.38.0
+
@@ -1,7 +1,7 @@
-From 287d9f4f38c2710b5a8cd384ffe1f05ca10761b0 Mon Sep 17 00:00:00 2001
+From bcbebd252712b9c49d0221c58c87ad48c97d1da8 Mon Sep 17 00:00:00 2001
 From: Jack Knightly <J__A__K@hotmail.com>
 Date: Fri, 14 Oct 2022 20:59:44 +0200
-Subject: [PATCH 08/11] samsung-t0lte: add leds
+Subject: [PATCH 09/13] samsung-t0lte: add leds

 Adds flash/torch LED for samsung-t0lte

@@ -13,7 +13,7 @@ samsung-m3).
 2 files changed, 51 insertions(+), 1 deletion(-)

 diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
-index 1f9cd7474b16..3d6faa222f1d 100644
+index 3167c51b6296..5d24b08d99d4 100644
 --- a/arch/arm/boot/dts/exynos4412-midas.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
@@ -18,6 +18,7 @@
@@ -108,5 +108,5 @@ index da0e475b1063..739aa0080e3f 100644
 	standby-gpios = <&gpm0 6 GPIO_ACTIVE_LOW>;   /* ISP_STANDBY */
 	vdda-supply = <&cam_vdda_reg>;
 -- 
-2.38.1
+2.38.0

@@ -1,7 +1,7 @@
-From c5fb774025229eae5660a2690273edd6a5936acf Mon Sep 17 00:00:00 2001
+From 646a1191b49fb99a8f6fbc219d45a0611dee1fa4 Mon Sep 17 00:00:00 2001
 From: Newbyte <newbie13xd@gmail.com>
 Date: Thu, 24 Mar 2022 11:25:26 +0100
-Subject: [PATCH 10/11] drm: Allow DRM_IOCTL_MODE_CREATE_DUMB on render nodes
+Subject: [PATCH 10/13] drm: Allow DRM_IOCTL_MODE_CREATE_DUMB on render nodes

 Due to a change in Mesa, the render node ends up being picked
 instead of the primary node when using Exynos DRM kmsro. In turn,
@@ -15,10 +15,10 @@ Mesa issue: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5510
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
-index ca2a6e6101dc..233b218f8cc8 100644
+index 8faad23dc1d8..484112b89b01 100644
 --- a/drivers/gpu/drm/drm_ioctl.c
 +++ b/drivers/gpu/drm/drm_ioctl.c
-@@ -678,7 +678,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
+@@ -672,7 +672,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb_ioctl, 0),
 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_PAGE_FLIP, drm_mode_page_flip_ioctl, DRM_MASTER),
 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl, DRM_MASTER),
@@ -28,5 +28,5 @@ index ca2a6e6101dc..233b218f8cc8 100644
 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DESTROY_DUMB, drm_mode_destroy_dumb_ioctl, 0),
 	DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_GETPROPERTIES, drm_mode_obj_get_properties_ioctl, 0),
 -- 
-2.38.1
+2.38.0

@@ -1,7 +1,7 @@
-From 19e91cc7749e0e96486f0bef43a5b5661f2899be Mon Sep 17 00:00:00 2001
+From 6531c5f16815c169316c30d4b4f46690cf38bb79 Mon Sep 17 00:00:00 2001
 From: Oliver Smith <ollieparanoid@postmarketos.org>
 Date: Thu, 1 Sep 2022 21:56:03 +0200
-Subject: [PATCH 11/11] ARM: dts: exynos: disable HDMI on Midas
+Subject: [PATCH 11/13] ARM: dts: exynos: disable HDMI on Midas

 Disable it as workaround because when unplugged, HDMI appears as
 DRM_MNODE_CONNECTED with a surface are of 0x0.
@@ -12,7 +12,7 @@ Related: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/828
 1 file changed, 6 insertions(+)

 diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
-index 3d6faa222f1d..41cae9a4f708 100644
+index 5d24b08d99d4..f0b4680b1366 100644
 --- a/arch/arm/boot/dts/exynos4412-midas.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
@@ -308,11 +308,13 @@ sii9234: hdmi-bridge@39 {
@@ -59,5 +59,5 @@ index 3d6faa222f1d..41cae9a4f708 100644
 	sleep1: sleep-state {
 		PIN_SLP(gpk0-0, PREV, NONE);
 -- 
-2.38.1
+2.38.0

@@ -0,0 +1,35 @@
+From 9b9aa2e1c6229f60abe78be51935c38d936280e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20J=C3=BCcker?= <martin.juecker@gmail.com>
+Date: Mon, 16 May 2022 21:37:07 +0200
+Subject: [PATCH 12/13] dt-bindings: display: simple: add support for Samsung
+ LTL101AL01
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add the Samsung LTL101AL01 WXGA LCD panel to the list.
+
+Signed-off-by: Martin Jücker <martin.juecker@gmail.com>
+Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220516193709.10037-1-martin.juecker@gmail.com
+---
+ .../devicetree/bindings/display/panel/panel-simple.yaml         | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Documentation/devicetree/bindings/display/panel/panel-simple.yaml b/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
+index bc8e9c0c1dc3..133f2bae04b5 100644
+--- a/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
+++ b/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
+@@ -280,6 +280,8 @@ properties:
+       - samsung,atna33xc20
+         # Samsung 12.2" (2560x1600 pixels) TFT LCD panel
+       - samsung,lsn122dl01-c01
+        # Samsung Electronics 10.1" WXGA (1280x800) TFT LCD panel
+      - samsung,ltl101al01
+         # Samsung Electronics 10.1" WSVGA TFT LCD panel
+       - samsung,ltn101nt05
+         # Samsung Electronics 14" WXGA (1366x768) TFT LCD panel
+-- 
+2.38.0
+
@@ -0,0 +1,73 @@
+From 169cdd37755c6e6a3c1763cd306bce3af9f93104 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20J=C3=BCcker?= <martin.juecker@gmail.com>
+Date: Mon, 16 May 2022 21:37:08 +0200
+Subject: [PATCH 13/13] drm/panel: simple: add support for the Samsung
+ LTL101AL01 panel
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add timings and panel description for the Samsung LTL101AL01 panel.
+
+Signed-off-by: Martin Jücker <martin.juecker@gmail.com>
+Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220516193709.10037-2-martin.juecker@gmail.com
+---
+ drivers/gpu/drm/panel/panel-simple.c | 34 ++++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+
+diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
+index 1e716c23019a..81ae91435c1e 100644
+--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
+@@ -3220,6 +3220,37 @@ static const struct panel_desc rocktech_rk101ii01d_ct = {
+ 	.connector_type = DRM_MODE_CONNECTOR_LVDS,
+ };
+ 
+static const struct display_timing samsung_ltl101al01_timing = {
+	.pixelclock = { 66663000, 66663000, 66663000 },
+	.hactive = { 1280, 1280, 1280 },
+	.hfront_porch = { 18, 18, 18 },
+	.hback_porch = { 36, 36, 36 },
+	.hsync_len = { 16, 16, 16 },
+	.vactive = { 800, 800, 800 },
+	.vfront_porch = { 4, 4, 4 },
+	.vback_porch = { 16, 16, 16 },
+	.vsync_len = { 3, 3, 3 },
+	.flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW,
+};
+
+static const struct panel_desc samsung_ltl101al01 = {
+	.timings = &samsung_ltl101al01_timing,
+	.num_timings = 1,
+	.bpc = 8,
+	.size = {
+		.width = 217,
+		.height = 135,
+	},
+	.delay = {
+		.prepare = 40,
+		.enable = 300,
+		.disable = 200,
+		.unprepare = 600,
+	},
+	.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
+	.connector_type = DRM_MODE_CONNECTOR_LVDS,
+};
+
+ static const struct drm_display_mode samsung_ltn101nt05_mode = {
+ 	.clock = 54030,
+ 	.hdisplay = 1024,
+@@ -4163,6 +4194,9 @@ static const struct of_device_id platform_of_match[] = {
+ 	}, {
+ 		.compatible = "rocktech,rk101ii01d-ct",
+ 		.data = &rocktech_rk101ii01d_ct,
+	}, {
+		.compatible = "samsung,ltl101al01",
+		.data = &samsung_ltl101al01,
+ 	}, {
+ 		.compatible = "samsung,ltn101nt05",
+ 		.data = &samsung_ltn101nt05,
+-- 
+2.38.0
+
@@ -3,8 +3,8 @@
 # Kernel config based on: arch/arm/configs/exynos_defconfig

 pkgname=linux-postmarketos-exynos4
-pkgver=6.1
-pkgrel=3
+pkgver=6.0.2
+pkgrel=2
 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices"
 arch="armv7"
 _carch="arm"
@@ -46,10 +46,12 @@ source="
 	0005-power_supply-max77693-Listen-for-cable-events-and-en.patch
 	0006-mfd-max77693-Add-defines-for-charger-current-control.patch
 	0007-power_supply-max77693-change-the-supply-type-to-POWE.patch
-	0008-samsung-t0lte-add-leds.patch
-	0009-Add-display-support-for-Samsung-Galaxy-Note-2-GT-N71.patch
+	0008-Add-s6evr02-panel.patch
+	0009-samsung-t0lte-add-leds.patch
 	0010-drm-Allow-DRM_IOCTL_MODE_CREATE_DUMB-on-render-nodes.patch
 	0011-ARM-dts-exynos-disable-HDMI-on-Midas.patch
+	0012-dt-bindings-display-simple-add-support-for-Samsung-L.patch
+	0013-drm-panel-simple-add-support-for-the-Samsung-LTL101A.patch
 	initramfs.list
 	init
 "
@@ -71,10 +73,8 @@ prepare() {

 build() {
 	unset LDFLAGS
-	# V=1: workaround for pma#1990
 	make ARCH="$_carch" CC="${CC:-gcc}" KCFLAGS="-Wno-array-bounds" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
-		V=1
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
 }

 package() {
@@ -91,19 +91,21 @@ package() {
 }

 sha512sums="
-6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68  linux-6.1.tar.xz
-334da503f8b088b0a7f51b9a45a490a8f22fa620c235815d93d2cc9da04c355276a67f5ad32f6e7f4459905b5ecba663c60ff4f325f2fc7fe027b4ea04e90d2a  config-postmarketos-exynos4.armv7
-b65a114f5dd7e62e96e48c5ae59a377999aead19d8dcc79f81e8eb533d97bb131779165b66878135185c6f235a66bd7b1908021b21e713ed79bc3c6e0e3b4d5f  0001-ARM-decompressor-Flush-tlb-before-swiching-domain-0-.patch
-4de1c0c359b85ba0bb99a17b19fe795c3f3486785f1e14249da07b9f168b2e5b92e61ad5657a0332c95866032598ba0df0795580970ae2b4e73f8a6b1286ba4b  0002-ARM-dts-exynos-Add-reboot-modes-to-midas.patch
-7956323f9a22e1cd5ed2a877b117ff4bb5ab6188dc7953e6b6a874d66192ea7c34df32969153dabe0070b40de080871b8fd1282b8d49f19014dabc91b267c679  0003-mmc-core-Workaround-VTU00M-0xf1-FTL-metadata-corrupt.patch
-be042b8a949c26a4c0ee720b8622cf6d06f9532c35bb62a7c349f9306cd750504f8c858e1a5924f0dc261a3d52fb61077e5225f34257e3bd2b623ad014243f2d  0004-drivers-drm-Add-backlight-control-support-for-s6e8aa.patch
-c35ce1e5619a18ebf9a0f39bfff129e77fb051fe680f01fe2603c64a4f656992f42e3033fa27508caea705b8d5b7fe192ddc6983cc408fe053cf8fe18dda2cc8  0005-power_supply-max77693-Listen-for-cable-events-and-en.patch
-0301616fb5d4b6ccdca330e7888bbe9ca3cf0c8a448523f361bd3520d9fb3874343fd2c64e2bb5f84a9ab2c3364d86fc948a667a2e367852b46e37f0e2d8bac7  0006-mfd-max77693-Add-defines-for-charger-current-control.patch
-e23725aae447c847a467a06e8cfeb759fe1b3f9915f61cca6ead8cc2392370015939e9d93e97c88764221bb7ee0b407780308718e199ec779809cffa2319ad77  0007-power_supply-max77693-change-the-supply-type-to-POWE.patch
-2b991f210505ed430aaa4388069368824a394d55c7f62f20fb7d1fe20a512b785b5ca2208385d636dfc634b16e0ef8164bb95370e5bff43110356efb8f0faf23  0008-samsung-t0lte-add-leds.patch
-cb8b78a472759fab3fbba22be4969d5e0e6ee67af23a224b51075dcab68bad64e6ac31e159d490bbef10ff5c5dda14cb2b40073ea7da783a29e89a534b4d5606  0009-Add-display-support-for-Samsung-Galaxy-Note-2-GT-N71.patch
-2b62597047c3f217513803b601923c3556ee51beddf6e24ae25b5b48a51aa1050107bd3fdd963bace0809a5f6d488e2285c8ca43c0ba47b48bad2f439b536fb8  0010-drm-Allow-DRM_IOCTL_MODE_CREATE_DUMB-on-render-nodes.patch
-40d24ae8fa64c934e688f7473cbdee979b5acab8f7c0bf3434bbc23b4159e29c939d62f0a896301dd15814296270d54454378cd75de5a778d1426f457c9386fb  0011-ARM-dts-exynos-disable-HDMI-on-Midas.patch
+cee8ce158881ef84d475befec58f21f3e5e71e760b012db597204c5693501ec0de2904957ccbc6156bcc697125a44c45fdb0e9d11c844d245eab455b858944f0  linux-6.0.2.tar.xz
+3a23d005377877c4699c932a0f0f07d09152d4fe5d76264185589bea5c837aacdf46d03a113474c97cdd1ef1a20b811580e912d003c8dae98dbad4cbf1c3594c  config-postmarketos-exynos4.armv7
+1d2090c9d907674ec9e6b56d030b0f59d62b73e083689695ef61fd3354b1fe86b24ccb3c518b2d36034f1636beb221e9a19c9cbef283f2652cc8d444a4fa7528  0001-ARM-decompressor-Flush-tlb-before-swiching-domain-0-.patch
+8c7acab8e186441a23c80bb851658c3df69ec1e94ed6b4d546afe572609cbc350a6cd55cc7343656095a0f55fee0505c40b6de7642d367502561a26f600137e3  0002-ARM-dts-exynos-Add-reboot-modes-to-midas.patch
+f0295c808a2ec171976aaef137f2de0b7136e69cb342fd4b514af5b67e321e7e5779204e6d60d71e3213507113e2ec6e11bfcb0de2085b2085d226cbae2cdede  0003-mmc-core-Workaround-VTU00M-0xf1-FTL-metadata-corrupt.patch
+2afb42133f982aaadc3f7dc302be72d08768eeca4c3d5f8c921deeaf2c86769f1ec78fed9d89a37cd0bf55e946b04be320c6ee153ffb13fb9d1093a044cc62e1  0004-drivers-drm-Add-backlight-control-support-for-s6e8aa.patch
+05e3af8b5afd8aeeb92d624ec00201e32117dd25042e93a9cd854981313e62751f6542b1e5508b2c93bd8c880b0017ddbdf1fdb334d06ea6c5d95188269746b7  0005-power_supply-max77693-Listen-for-cable-events-and-en.patch
+d73446daac3e090ba26f5123b0f01247f3f30a0ed999eb98498b13d299a409c433edaca2a40914be353f01a3a96a74cb4b1ced5354e45315a6e9b278452cfe0f  0006-mfd-max77693-Add-defines-for-charger-current-control.patch
+06c912720d682f9c520d570a1bb4f0134ae3c4807afcacbb26b204af75c48377edc7856e7eed3a96a298aa1f225c23f73832c47e13b92d750408d97a77964fed  0007-power_supply-max77693-change-the-supply-type-to-POWE.patch
+6121ef0207ed40f6c984c0038fe165f46daf5457e64098e7d4d2ae7b1a3a2ae99c12b4555d74c441d2d6d321e147e4d59f2db54de9f06415608bb1b29ae5e15a  0008-Add-s6evr02-panel.patch
+1ad79107f5313329fbdf5cf03fed7d154cd2ae18a70d0311fe2350b1a43df78224f216b4f0513f7e8ce2c5006c384cc27e5dd93045bc2b07f2ca4aad41292b5a  0009-samsung-t0lte-add-leds.patch
+3a99dc2b60d32668b58e4803f7ef7f907e330d11e9aa1f9dbf83abdea13c9618847f05527ddc7ada123f490fb8184016c7195db27b12431e744eabccd01a7c88  0010-drm-Allow-DRM_IOCTL_MODE_CREATE_DUMB-on-render-nodes.patch
+b4d3f65575485ce703965430efaac6a8dccbab1cb05614da07b09cbe8bce164f85c996f78a740c87745565f4f19c20c174a89527bd3d1acf578f8e3f76245164  0011-ARM-dts-exynos-disable-HDMI-on-Midas.patch
+e72abd7018ef3db5a3af3246bf2542e1935dac4ade05a3a5f6f1adfc3bc590a55f345dcd17cd83960ed601e782c4a8d531577b5fe49017433a6939339bdcd4cb  0012-dt-bindings-display-simple-add-support-for-Samsung-L.patch
+59acf1de6a4071a4d4b64a9136bf950bd45d53ff272ec3eb9cb15ec772ded76f9feb16cec206aa50264332f7d832a06afcd831dd3474d565af497c5e2ae2b214  0013-drm-panel-simple-add-support-for-the-Samsung-LTL101A.patch
 aaff0332b90e1f9f62de1128cace934717336e54ab09de46477369fa808302482d97334e43a85ee8597c1bcab64d3484750103559fea2ce8cd51776156bf7591  initramfs.list
 09f1f214a24300696809727a7b04378887c06ca6f40803ca51a12bf2176a360b2eb8632139d6a0722094e05cb2038bdb04018a1e3d33fc2697674552ade03bee  init
 "
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.1.0 Kernel Configuration
+# Linux/arm 6.0.2 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r9) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r4) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24000
+CONFIG_AS_VERSION=23900
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24000
+CONFIG_LD_VERSION=23900
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -93,10 +93,8 @@ CONFIG_HAVE_EBPF_JIT=y
 #
 # BPF subsystem
 #
-CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_SYSCALL is not set
 # CONFIG_BPF_JIT is not set
-CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
-# CONFIG_BPF_PRELOAD is not set
 # end of BPF subsystem

 CONFIG_PREEMPT_BUILD=y
@@ -129,9 +127,6 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
-CONFIG_TASKS_RCU_GENERIC=y
-CONFIG_TASKS_RCU=y
-CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
 # end of RCU Subsystem
@@ -156,6 +151,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
@@ -171,7 +167,6 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
 # CONFIG_CGROUP_MISC is not set
 CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_NAMESPACES=y
@@ -253,6 +248,7 @@ CONFIG_SYSTEM_DATA_VERIFICATION=y

 CONFIG_ARM=y
 CONFIG_ARM_HAS_GROUP_RELOCS=y
+CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -274,9 +270,11 @@ CONFIG_MMU=y
 CONFIG_ARCH_MMAP_RND_BITS_MIN=8
 CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 CONFIG_ARCH_MULTIPLATFORM=y
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_SA1100 is not set

 #
-# Platform selection
+# Multiple platform selection
 #

 #
@@ -285,7 +283,7 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_MULTI_V6 is not set
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
-# end of Platform selection
+# end of Multiple platform selection

 # CONFIG_ARCH_VIRT is not set
 # CONFIG_ARCH_AIROHA is not set
@@ -473,7 +471,7 @@ CONFIG_HIGHPTE=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_ARM_MODULE_PLTS=y
-CONFIG_ARCH_FORCE_MAX_ORDER=11
+CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 # CONFIG_PARAVIRT is not set
@@ -599,6 +597,24 @@ CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # end of Power management options

+CONFIG_ARM_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+# CONFIG_CRYPTO_SHA1_ARM_CE is not set
+# CONFIG_CRYPTO_SHA2_ARM_CE is not set
+CONFIG_CRYPTO_SHA256_ARM=m
+CONFIG_CRYPTO_SHA512_ARM=m
+CONFIG_CRYPTO_BLAKE2S_ARM=y
+# CONFIG_CRYPTO_BLAKE2B_NEON is not set
+# CONFIG_CRYPTO_AES_ARM is not set
+CONFIG_CRYPTO_AES_ARM_BS=m
+# CONFIG_CRYPTO_AES_ARM_CE is not set
+# CONFIG_CRYPTO_GHASH_ARM_CE is not set
+# CONFIG_CRYPTO_CRC32_ARM_CE is not set
+CONFIG_CRYPTO_CHACHA20_NEON=m
+CONFIG_CRYPTO_POLY1305_ARM=m
+# CONFIG_CRYPTO_NHPOLY1305_NEON is not set
+CONFIG_CRYPTO_CURVE25519_NEON=m
 CONFIG_AS_VFP_VMRS_FPINST=y

 #
@@ -806,7 +822,6 @@ CONFIG_MEMORY_ISOLATION=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
-CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 # CONFIG_PAGE_REPORTING is not set
 CONFIG_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
@@ -830,9 +845,6 @@ CONFIG_KMAP_LOCAL=y
 CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
 # CONFIG_ANON_VMA_NAME is not set
 # CONFIG_USERFAULTFD is not set
-CONFIG_LRU_GEN=y
-CONFIG_LRU_GEN_ENABLED=y
-# CONFIG_LRU_GEN_STATS is not set

 #
 # Data Access Monitoring
@@ -865,7 +877,6 @@ CONFIG_XFRM_ALGO=y
 # CONFIG_XFRM_STATISTICS is not set
 CONFIG_NET_KEY=y
 # CONFIG_NET_KEY_MIGRATE is not set
-# CONFIG_XDP_SOCKETS is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -889,7 +900,6 @@ CONFIG_NET_UDP_TUNNEL=m
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
-CONFIG_INET_TABLE_PERTURB_ORDER=16
 CONFIG_INET_TUNNEL=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
@@ -1211,6 +1221,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_VLAN_8021Q=m
 # CONFIG_VLAN_8021Q_GVRP is not set
 # CONFIG_VLAN_8021Q_MVRP is not set
+# CONFIG_DECNET is not set
 CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_ATALK is not set
@@ -1296,7 +1307,6 @@ CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
-# CONFIG_BPF_STREAM_PARSER is not set
 CONFIG_NET_FLOW_LIMIT=y

 #
@@ -1428,9 +1438,6 @@ CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_SELFTESTS=y
-CONFIG_NET_SOCK_MSG=y
-CONFIG_PAGE_POOL=y
-# CONFIG_PAGE_POOL_STATS is not set
 # CONFIG_FAILOVER is not set
 CONFIG_ETHTOOL_NETLINK=y

@@ -1660,7 +1667,6 @@ CONFIG_ATA_FORCE=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI_PLATFORM=y
-# CONFIG_AHCI_DWC is not set
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
 # CONFIG_ATA_SFF is not set
@@ -1761,7 +1767,6 @@ CONFIG_NET_VENDOR_HUAWEI=y
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_WANGXUN=y
-CONFIG_NET_VENDOR_ADI=y
 # CONFIG_NET_VENDOR_LITEX is not set
 CONFIG_NET_VENDOR_MARVELL=y
 # CONFIG_MVMDIO is not set
@@ -1816,12 +1821,10 @@ CONFIG_NET_VENDOR_XILINX=y
 # CONFIG_XILINX_EMACLITE is not set
 # CONFIG_XILINX_AXI_EMAC is not set
 # CONFIG_XILINX_LL_TEMAC is not set
-CONFIG_PHYLINK=y
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
 # CONFIG_LED_TRIGGER_PHY is not set
 CONFIG_FIXED_PHY=y
-# CONFIG_SFP is not set

 #
 # MII PHY device drivers
@@ -1873,7 +1876,6 @@ CONFIG_SMSC_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_XILINX_GMII2RGMII is not set
 # CONFIG_MICREL_KS8995MA is not set
-# CONFIG_PSE_CONTROLLER is not set
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_BUS=y
 CONFIG_FWNODE_MDIO=y
@@ -2075,7 +2077,6 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_PINEPHONE is not set
 CONFIG_KEYBOARD_SAMSUNG=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
@@ -2166,7 +2167,6 @@ CONFIG_TOUCHSCREEN_MMS114=y
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_ZET6223 is not set
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
-# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_IQS5XX is not set
 # CONFIG_TOUCHSCREEN_ZINITIX is not set
@@ -2408,7 +2408,6 @@ CONFIG_SPI_BITBANG=y
 CONFIG_SPI_GPIO=y
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_MICROCHIP_CORE is not set
-# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_ROCKCHIP is not set
@@ -2451,7 +2450,6 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
-# CONFIG_PINCTRL_CY8C95X0 is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 # CONFIG_PINCTRL_OCELOT is not set
@@ -2499,6 +2497,7 @@ CONFIG_GPIO_CDEV_V1=y
 #
 # I2C GPIO expanders
 #
+# CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_ADNP is not set
 # CONFIG_GPIO_GW_PLD is not set
 # CONFIG_GPIO_MAX7300 is not set
@@ -2630,6 +2629,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_AS370 is not set
 # CONFIG_SENSORS_ASC7621 is not set
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
+# CONFIG_SENSORS_ASPEED is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
 # CONFIG_SENSORS_CORSAIR_PSU is not set
@@ -2670,7 +2670,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MAX197 is not set
 # CONFIG_SENSORS_MAX31722 is not set
 # CONFIG_SENSORS_MAX31730 is not set
-# CONFIG_SENSORS_MAX31760 is not set
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
@@ -2720,10 +2719,10 @@ CONFIG_SENSORS_PWM_FAN=y
 # CONFIG_SENSORS_SHT3x is not set
 # CONFIG_SENSORS_SHT4x is not set
 # CONFIG_SENSORS_SHTC1 is not set
+# CONFIG_SENSORS_SY7636A is not set
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
 # CONFIG_SENSORS_EMC2103 is not set
-# CONFIG_SENSORS_EMC2305 is not set
 # CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
@@ -2876,10 +2875,8 @@ CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MAX8997=y
 CONFIG_MFD_MAX8998=y
 # CONFIG_MFD_MT6360 is not set
-# CONFIG_MFD_MT6370 is not set
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_OCELOT is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_MFD_CPCAP is not set
 # CONFIG_MFD_VIPERBOARD is not set
@@ -2887,15 +2884,14 @@ CONFIG_MFD_MAX8998=y
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_PM8XXX is not set
-# CONFIG_MFD_SY7636A is not set
 # CONFIG_MFD_RT4831 is not set
 # CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RT5120 is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
 CONFIG_MFD_SEC_CORE=y
 # CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SIMPLE_MFD_I2C is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
@@ -3011,6 +3007,7 @@ CONFIG_REGULATOR_S2MPA01=y
 CONFIG_REGULATOR_S2MPS11=y
 CONFIG_REGULATOR_S5M8767=y
 # CONFIG_REGULATOR_SLG51000 is not set
+# CONFIG_REGULATOR_SY7636A is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
@@ -3093,6 +3090,7 @@ CONFIG_MEDIA_USB_SUPPORT=y
 #
 # Webcam devices
 #
+# CONFIG_VIDEO_CPIA2 is not set
 CONFIG_USB_GSPCA=m
 # CONFIG_USB_GSPCA_BENQ is not set
 # CONFIG_USB_GSPCA_CONEX is not set
@@ -3148,6 +3146,7 @@ CONFIG_USB_GSPCA=m
 # CONFIG_VIDEO_USBTV is not set
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_USB_ZR364XX is not set

 #
 # Webcam, TV (analog/digital) USB devices
@@ -3243,10 +3242,6 @@ CONFIG_VIDEO_S5P_MIPI_CSIS=m
 # Texas Instruments drivers
 #

-#
-# Verisilicon media platform drivers
-#
-
 #
 # VIA media platform drivers
 #
@@ -3533,7 +3528,7 @@ CONFIG_DRM_EXYNOS_HDMI=y
 # CONFIG_DRM_ARMADA is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_USE_LVDS is not set
-# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
+# CONFIG_DRM_RCAR_MIPI_DSI is not set
 # CONFIG_DRM_OMAP is not set
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_VIRTIO_GPU is not set
@@ -3559,7 +3554,6 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # 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_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -3579,7 +3573,6 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=y
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
-CONFIG_DRM_PANEL_MAGNACHIP_EA8061=y
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
 # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
@@ -3598,7 +3591,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=y
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y
-CONFIG_DRM_PANEL_SAMSUNG_S6EVR02=y
+# CONFIG_DRM_PANEL_SAMSUNG_S6EVR02 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
@@ -3927,7 +3920,6 @@ CONFIG_SND_SOC_WM_HUBS=y
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
 # CONFIG_SND_SOC_CS4234 is not set
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -3945,7 +3937,6 @@ CONFIG_SND_SOC_HDMI_CODEC=y
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8316 is not set
-# CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_ES8328_SPI is not set
 # CONFIG_SND_SOC_GTM601 is not set
@@ -3988,7 +3979,6 @@ CONFIG_SND_SOC_RT5631=y
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
 # CONFIG_SND_SOC_SPDIF is not set
-# CONFIG_SND_SOC_SRC4XXX_I2C is not set
 # CONFIG_SND_SOC_SSM2305 is not set
 # CONFIG_SND_SOC_SSM2518 is not set
 # CONFIG_SND_SOC_SSM2602_SPI is not set
@@ -4122,7 +4112,6 @@ CONFIG_HID_EZKEY=y
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_VRC2 is not set
 # CONFIG_HID_XIAOMI is not set
 # CONFIG_HID_GYRATION is not set
 # CONFIG_HID_ICADE is not set
@@ -4157,7 +4146,6 @@ CONFIG_HID_MONTEREY=y
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PXRC is not set
 # CONFIG_HID_RAZER is not set
 # CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_RETRODE is not set
@@ -4176,7 +4164,6 @@ CONFIG_HID_MONTEREY=y
 # CONFIG_HID_SMARTJOYPLUS is not set
 # CONFIG_HID_TIVO is not set
 # CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TOPRE is not set
 # CONFIG_HID_THINGM is not set
 # CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_UDRAW_PS3 is not set
@@ -4760,6 +4747,12 @@ CONFIG_STAGING=y
 # CONFIG_ADT7316 is not set
 # end of Analog digital bi-direction converters

+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
+
 #
 # Direct Digital Synthesis
 #
@@ -4789,6 +4782,7 @@ CONFIG_STAGING=y
 # CONFIG_STAGING_MEDIA is not set
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_KS7010 is not set
 # CONFIG_PI433 is not set
@@ -4835,14 +4829,12 @@ CONFIG_COMMON_CLK_S2MPS11=y
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_RS9_PCIE is not set
 # CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_VC7 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_COMMON_CLK_SAMSUNG=y
 CONFIG_EXYNOS_4_COMMON_CLK=y
 CONFIG_EXYNOS_AUDSS_CLK_CON=y
 CONFIG_EXYNOS_CLKOUT=y
 # CONFIG_XILINX_VCU is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_HWSPINLOCK is not set

 #
@@ -4985,6 +4977,7 @@ CONFIG_EXTCON_MAX8997=y
 # CONFIG_EXTCON_SM5502 is not set
 # CONFIG_EXTCON_USB_GPIO is not set
 # CONFIG_EXTCON_USBC_CROS_EC is not set
+# CONFIG_EXTCON_USBC_TUSB320 is not set
 CONFIG_MEMORY=y
 CONFIG_DDR=y
 # CONFIG_ARM_PL172_MPMC is not set
@@ -5044,7 +5037,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_MMA8452 is not set
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
-# CONFIG_MSA311 is not set
 # CONFIG_MXC4005 is not set
 # CONFIG_MXC6255 is not set
 # CONFIG_SCA3000 is not set
@@ -5089,7 +5081,6 @@ CONFIG_EXYNOS_ADC=y
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX11100 is not set
 # CONFIG_MAX1118 is not set
-# CONFIG_MAX11205 is not set
 # CONFIG_MAX1241 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MAX9611 is not set
@@ -5097,7 +5088,6 @@ CONFIG_EXYNOS_ADC=y
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP3911 is not set
 # CONFIG_NAU7802 is not set
-# CONFIG_RICHTEK_RTQ6056 is not set
 # CONFIG_SD_ADC_MODULATOR is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC0832 is not set
@@ -5142,7 +5132,6 @@ CONFIG_EXYNOS_ADC=y
 # Capacitance to digital converters
 #
 # CONFIG_AD7150 is not set
-# CONFIG_AD7746 is not set
 # end of Capacitance to digital converters

 #
@@ -5308,8 +5297,6 @@ CONFIG_EXYNOS_ADC=y
 # CONFIG_ADIS16480 is not set
 # CONFIG_BMI160_I2C is not set
 # CONFIG_BMI160_SPI is not set
-# CONFIG_BOSCH_BNO055_SERIAL is not set
-# CONFIG_BOSCH_BNO055_I2C is not set
 # CONFIG_FXOS8700_I2C is not set
 # CONFIG_FXOS8700_SPI is not set
 # CONFIG_KMX61 is not set
@@ -5346,7 +5333,6 @@ CONFIG_CM36651=y
 # CONFIG_JSA1212 is not set
 # CONFIG_RPR0521 is not set
 # CONFIG_LTR501 is not set
-# CONFIG_LTRF216A is not set
 # CONFIG_LV0104CS is not set
 # CONFIG_MAX44000 is not set
 # CONFIG_MAX44009 is not set
@@ -5921,7 +5907,6 @@ CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_SIMD=m
-# end of Crypto core or helper

 #
 # Public-key cryptography
@@ -5935,71 +5920,55 @@ CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECRDSA is not set
 # CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
-# end of Public-key cryptography

 #
-# Block ciphers
+# Authenticated Encryption with Associated Data
 #
-CONFIG_CRYPTO_AES=m
-# CONFIG_CRYPTO_AES_TI is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARIA is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SM4_GENERIC is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# end of Block ciphers
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_ECHAINIV is not set

 #
-# Length-preserving ciphers and modes
+# Block modes
 #
-# CONFIG_CRYPTO_ADIANTUM is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_CHACHA20 is not set
 CONFIG_CRYPTO_CBC=m
 # CONFIG_CRYPTO_CFB is not set
 CONFIG_CRYPTO_CTR=m
 # CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_ECB=m
-# CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_KEYWRAP is not set
 CONFIG_CRYPTO_LRW=m
 # CONFIG_CRYPTO_OFB is not set
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=m
-# end of Length-preserving ciphers and modes
-
-#
-# AEAD (authenticated encryption with associated data) ciphers
-#
-# CONFIG_CRYPTO_AEGIS128 is not set
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_ECHAINIV is not set
+# CONFIG_CRYPTO_KEYWRAP is not set
+# CONFIG_CRYPTO_ADIANTUM is not set
+# CONFIG_CRYPTO_HCTR2 is not set
 CONFIG_CRYPTO_ESSIV=m
-# end of AEAD (authenticated encryption with associated data) ciphers

 #
-# Hashes, digests, and MACs
+# Hash modes
 #
-CONFIG_CRYPTO_BLAKE2B=m
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_BLAKE2B=m
+# CONFIG_CRYPTO_CRCT10DIF is not set
+CONFIG_CRYPTO_GHASH=m
+# CONFIG_CRYPTO_POLY1305 is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_POLY1305 is not set
 # CONFIG_CRYPTO_RMD160 is not set
 CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_SHA256=y
@@ -6007,19 +5976,29 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
 # CONFIG_CRYPTO_SM3_GENERIC is not set
 # CONFIG_CRYPTO_STREEBOG is not set
-# CONFIG_CRYPTO_VMAC is not set
 # CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-CONFIG_CRYPTO_XXHASH=m
-# end of Hashes, digests, and MACs

 #
-# CRCs (cyclic redundancy checks)
+# Ciphers
 #
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32=m
-# CONFIG_CRYPTO_CRCT10DIF is not set
-# end of CRCs (cyclic redundancy checks)
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_AES_TI is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_CHACHA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_ARIA is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SM4_GENERIC is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set

 #
 # Compression
@@ -6030,10 +6009,9 @@ CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_LZ4=m
 # CONFIG_CRYPTO_LZ4HC is not set
 CONFIG_CRYPTO_ZSTD=m
-# end of Compression

 #
-# Random number generation
+# Random Number Generation
 #
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DRBG_MENU=m
@@ -6043,11 +6021,6 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG=m
 CONFIG_CRYPTO_JITTERENTROPY=m
 CONFIG_CRYPTO_KDF800108_CTR=y
-# end of Random number generation
-
-#
-# Userspace interface
-#
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -6056,32 +6029,7 @@ CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
-# end of Userspace interface
-
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Accelerated Cryptographic Algorithms for CPU (arm)
-#
-CONFIG_CRYPTO_CURVE25519_NEON=m
-# CONFIG_CRYPTO_GHASH_ARM_CE is not set
-# CONFIG_CRYPTO_NHPOLY1305_NEON is not set
-CONFIG_CRYPTO_POLY1305_ARM=m
-CONFIG_CRYPTO_BLAKE2S_ARM=y
-# CONFIG_CRYPTO_BLAKE2B_NEON is not set
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_SHA1_ARM_NEON=m
-# CONFIG_CRYPTO_SHA1_ARM_CE is not set
-# CONFIG_CRYPTO_SHA2_ARM_CE is not set
-CONFIG_CRYPTO_SHA256_ARM=m
-CONFIG_CRYPTO_SHA512_ARM=m
-# CONFIG_CRYPTO_AES_ARM is not set
-CONFIG_CRYPTO_AES_ARM_BS=m
-# CONFIG_CRYPTO_AES_ARM_CE is not set
-CONFIG_CRYPTO_CHACHA20_NEON=m
-# CONFIG_CRYPTO_CRC32_ARM_CE is not set
-# end of Accelerated Cryptographic Algorithms for CPU (arm)
-
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
 CONFIG_CRYPTO_DEV_S5P=m
@@ -6109,8 +6057,6 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # end of Certificates for signature checking

-CONFIG_BINARY_PRINTF=y
-
 #
 # Library routines
 #
@@ -6132,7 +6078,6 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 #
 # Crypto library routines
 #
-CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=m
 CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
@@ -6150,6 +6095,7 @@ CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
 # end of Crypto library routines

+CONFIG_LIB_MEMNEQ=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
@@ -6174,7 +6120,6 @@ CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMMON=y
 CONFIG_ZSTD_COMPRESS=m
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
@@ -6223,7 +6168,6 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 CONFIG_CMA_ALIGNMENT=8
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
-# CONFIG_FORCE_NR_CPUS is not set
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
@@ -6283,7 +6227,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 #
 # Compile-time checks and compiler options
 #
-CONFIG_AS_HAS_NON_CONST_LEB128=y
 CONFIG_FRAME_WARN=1024
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_HEADERS_INSTALL is not set
@@ -6416,7 +6359,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_XARRAY is not set
-# CONFIG_TEST_MAPLE_TREE is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set
@@ -6431,7 +6373,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_TEST_DYNAMIC_DEBUG is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
@@ -6439,9 +6380,4 @@ CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_ARCH_USE_MEMTEST=y
 # CONFIG_MEMTEST is not set
 # end of Kernel Testing and Coverage
-
-#
-# Rust hacking
-#
-# end of Rust hacking
 # end of Kernel hacking
@@ -67,10 +67,10 @@ diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
 index b92c53a6b..03531e525 100644
 --- a/drivers/input/misc/Makefile
 +++ b/drivers/input/misc/Makefile
-@@ -78,7 +78,7 @@ obj-$(CONFIG_INPUT_SOC_BUTTON_ARRAY)	+= soc_button_array.o
+@@ -77,7 +77,7 @@ obj-$(CONFIG_INPUT_SOC_BUTTON_ARRAY)	+= soc_button_array.o
+ obj-$(CONFIG_INPUT_SPARCSPKR)		+= sparcspkr.o
 obj-$(CONFIG_INPUT_STPMIC1_ONKEY)  	+= stpmic1_onkey.o
 obj-$(CONFIG_INPUT_TPS65218_PWRBUTTON)	+= tps65218-pwrbutton.o
- obj-$(CONFIG_INPUT_TPS65219_PWRBUTTON)	+= tps65219-pwrbutton.o
 -obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON)	+= twl4030-pwrbutton.o
 +obj-$(CONFIG_INPUT_TWL_PWRBUTTON)	+= twl-pwrbutton.o
 obj-$(CONFIG_INPUT_TWL4030_VIBRA)	+= twl4030-vibra.o
@@ -0,0 +1,28 @@
+From 954e4768ff5cfcc55974a3a3e684a458ebe7fec2 Mon Sep 17 00:00:00 2001
+From: dartvader316 <dartvader316-dev@pm.me>
+Date: Thu, 3 Nov 2022 18:43:14 +0300
+Subject: [PATCH] Revert "partially Revert "usb: musb: Set the DT node on the
+ child device""
+
+ espresso10 musb fix
+
+This reverts commit 239071064732bc4a30308cbba11014aa1aab550a.
+---
+ drivers/usb/musb/omap2430.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
+index f571a65ae6ee..4a963cfa385b 100644
+--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
+@@ -327,6 +327,7 @@ static int omap2430_probe(struct platform_device *pdev)
+ 	musb->dev.parent		= &pdev->dev;
+ 	musb->dev.dma_mask		= &omap2430_dmamask;
+ 	musb->dev.coherent_dma_mask	= omap2430_dmamask;
+	device_set_of_node_from_dev(&musb->dev, &pdev->dev);
+ 
+ 	glue->dev			= &pdev->dev;
+ 	glue->musb			= musb;
+-- 
+GitLab
+
@@ -1,44 +0,0 @@
-From 912d41160ee66ae498a06c61ab1ea8ac1341faeb Mon Sep 17 00:00:00 2001
-From: "Sicelo A. Mhlongo" <absicsz@gmail.com>
-Date: Mon, 13 Mar 2023 22:21:40 +0200
-Subject: [PATCH] hsi: ssi_port: force pio path
-
-The SSI modem in Nokia N900 has never worked with DMA mode, but in recent
-kernels, it somehow always chooses to use DMA. Force it to use the working and
-tested PIO path.
-
---
- drivers/hsi/controllers/omap_ssi_port.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c
-index b9495b720f1b..3adbe75f85cc 100644
--- a/drivers/hsi/controllers/omap_ssi_port.c
-+++ b/drivers/hsi/controllers/omap_ssi_port.c
-@@ -320,19 +320,19 @@ static int ssi_start_pio(struct hsi_msg *msg)
- static int ssi_start_transfer(struct list_head *queue)
- {
- 	struct hsi_msg *msg;
-	int lch = -1;
-+	/* int lch = -1; */
- 
- 	if (list_empty(queue))
- 		return 0;
- 	msg = list_first_entry(queue, struct hsi_msg, link);
- 	if (msg->status != HSI_STATUS_QUEUED)
- 		return 0;
-	if ((msg->sgt.nents) && (msg->sgt.sgl->length > sizeof(u32)))
-+	/* if ((msg->sgt.nents) && (msg->sgt.sgl->length > sizeof(u32)))
- 		lch = ssi_claim_lch(msg);
- 	if (lch >= 0)
- 		return ssi_start_dma(msg, lch);
-	else
-		return ssi_start_pio(msg);
-+	else */
-+	return ssi_start_pio(msg);
- }
- 
- static int ssi_async_break(struct hsi_msg *msg)
-- 
-2.39.2
-
@@ -1,11 +1,10 @@
 # Maintainer: Mighty <mightymb17@gmail.com>
 # Co-Maintainer: Sicelo <absicsz@gmail.com>
-# Kernel config based on: arch/arm/configs/omap2plus_defconfig
+# Kernel config based on: arch/arm64/configs/omap2plus_defconfig

 pkgname=linux-postmarketos-omap
-pkgver=6.2.1
-_pkgver=6.2.1
-pkgrel=2
+pkgver=6.1
+pkgrel=0
 pkgdesc="Mainline kernel fork for OMAP devices"
 arch="armv7"
 url="https://kernel.org/"
@@ -16,13 +15,11 @@ makedepends="bash bison findutils flex openssl-dev perl gmp-dev mpc1-dev mpfr-de
 _carch="arm"
 _flavor="postmarketos-omap"
 _config="config-$_flavor.armv7"
-
-
 case $pkgver in
-	*.*rc*) _kernver=$_pkgver
+	*.*_rc*) _kernver=$_pkgver
 		_rc=1;;
-	*.*.0) _kernver=${pkgver%.0};;
-	*.*.*) _kernver=$pkgver;;
+		*.*.0) _kernver=${pkgver%.0};;
+	*.*.*) _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
 if [ $_rc ]
@@ -31,9 +28,9 @@ then
 else
 	_kernsrc="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz"
 fi
-
 source="
 	$_kernsrc
+	$_patch
 	$_config
 	0001-Add-TWL6032-dtsi.patch
 	0002-arm-dts-Add-common-dtsi-for-espresso.patch
@@ -41,11 +38,10 @@ source="
 	0004-arm-dts-Add-espresso10-support.patch
 	0005-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
 	0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
-	0007-ARM-dts-N900-use-iio-driver-for-accelerometer.patch
-	0008-hsi-ssi_port-force-pio-path.patch
+	0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch
 "
-builddir="$srcdir/linux-$_pkgver"
-replaces="linux-samsung-espresso3g linux-nokia-n900"
+builddir="$srcdir/linux-$_kernver"
+replaces="linux-samsung-espresso3g"

 prepare() {
 	default_prepare
@@ -71,15 +67,15 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }

+
 sha512sums="
-79d3465955dd557dc599fa1c18c7a68699f4febdd7264fe4e223c694e879ef5bb65fff9fad1ec5599f894ad6519bad292efbd5b9990dac3223d843f5c22c65f2  linux-6.2.1.tar.xz
-c80101348545f4eaebecdc0632b3b444ff8d16d370035c8e6c6e9f946eb7900b57e91a0f773a4d7279c60142a95314c22760fb0590066740fa66118222bc1932  config-postmarketos-omap.armv7
+6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68  linux-6.1.tar.xz
+65da1e6bb7324fdd29ee2c954755b322ef99776dc39c4d7225f6415b5c6d682ca38ad96cec737980133c575241fdf53d12858496f0db742619fd385ea4e3cdca  config-postmarketos-omap.armv7
 727ff96d7d4701e93bf43db5d7bd872b4fbf1a8439edb4d84987a8f89e669d65b7a413740172b4a84df711b990d7e30b7880df5b9365496b7894d129cd4ebfa6  0001-Add-TWL6032-dtsi.patch
 cbabba85dc1e4de5ad2faaea8d87595ceef5af740a9b06f20aeb5ac5bff37747e17a11f77d66e3cde42e3fdb48134a37a98205e32109464a87ac7bb5e91fb34c  0002-arm-dts-Add-common-dtsi-for-espresso.patch
 b2c2d81bdfb4095a87d6821342127cc7c74bbc12a70786a81d64fd264b5487d522effab349fc1de2b01752cce494bf782d59021d4e95740aa1e3ff5de12632f7  0003-arm-dts-Add-espresso7-support.patch
 1029debd9fa9fe357f725c42e901bcabb9a364f8b3fcf7986cc5506a078a075e22db3351dcbb607014af8a87a84d13b780e1e613924c8ad6a767ac8b8b763a94  0004-arm-dts-Add-espresso10-support.patch
 9dc84421cbc2ea7c2c37847d8704ff46dd4a485485bfa4a671167fdef4ac6f53a4e8f787aa774f3748299c374e7c7dc5d36fd4ba9b1a1a9697e0526f2bf3ece4  0005-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
-1aa4521deb4e6d0977f8e704dd7f38ca3a861212c0ced34145713c72a68d8f255f3631a82c5ef2006f4c8b954fce6198e5d0870392cd4db6b6fb9610abe50c4c  0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
-302aa8e6677e7ecfae473553806cdf5d47687c4f8e73322d0ace78486f9290ba503069ed6b41250fe38802b6c6091c7c4eac06ab387e011f1316b84ad5e2641d  0007-ARM-dts-N900-use-iio-driver-for-accelerometer.patch
-c3af9715b3559c2d593f4fcfa078730722c7deeec132c5b83e085ff4d9815d85ef349384097c580efe1bbc37c60f42e18ef559f0abccfe236080670e4403fa77  0008-hsi-ssi_port-force-pio-path.patch
+fdf62d90b1381541743e9502160854a920c05050cc6f530769071e2eb362ba3c1f5c84afd140533d7aa3f318205e1b0b1c55387edc99a643e1593e634e740c10  0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
+5dea3463f13ebdaf17535a59ee5ffd98ad6d9d3750f6bcafc527699ead6cc4e6a3cf2aa161419c56d4bcec3a51ac2e3427a7883ce26137bec91440239645ec1e  0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch
 "