snlavaise/pmaports-rtwo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-postmarketos-qcom-sdm845: Add patch to fix compatible strings for beryllium

Browse Source 
The patch fixes the compatibles to allow hexagonrpcd to guess the
HexagonFS path without any configuration.

Signed-off-by: Jens Reidel <adrian@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6966>
This commit is contained in:
Jens Reidel
2025-09-25 01:40:11 +02:00
committed by The Friendly Merge Bot
parent 8ee1b55853
commit e720d6509c
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device/community/linux-postmarketos-qcom-sdm845/0001-arm64-dts-qcom-sdm845-xiaomi-beryllium-Fix-compatibl.patch
+48
View File
@@ -0,0 +1,48 @@
From 6b5febe66d0c99cc18b68da6c7235fa2a8976f24 Mon Sep 17 00:00:00 2001
From: Jens Reidel <adrian@travitia.xyz>
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 <adrian@travitia.xyz>
---
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
device/community/linux-postmarketos-qcom-sdm845/APKBUILD
+3 -1
View File
@@ -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
"