From 68bfaa3fde985a227721b58b32283811d05d5c21 Mon Sep 17 00:00:00 2001 From: Jens Reidel Date: Sun, 5 Apr 2026 12:54:56 +0200 Subject: [PATCH] arm64: dts: qcom: sdm845-xiaomi-beryllium: Append compatible strings Add the generic "xiaomi,beryllium" compatible string after the panel-specific one, so the compatible list follows the required ordering from most specific to most generic. This allows userspace to fall back to the generic Poco F1 compatible when no panel-specific match is present. In particular, hexagonrpcd relies on trying all compatible entries to derive the HexagonFS path, and currently fails when the generic device string is missing. This change modifies the DT ABI: systems describing the EBBG variant will now also match on "xiaomi,beryllium", whereas previously only the panel-specific compatible was exposed. In practice, no upstream userspace distinguishes between Tianma and EBBG panel variants. All known consumers rely only on the generic device identification, and no panel-specific handling exists. Therefore, enabling the generic fallback does not change effective runtime behavior, but fixes userspace that depends on generic matching. The previous state was incomplete, as it omitted the generic device-compatible string required for proper fallback matching. Signed-off-by: Jens Reidel Signed-off-by: David Heidelberg Link: https://lore.kernel.org/r/20260405-beryllium-compat-string-v2-2-91149be07835@ixit.cz Signed-off-by: Bjorn Andersson --- 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 {