From 83177e2395203aeb53c9db78289bdf2a6b1632c8 Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Tue, 19 May 2026 19:30:34 +0200
Subject: [PATCH] firmware-oneplus-sdm845: revert wrong commit

The commit change from
https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8446
got lost in rebase of
https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8450,
causing the package to end up broken.

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8602>
---
 .../firmware-oneplus-sdm845/APKBUILD          |  8 ++---
 .../firmware-oneplus-sdm845/firmware.files    | 34 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/device/community/firmware-oneplus-sdm845/APKBUILD b/device/community/firmware-oneplus-sdm845/APKBUILD
index e81b1bb1f..c0789f6f7 100644
--- a/device/community/firmware-oneplus-sdm845/APKBUILD
+++ b/device/community/firmware-oneplus-sdm845/APKBUILD
@@ -1,8 +1,8 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=firmware-oneplus-sdm845
-pkgver=13
+pkgver=14
 pkgrel=0
-_commit="176ca713448c5237a983fb1f158cf3a5c251d775"
+_commit="3e31a0c3e5a061645c09f805387b49fa9d35acbf"
 pkgdesc="Firmware for OnePlus 6 / 6T"
 url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845"
 arch="aarch64"
@@ -54,8 +54,8 @@ firmware_sensors() {
 }
 
 sha512sums="
-68ecc3cec0458e5c7a0c6e2d1b0da72df324b48e1283e6e0ebc3c1713e8b721386e2554edf48fd559a8b8a40b54f3d4046ba2e484342ff4d5c69baf0839a800e  firmware-oneplus-sdm845-176ca713448c5237a983fb1f158cf3a5c251d775.tar.gz
-59fd7fac60878919283548f595030d3c0a575c8ffc76a313e980a1ea4262d2593eb8ff5d32ed0090cabeee2e0c3c6ff87d85dd1cf6802c56e13950197fbc557e  firmware.files
+56604c46ad0f30f1f715af4b83bd2686d96723024063c7ef6baa5c73cd52b375478e3d65b886ff08efc95ce129fc789b8509efcdf9f0d46cf7229f4ec1afa513  firmware-oneplus-sdm845-3e31a0c3e5a061645c09f805387b49fa9d35acbf.tar.gz
+aefc540de7d67df936108750ea4ad95101eacf5cbc0243d849d7267932fa0d3ef602f9e461ba003d3953f5e81b77b798df0a5c43d179269ceb5c71f73ab23c0a  firmware.files
 f3e4e1ca689400492d9860fbe478d781bcf3d0b7d1b018bc23309d4a0458dc693554c198d79a4048436e0a04e1ea9d07b004c63d297a4eb423a7ea355fc21f95  sensor.files
 ed8e0c4437c4f9b1ad34337d57eb3fbcc66dbcd520864642ff704e48b1656e6b2970f61c4f7ea264bd7aefedc07d8b7f7fb12569b0218a6f56ab5daf6946d9e9  30-oneplus-sdm845-firmware-ci.files
 3f5b04afd8ccd08e676cee2d290c08c3b5e0f0c0b85ddf6e94f86730615ea174a2cc57452dc8455f68675fc173bf0fb79c0505819c3e0203ad5a7acb5ebf4b10  0001-oneplus6-set-mount-matrix.patch
diff --git a/device/community/firmware-oneplus-sdm845/firmware.files b/device/community/firmware-oneplus-sdm845/firmware.files
index 5a05e5c0f..5a15e8a27 100644
--- a/device/community/firmware-oneplus-sdm845/firmware.files
+++ b/device/community/firmware-oneplus-sdm845/firmware.files
@@ -1,19 +1,19 @@
 /usr/lib/firmware/postmarketos/tfa98xx.cnt
 /usr/lib/firmware/postmarketos/qca/crbtfw21.tlv
-/usr/lib/firmware/qcom/sdm845/oneplus6/adspr.jsn
-/usr/lib/firmware/qcom/sdm845/oneplus6/adspua.jsn
-/usr/lib/firmware/qcom/sdm845/oneplus6/cdspr.jsn
-/usr/lib/firmware/qcom/sdm845/oneplus6/modemr.jsn
-/usr/lib/firmware/qcom/sdm845/oneplus6/modemuw.jsn
-/usr/lib/firmware/qcom/sdm845/oneplus6/slpir.jsn
-/usr/lib/firmware/qcom/sdm845/oneplus6/slpius.jsn
-/usr/lib/firmware/qcom/sdm845/oneplus6/slpi.mbn
-/usr/lib/firmware/qcom/sdm845/oneplus6/venus.mbn
-/usr/lib/firmware/qcom/sdm845/oneplus6/wlanmdsp.mbn
-/usr/lib/firmware/qcom/sdm845/oneplus6/a630_zap.mbn
-/usr/lib/firmware/qcom/sdm845/oneplus6/adsp.mbn
-/usr/lib/firmware/qcom/sdm845/oneplus6/cdsp.mbn
-/usr/lib/firmware/qcom/sdm845/oneplus6/ipa_fws.mbn
-/usr/lib/firmware/qcom/sdm845/oneplus6/mba.mbn
-/usr/lib/firmware/qcom/sdm845/oneplus6/modem.mbn
-/usr/lib/firmware/qca/oneplus6/crnv21.bin
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/adspr.jsn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/adspua.jsn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/cdspr.jsn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/modemr.jsn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/modemuw.jsn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/slpir.jsn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/slpius.jsn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/slpi.mbn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/venus.mbn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/wlanmdsp.mbn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/a630_zap.mbn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/adsp.mbn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/cdsp.mbn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/ipa_fws.mbn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/mba.mbn
+/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/modem.mbn
+/usr/lib/firmware/qca/OnePlus/enchilada/crnv21.bin