[PATCH 0/2] Correct Xiaomi Poco F1 compatible strings and evaluation.

[PATCH 0/2] Correct Xiaomi Poco F1 compatible strings and evaluation.

[David Heidelberg via B4 Relay]

Signed-off-by: David Heidelberg <david@ixit.cz>
---
David Heidelberg (1):
      dt-bindings: arm: qcom: Add Xiaomi Poco F1 Tianma variant bindings

Jens Reidel (1):
      arm64: dts: qcom: sdm845-xiaomi-beryllium: Fix compatible strings

 Documentation/devicetree/bindings/arm/qcom.yaml             | 10 ++++++++--
 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts   |  2 +-
 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---
base-commit: cc13002a9f984d37906e9476f3e532a8cdd126f5
change-id: 20260403-beryllium-compat-string-cc149b90a29d

Best regards,
-- 
David Heidelberg <david@ixit.cz>

[PATCH 1/2] dt-bindings: arm: qcom: Add Xiaomi Poco F1 Tianma variant bindings

[David Heidelberg via B4 Relay]

From: David Heidelberg <david@ixit.cz>

Add documentation for Tianma display and touchscreen variant.

While at it, correct binding documentation expectation.

Fixes: 341fdef8ea49 ("dt-bindings: arm: qcom: Add Xiaomi Poco F1 EBBG variant bindings")
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 Documentation/devicetree/bindings/arm/qcom.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
index 8c5fdd320cfcf..b412543f0afb8 100644
--- a/Documentation/devicetree/bindings/arm/qcom.yaml
+++ b/Documentation/devicetree/bindings/arm/qcom.yaml
@@ -822,6 +822,14 @@ properties:
           - const: google,zombie-sku514
           - const: qcom,sc7280
 
+      - description: Xiaomi Poco F1
+        items:
+          - enum:
+              - xiaomi,beryllium-ebbg
+              - xiaomi,beryllium-tianma
+          - const: xiaomi,beryllium
+          - const: qcom,sdm845
+
       - items:
           - enum:
               - lenovo,flex-5g
@@ -971,8 +979,6 @@ properties:
               - sony,akatsuki-row
               - sony,apollo-row
               - thundercomm,db845c
-              - xiaomi,beryllium
-              - xiaomi,beryllium-ebbg
               - xiaomi,polaris
           - const: qcom,sdm845
 

-- 
2.53.0

[PATCH 2/2] arm64: dts: qcom: sdm845-xiaomi-beryllium: Fix compatible strings

[David Heidelberg via B4 Relay]

From: Jens Reidel <adrian@travitia.xyz>

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.

Fixes: bcf429831ecb ("arm64: dts: qcom: sdm845-xiaomi-beryllium-ebbg: introduce Xiaomi Poco F1 EBBG variant")
Fixes: dd6459a0890a ("arm64: dts: qcom: split beryllium dts into common dtsi and tianma dts")
Signed-off-by: Jens Reidel <adrian@travitia.xyz>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 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 2d6f0e382a6cb..d157622f84d13 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 b58964cde8342..71816a9f33b48 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.53.0

Re: [PATCH 1/2] dt-bindings: arm: qcom: Add Xiaomi Poco F1 Tianma variant bindings

[Krzysztof Kozlowski]

On Fri, Apr 03, 2026 at 06:55:33PM +0200, David Heidelberg wrote:
> Add documentation for Tianma display and touchscreen variant.
> 
> While at it, correct binding documentation expectation.

What expectation? What exactly did you corrected that you claim this is
a fix?

> 
> Fixes: 341fdef8ea49 ("dt-bindings: arm: qcom: Add Xiaomi Poco F1 EBBG variant bindings")


Best regards,
Krzysztof

Re: [PATCH 1/2] dt-bindings: arm: qcom: Add Xiaomi Poco F1 Tianma variant bindings

[David Heidelberg]

On 05/04/2026 09:55, Krzysztof Kozlowski wrote:
> On Fri, Apr 03, 2026 at 06:55:33PM +0200, David Heidelberg wrote:
>> Add documentation for Tianma display and touchscreen variant.
>>
>> While at it, correct binding documentation expectation.
> 
> What expectation? What exactly did you corrected that you claim this is
> a fix?

I would say the missing Tianma variant, which been with us for some time. The 
follow up commit fixes the missing compatible and order, thus it would make 
sense to me have also the dt-bindings part backported and fixed.

I agree I don't have strong case here. Should I drop the tag, keep it or replace 
it with Cc: stable@vger.kernel.org?

David

> 
>>
>> Fixes: 341fdef8ea49 ("dt-bindings: arm: qcom: Add Xiaomi Poco F1 EBBG variant bindings")
> 
> 
> Best regards,
> Krzysztof
> 

-- 
David Heidelberg

Re: [PATCH 2/2] arm64: dts: qcom: sdm845-xiaomi-beryllium: Fix compatible strings

