diff --git a/device/community/linux-postmarketos-qcom-sdm845/0001-arm64-dts-qcom-sdm845-xiaomi-beryllium-Fix-compatibl.patch b/device/community/linux-postmarketos-qcom-sdm845/0001-arm64-dts-qcom-sdm845-xiaomi-beryllium-Fix-compatibl.patch new file mode 100644 index 000000000..44f772642 --- /dev/null +++ b/device/community/linux-postmarketos-qcom-sdm845/0001-arm64-dts-qcom-sdm845-xiaomi-beryllium-Fix-compatibl.patch @@ -0,0 +1,48 @@ +From 6b5febe66d0c99cc18b68da6c7235fa2a8976f24 Mon Sep 17 00:00:00 2001 +From: Jens Reidel +Date: Thu, 25 Sep 2025 01:36:58 +0200 +Subject: [PATCH] arm64: dts: qcom: sdm845-xiaomi-beryllium: Fix compatible + strings + +The most specific strings should come first (panel variant included), +then the more generic ones (device and SoC). + +This is necessary for hexagonrpcd to guess the HexagonFS path for the +device. It tries all of the compatible entries, but if none for +xiaomi,beryllium existed it wouldn't be able to guess it. + +Signed-off-by: Jens Reidel +--- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts +index 2d6f0e382a6c..d157622f84d1 100644 +--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts ++++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts +@@ -6,7 +6,7 @@ + + / { + model = "Xiaomi Pocophone F1 (EBBG)"; +- compatible = "xiaomi,beryllium-ebbg", "qcom,sdm845"; ++ compatible = "xiaomi,beryllium-ebbg", "xiaomi,beryllium", "qcom,sdm845"; + }; + + &display_panel { +diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts +index b58964cde834..71816a9f33b4 100644 +--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts ++++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts +@@ -6,7 +6,7 @@ + + / { + model = "Xiaomi Pocophone F1 (Tianma)"; +- compatible = "xiaomi,beryllium", "qcom,sdm845"; ++ compatible = "xiaomi,beryllium-tianma", "xiaomi,beryllium", "qcom,sdm845"; + }; + + &display_panel { +-- +2.51.0 + diff --git a/device/community/linux-postmarketos-qcom-sdm845/APKBUILD b/device/community/linux-postmarketos-qcom-sdm845/APKBUILD index 8bb5d5d07..bb63c70f7 100644 --- a/device/community/linux-postmarketos-qcom-sdm845/APKBUILD +++ b/device/community/linux-postmarketos-qcom-sdm845/APKBUILD @@ -6,7 +6,7 @@ _flavor="postmarketos-qcom-sdm845" pkgname=linux-$_flavor pkgver=6.16.7 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline Kernel fork for SDM845 devices" arch="aarch64" _carch="arm64" @@ -24,6 +24,7 @@ _tag="sdm845-6.16.7-r0" source=" linux-$_tag.tar.gz::https://gitlab.com/sdm845-mainline/linux/-/archive/$_tag/linux-$_tag.tar.gz $_config + 0001-arm64-dts-qcom-sdm845-xiaomi-beryllium-Fix-compatibl.patch " builddir="$srcdir/linux-$_tag" @@ -73,4 +74,5 @@ package() { sha512sums=" 803d2cf85b248c3da41a9c9178d69d211eccf5d1adb72acd5343e09cbb65782f727e579939287c91712c69a862bed7344a0e2bc893c2791a971b6fed95ec6f1a linux-sdm845-6.16.7-r0.tar.gz afba069444a7b79f7b3255bbd37592ce5929d9a6fd11ebaf4b392127856750edac3b18e25fe9f47becd65e0b3e99a4cb1c1377586c3bb93d4c6d8d8788608a1b config-postmarketos-qcom-sdm845.aarch64 +fbd04f5f429ca1067dadb4209d5279e5fd3cfb4a5ae5957e8e189488109a6cf44d27aa1f38cceb78e1cc360d3020b0c4342ca768243eb6ba7460093a1306b98c 0001-arm64-dts-qcom-sdm845-xiaomi-beryllium-Fix-compatibl.patch "