[v2] sdm845: Use definitions and deduplicate

[PATCH v2 2/2] arm64: dts: qcom: sdm845-oneplus: Deduplicate shared entries

Posted by David Heidelberg via B4 Relay 2 months ago

From: David Heidelberg <david@ixit.cz>

Use the definition for qcom,msm-id and put them into the common dtsi.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi   | 4 ++++
 arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts | 2 --
 arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts    | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index b118d666e535a433f44b66c71b36e55df2ce5c80..dcfffb271fcf3146aeabda8fc19e61b456b76887 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -7,6 +7,7 @@
 
 /dts-v1/;
 
+#include <dt-bindings/arm/qcom,ids.h>
 #include <dt-bindings/input/linux-event-codes.h>
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
@@ -21,6 +22,9 @@
 /delete-node/ &rmtfs_mem;
 
 / {
+	chassis-type = "handset";
+	qcom,msm-id = <QCOM_ID_SDM845 0x20001>;
+
 	aliases {
 		serial0 = &uart9;
 		serial1 = &uart6;
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts b/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts
index 4005e04d998a40d25a64d652a526bf93efc20332..cd5546b69d13d8d7f29373aebab1cfda79666900 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts
@@ -10,8 +10,6 @@
 / {
 	model = "OnePlus 6";
 	compatible = "oneplus,enchilada", "qcom,sdm845";
-	chassis-type = "handset";
-	qcom,msm-id = <0x141 0x20001>;
 	qcom,board-id = <8 0 17819 22>;
 
 	battery: battery {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts
index 9471ada0d6ad8bd44cc58a6efa07f7eb27921af9..b4212626b42954e10974ec087db2b42b07979f72 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts
@@ -10,8 +10,6 @@
 / {
 	model = "OnePlus 6T";
 	compatible = "oneplus,fajita", "qcom,sdm845";
-	chassis-type = "handset";
-	qcom,msm-id = <0x141 0x20001>;
 	qcom,board-id = <8 0 18801 41>;
 
 	battery: battery {

-- 
2.50.1

Re: [PATCH v2 2/2] arm64: dts: qcom: sdm845-oneplus: Deduplicate shared entries

Posted by Krzysztof Kozlowski 2 months ago

On 01/08/2025 10:21, David Heidelberg via B4 Relay wrote:
> From: David Heidelberg <david@ixit.cz>
> 
> Use the definition for qcom,msm-id and put them into the common dtsi.
> 
> Signed-off-by: David Heidelberg <david@ixit.cz>

Interesting that they use same ID...

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH v2 2/2] arm64: dts: qcom: sdm845-oneplus: Deduplicate shared entries

Posted by David Heidelberg 2 months ago

On 01/08/2025 11:08, Krzysztof Kozlowski wrote:
> On 01/08/2025 10:21, David Heidelberg via B4 Relay wrote:
>> From: David Heidelberg <david@ixit.cz>
>>
>> Use the definition for qcom,msm-id and put them into the common dtsi.
>>
>> Signed-off-by: David Heidelberg <david@ixit.cz>
> 
> Interesting that they use same ID...
> 
> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
Thank you for the review.

More interestingly, Pixel 3 and Pixel 3 XL does use same qcom,board-id.

> Best regards,
> Krzysztof

-- 
David Heidelberg

Re: [PATCH v2 2/2] arm64: dts: qcom: sdm845-oneplus: Deduplicate shared entries

Posted by Konrad Dybcio 2 months ago

On 8/1/25 11:08 AM, Krzysztof Kozlowski wrote:
> On 01/08/2025 10:21, David Heidelberg via B4 Relay wrote:
>> From: David Heidelberg <david@ixit.cz>
>>
>> Use the definition for qcom,msm-id and put them into the common dtsi.
>>
>> Signed-off-by: David Heidelberg <david@ixit.cz>
> 
> Interesting that they use same ID...

msm-id is the SoC identifier

Konrad