[Krzysztof Kozlowski]

On Fri, Apr 03, 2026 at 06:55:34PM +0200, David Heidelberg wrote:
> From: Jens Reidel <adrian@travitia.xyz>
> 
> 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.
> 
> Fixes: bcf429831ecb ("arm64: dts: qcom: sdm845-xiaomi-beryllium-ebbg: introduce Xiaomi Poco F1 EBBG variant")
> Fixes: dd6459a0890a ("arm64: dts: qcom: split beryllium dts into common dtsi and tianma dts")
> Signed-off-by: Jens Reidel <adrian@travitia.xyz>
> Signed-off-by: David Heidelberg <david@ixit.cz>
> ---
>  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 2d6f0e382a6cb..d157622f84d13 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";

So now for all users of this ABI, the ebbg variant will be treated like
it was Tianma. Your commit msg should try to explain the impact of this,
beside the hexagonrpcd.

Technically this is ABI change.

Best regards,
Krzysztof

Re: [PATCH 2/2] arm64: dts: qcom: sdm845-xiaomi-beryllium: Fix compatible strings

[David Heidelberg]

On 05/04/2026 10:02, Krzysztof Kozlowski wrote:
> On Fri, Apr 03, 2026 at 06:55:34PM +0200, David Heidelberg wrote:
>> From: Jens Reidel <adrian@travitia.xyz>
>>
>> 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.
>>
>> Fixes: bcf429831ecb ("arm64: dts: qcom: sdm845-xiaomi-beryllium-ebbg: introduce Xiaomi Poco F1 EBBG variant")
>> Fixes: dd6459a0890a ("arm64: dts: qcom: split beryllium dts into common dtsi and tianma dts")
>> Signed-off-by: Jens Reidel <adrian@travitia.xyz>
>> Signed-off-by: David Heidelberg <david@ixit.cz>
>> ---
>>   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 2d6f0e382a6cb..d157622f84d13 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";
> 
> So now for all users of this ABI, the ebbg variant will be treated like
> it was Tianma. Your commit msg should try to explain the impact of this,
> beside the hexagonrpcd.

Sure, I'll update the commit msg.

> 
> Technically this is ABI change.
> 
> Best regards,
> Krzysztof
> 

-- 
David Heidelberg

Re: [PATCH 1/2] dt-bindings: arm: qcom: Add Xiaomi Poco F1 Tianma variant bindings

[Krzysztof Kozlowski]

On 05/04/2026 10:01, David Heidelberg wrote:
> On 05/04/2026 09:55, Krzysztof Kozlowski wrote:
>> On Fri, Apr 03, 2026 at 06:55:33PM +0200, David Heidelberg wrote:
>>> Add documentation for Tianma display and touchscreen variant.
>>>
>>> While at it, correct binding documentation expectation.
>>
>> What expectation? What exactly did you corrected that you claim this is
>> a fix?
> 
> I would say the missing Tianma variant, which been with us for some time. The 

Expectation of missing Tianma? We don't have such expectations...

> follow up commit fixes the missing compatible and order, thus it would make 
> sense to me have also the dt-bindings part backported and fixed.

You probably should read original discussion why this ended up like that.

> 
> I agree I don't have strong case here. Should I drop the tag, keep it or replace 
> it with Cc: stable@vger.kernel.org?

If you cannot explain what you are fixing, then this is not a fix.

Best regards,
Krzysztof

Re: [PATCH 1/2] dt-bindings: arm: qcom: Add Xiaomi Poco F1 Tianma variant bindings

[David Heidelberg]

On 05/04/2026 10:55, Krzysztof Kozlowski wrote:
> On 05/04/2026 10:01, David Heidelberg wrote:
>> On 05/04/2026 09:55, Krzysztof Kozlowski wrote:
>>> On Fri, Apr 03, 2026 at 06:55:33PM +0200, David Heidelberg wrote:
>>>> Add documentation for Tianma display and touchscreen variant.
>>>>
>>>> While at it, correct binding documentation expectation.
>>>
>>> What expectation? What exactly did you corrected that you claim this is
>>> a fix?
>>
>> I would say the missing Tianma variant, which been with us for some time. The
> 
> Expectation of missing Tianma? We don't have such expectations...

Ok.

> 
>> follow up commit fixes the missing compatible and order, thus it would make
>> sense to me have also the dt-bindings part backported and fixed.
> 
> You probably should read original discussion why this ended up like that.

All I found is

  The compatibility property is
  moved to the tianma variant, but it is not updated to avoid any
  further conflict with other projects/users that might depend on it.

> 
>>
>> I agree I don't have strong case here. Should I drop the tag, keep it or replace
>> it with Cc: stable@vger.kernel.org?
> 
> If you cannot explain what you are fixing, then this is not a fix.

Sure, I'll drop the tag.

> 
> Best regards,
> Krzysztof

-- 
David Heidelberg