* [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300
@ 2025-09-23 11:01 Dmitry Baryshkov
2025-09-23 11:01 ` [PATCH 1/3] arm64: dts: qcom: rename qcs8300 to monaco Dmitry Baryshkov
` (4 more replies)
0 siblings, 5 replies; 13+ messages in thread
From: Dmitry Baryshkov @ 2025-09-23 11:01 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
Bjorn said to me that he disliked the conseqeuences of renaming
qcs615.dtsi to sm6150.dtsi. Let's increase entropy even more and rename
even more base DTSI files.
Leaving jokes aside. It's not uncommon to see different names for the
same SoC (or almost same SoC, with no visible differences from the Linux
side). The platform now known as 'lemans' is a good example, because it
had been using SA8775P, QCS9100 and QCS9075 in different contexts for
slightly different modifications. QCS8300 / QCS8275 is another example.
All such names cause a lot of confusion when somebody tries to follow
the actual SoC used by the platform.
For 'lemans' after a lot of trial, error, Naks and reviews we've settled
upon having 'lemans.dtsi', the core DT file for the platform and then
naming individual DT files following the marketing name for the platform
or for the SoC.
Apply the same approach to several other platforms, renaming the base
DTSI and keeping the DT names as is.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
Dmitry Baryshkov (3):
arm64: dts: qcom: rename qcs8300 to monaco
arm64: dts: qcom: rename x1e80100 to hamoa
arm64: dts: qcom: rename sm6150 to talos
arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/{x1e80100-pmics.dtsi => hamoa-pmics.dtsi} | 0
arch/arm64/boot/dts/qcom/{x1e80100.dtsi => hamoa.dtsi} | 0
arch/arm64/boot/dts/qcom/monaco-evk.dts | 4 ++--
arch/arm64/boot/dts/qcom/{qcs8300-pmics.dtsi => monaco-pmics.dtsi} | 0
arch/arm64/boot/dts/qcom/{qcs8300.dtsi => monaco.dtsi} | 0
arch/arm64/boot/dts/qcom/qcs615-ride.dts | 2 +-
arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 4 ++--
arch/arm64/boot/dts/qcom/{sm6150.dtsi => talos.dtsi} | 0
arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi | 2 +-
arch/arm64/boot/dts/qcom/x1-crd.dtsi | 2 +-
arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 2 +-
arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts | 2 +-
arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 2 +-
arch/arm64/boot/dts/qcom/x1e80100-dell-inspiron-14-plus-7441.dts | 2 +-
arch/arm64/boot/dts/qcom/x1e80100-dell-latitude-7455.dts | 2 +-
arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts | 2 +-
arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 2 +-
arch/arm64/boot/dts/qcom/x1p42100.dtsi | 4 ++--
27 files changed, 34 insertions(+), 34 deletions(-)
---
base-commit: bf2602a3cb2381fb1a04bf1c39a290518d2538d1
change-id: 20250923-rename-dts-5d74d6132f40
Best regards,
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/3] arm64: dts: qcom: rename qcs8300 to monaco
2025-09-23 11:01 [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300 Dmitry Baryshkov
@ 2025-09-23 11:01 ` Dmitry Baryshkov
2025-09-24 10:10 ` Konrad Dybcio
2025-09-23 11:01 ` [PATCH 2/3] arm64: dts: qcom: rename x1e80100 to hamoa Dmitry Baryshkov
` (3 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Dmitry Baryshkov @ 2025-09-23 11:01 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
The QCS8300 and QCS8275 are two variants of the same die with no
difference visible to the Linux kernel, which are collectively named as
'monaco'. Rather than trying to using the name, which is not always
relevant, follow the example of 'lemans' and rename qcs8300.dtsi to
monaco.dtsi (and qcs8300-pmics.dtsi to monaco-pmics.dtsi).
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/monaco-evk.dts | 4 ++--
arch/arm64/boot/dts/qcom/{qcs8300-pmics.dtsi => monaco-pmics.dtsi} | 0
arch/arm64/boot/dts/qcom/{qcs8300.dtsi => monaco.dtsi} | 0
arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 4 ++--
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/monaco-evk.dts b/arch/arm64/boot/dts/qcom/monaco-evk.dts
index e72cf6725a52c0c0e017be800bfac1773fad1059..d9e9e65a137da73645aee4a857688a4730875347 100644
--- a/arch/arm64/boot/dts/qcom/monaco-evk.dts
+++ b/arch/arm64/boot/dts/qcom/monaco-evk.dts
@@ -9,8 +9,8 @@
#include <dt-bindings/sound/qcom,q6afe.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include "qcs8300.dtsi"
-#include "qcs8300-pmics.dtsi"
+#include "monaco.dtsi"
+#include "monaco-pmics.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Monaco EVK";
diff --git a/arch/arm64/boot/dts/qcom/qcs8300-pmics.dtsi b/arch/arm64/boot/dts/qcom/monaco-pmics.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/qcs8300-pmics.dtsi
rename to arch/arm64/boot/dts/qcom/monaco-pmics.dtsi
diff --git a/arch/arm64/boot/dts/qcom/qcs8300.dtsi b/arch/arm64/boot/dts/qcom/monaco.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/qcs8300.dtsi
rename to arch/arm64/boot/dts/qcom/monaco.dtsi
diff --git a/arch/arm64/boot/dts/qcom/qcs8300-ride.dts b/arch/arm64/boot/dts/qcom/qcs8300-ride.dts
index cabb3f508704bc9eb0038bd797cc547d0c8cb3ed..9bcb869dd270603a34221b905f0946e8af028433 100644
--- a/arch/arm64/boot/dts/qcom/qcs8300-ride.dts
+++ b/arch/arm64/boot/dts/qcom/qcs8300-ride.dts
@@ -8,8 +8,8 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include "qcs8300.dtsi"
-#include "qcs8300-pmics.dtsi"
+#include "monaco.dtsi"
+#include "monaco-pmics.dtsi"
/ {
model = "Qualcomm Technologies, Inc. QCS8300 Ride";
compatible = "qcom,qcs8300-ride", "qcom,qcs8300";
--
2.47.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/3] arm64: dts: qcom: rename x1e80100 to hamoa
2025-09-23 11:01 [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300 Dmitry Baryshkov
2025-09-23 11:01 ` [PATCH 1/3] arm64: dts: qcom: rename qcs8300 to monaco Dmitry Baryshkov
@ 2025-09-23 11:01 ` Dmitry Baryshkov
2025-09-23 11:12 ` Stephan Gerhold
2025-09-23 11:01 ` [PATCH 3/3] arm64: dts: qcom: rename sm6150 to talos Dmitry Baryshkov
` (2 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Dmitry Baryshkov @ 2025-09-23 11:01 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
The X1E80100 and several other similar names (X1E78100, X1E001DE) all
belong to the platform now known as 'hamoa'. Follow the example of
'lemans' and rename the x1e80100.dtsi to hamoa.dtsi and
x1e80100-pmics.dtsi to hamoa-pmics.dtsi.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/{x1e80100-pmics.dtsi => hamoa-pmics.dtsi} | 0
arch/arm64/boot/dts/qcom/{x1e80100.dtsi => hamoa.dtsi} | 0
arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi | 2 +-
arch/arm64/boot/dts/qcom/x1-crd.dtsi | 2 +-
arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 2 +-
arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts | 2 +-
arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 2 +-
arch/arm64/boot/dts/qcom/x1e80100-dell-inspiron-14-plus-7441.dts | 2 +-
arch/arm64/boot/dts/qcom/x1e80100-dell-latitude-7455.dts | 2 +-
arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 4 ++--
arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts | 2 +-
arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 2 +-
arch/arm64/boot/dts/qcom/x1p42100.dtsi | 4 ++--
21 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi b/arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi
index 1aead50b8920b557ca5bd1405da4a9ca658f4417..4de7c0abb25a12f349ab859fd9e5c68600be42c1 100644
--- a/arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi
+++ b/arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi
@@ -3,8 +3,8 @@
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
*/
-#include "x1e80100.dtsi"
-#include "x1e80100-pmics.dtsi"
+#include "hamoa.dtsi"
+#include "hamoa-pmics.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi b/arch/arm64/boot/dts/qcom/hamoa-pmics.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi
rename to arch/arm64/boot/dts/qcom/hamoa-pmics.dtsi
diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/hamoa.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/x1e80100.dtsi
rename to arch/arm64/boot/dts/qcom/hamoa.dtsi
diff --git a/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi b/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
index ee3c8c5e2c50c405937730c2f7feec43f809af6b..69eccad1a09c240ba721ecfd50d1558aaa1a633a 100644
--- a/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
@@ -11,7 +11,7 @@
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include "x1e80100-pmics.dtsi"
+#include "hamoa-pmics.dtsi"
/ {
model = "ASUS Zenbook A14";
diff --git a/arch/arm64/boot/dts/qcom/x1-crd.dtsi b/arch/arm64/boot/dts/qcom/x1-crd.dtsi
index 3c9455fede5c09d90e00c98db35d49e8738e6acc..5e324f35547a4c803af51e64328b6fb72b4bf7e9 100644
--- a/arch/arm64/boot/dts/qcom/x1-crd.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1-crd.dtsi
@@ -9,7 +9,7 @@
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include "x1e80100-pmics.dtsi"
+#include "hamoa-pmics.dtsi"
/ {
model = "Qualcomm Technologies, Inc. X1E80100 CRD";
diff --git a/arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi b/arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi
index cc64558ed5e6fa30bef549d076db41ac22faa5a9..10dc191c193adf2d6cf0d6a237cc0fa245d04ccc 100644
--- a/arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi
@@ -12,7 +12,7 @@
#include <dt-bindings/leds/common.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include "x1e80100-pmics.dtsi"
+#include "hamoa-pmics.dtsi"
/ {
chassis-type = "laptop";
diff --git a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
index bfc649d4b643ca5d0d12565bf147b9b1df90095c..701f35af7d5cd080de48cb70db3bb9bea3e46264 100644
--- a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
+++ b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
@@ -8,8 +8,8 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include "x1e80100.dtsi"
-#include "x1e80100-pmics.dtsi"
+#include "hamoa.dtsi"
+#include "hamoa-pmics.dtsi"
/ {
model = "Qualcomm Technologies, Inc. X1E001DE Snapdragon Devkit for Windows";
diff --git a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
index 0a989e9d3d23146cb9689b68ba6c5779283b3c98..84dc764657f10c2742bcc3205c44e59be18bda4f 100644
--- a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
@@ -12,8 +12,8 @@
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include "x1e80100.dtsi"
-#include "x1e80100-pmics.dtsi"
+#include "hamoa.dtsi"
+#include "hamoa-pmics.dtsi"
/ {
model = "Lenovo ThinkPad T14s Gen 6";
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
index 0113d856b3ad4e9d1b15dc6a32b4572867a794ac..f2960953e608fb81be9b941115df6ba2c9913663 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
@@ -11,8 +11,8 @@
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
-#include "x1e80100.dtsi"
-#include "x1e80100-pmics.dtsi"
+#include "hamoa.dtsi"
+#include "hamoa-pmics.dtsi"
/ {
model = "ASUS Vivobook S 15";
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts
index 0d0bcc50207d7540285d82304dbc99e82858f6f0..c3cd04c9703d3df6b04ef4a1393e92aa6b60a5a0 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts
@@ -6,7 +6,7 @@
/dts-v1/;
-#include "x1e80100.dtsi"
+#include "hamoa.dtsi"
#include "x1-asus-zenbook-a14.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
index dfc378e1a056a8af27ef4b646f7589e7198dbaf8..429deffcf3e9dfeb92c9f6141e7611bdec996c8c 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts
@@ -5,7 +5,7 @@
/dts-v1/;
-#include "x1e80100.dtsi"
+#include "hamoa.dtsi"
#include "x1-crd.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-dell-inspiron-14-plus-7441.dts b/arch/arm64/boot/dts/qcom/x1e80100-dell-inspiron-14-plus-7441.dts
index cf2a7c2628881e44f093d73e6496462c22326d9a..75e10d97c38674fbe4affabff7d1079de095af91 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-dell-inspiron-14-plus-7441.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-dell-inspiron-14-plus-7441.dts
@@ -4,7 +4,7 @@
*/
/dts-v1/;
-#include "x1e80100.dtsi"
+#include "hamoa.dtsi"
#include "x1-dell-thena.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-dell-latitude-7455.dts b/arch/arm64/boot/dts/qcom/x1e80100-dell-latitude-7455.dts
index 32ad9679550efce1fda1182bd874d6a3c53d8f03..a8ff7ef258a13398679894a14bb3333437717816 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-dell-latitude-7455.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-dell-latitude-7455.dts
@@ -4,7 +4,7 @@
*/
/dts-v1/;
-#include "x1e80100.dtsi"
+#include "hamoa.dtsi"
#include "x1-dell-thena.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts b/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts
index 58f8caaa7258077d2c267048ca048279109ddb71..c1f49cba61fc40c764122f365f2e4b418579a73b 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts
@@ -12,8 +12,8 @@
#include <dt-bindings/leds/common.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include "x1e80100.dtsi"
-#include "x1e80100-pmics.dtsi"
+#include "hamoa.dtsi"
+#include "hamoa-pmics.dtsi"
/ {
model = "Dell XPS 13 9345";
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts b/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
index e5a839d458402c46e45a2cba9b92d3eb1e8438c2..b79e59e1c413aeb9f24466cedc2c9abea48a3d52 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
@@ -6,8 +6,8 @@
/dts-v1/;
-#include "x1e80100.dtsi"
-#include "x1e80100-pmics.dtsi"
+#include "hamoa.dtsi"
+#include "hamoa-pmics.dtsi"
#include "x1-hp-omnibook-x14.dtsi"
/ {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
index e0642fe8343f6818e1e10656a1d8fec8fb09e7e2..56e4d13cca11165c30dcbed8a1e0a4d7f8fa5cc2 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
@@ -9,8 +9,8 @@
#include <dt-bindings/input/gpio-keys.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include "x1e80100.dtsi"
-#include "x1e80100-pmics.dtsi"
+#include "hamoa.dtsi"
+#include "hamoa-pmics.dtsi"
/ {
model = "Lenovo Yoga Slim 7x";
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
index ed468b93ba50e1943671d9e7d8b77d181a7c2658..3b319f65dde1e0df9e53191acfa161ccb49dff7b 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
@@ -9,8 +9,8 @@
#include <dt-bindings/leds/common.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include "x1e80100.dtsi"
-#include "x1e80100-pmics.dtsi"
+#include "hamoa.dtsi"
+#include "hamoa-pmics.dtsi"
/ {
aliases {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
index 4a9b6d791e7f475eed8940cce633ca000bb2ae09..5a121fc4494014f01be5d6e3ab95060581ec83ad 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
@@ -8,8 +8,8 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
-#include "x1e80100.dtsi"
-#include "x1e80100-pmics.dtsi"
+#include "hamoa.dtsi"
+#include "hamoa-pmics.dtsi"
/ {
model = "Qualcomm Technologies, Inc. X1E80100 QCP";
diff --git a/arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts b/arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts
index 6696cab2de3ec899d7ae5498f2f4b75e2131a19c..47ab0c5b30341ee791fd3976da50ada54617a8af 100644
--- a/arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts
+++ b/arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts
@@ -3,7 +3,7 @@
/dts-v1/;
#include "x1p42100.dtsi"
-#include "x1e80100-pmics.dtsi"
+#include "hamoa-pmics.dtsi"
#include "x1-hp-omnibook-x14.dtsi"
/delete-node/ &pmc8380_6;
/delete-node/ &pmc8380_6_thermal;
diff --git a/arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts b/arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts
index 1ac46cdc4386120ee18cd60380c1fcd10fbf472e..f7d372d2e96129eaee072504514272f8ae34cb32 100644
--- a/arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts
+++ b/arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts
@@ -14,7 +14,7 @@
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include "x1p42100.dtsi"
-#include "x1e80100-pmics.dtsi"
+#include "hamoa-pmics.dtsi"
/delete-node/ &pmc8380_6;
/delete-node/ &pmc8380_6_thermal;
diff --git a/arch/arm64/boot/dts/qcom/x1p42100.dtsi b/arch/arm64/boot/dts/qcom/x1p42100.dtsi
index 10d26958d3c66a5a4faf2ca6065e7b661f967b4e..2cecd2dd0de8c39f0702d6983bead2bc2adccf9b 100644
--- a/arch/arm64/boot/dts/qcom/x1p42100.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1p42100.dtsi
@@ -3,8 +3,8 @@
* Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/
-/* X1P42100 is heavily based on X1E80100, with some meaningful differences */
-#include "x1e80100.dtsi"
+/* X1P42100 is heavily based on hamoa, with some meaningful differences */
+#include "hamoa.dtsi"
/delete-node/ &bwmon_cluster0;
/delete-node/ &cluster_pd2;
--
2.47.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/3] arm64: dts: qcom: rename sm6150 to talos
2025-09-23 11:01 [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300 Dmitry Baryshkov
2025-09-23 11:01 ` [PATCH 1/3] arm64: dts: qcom: rename qcs8300 to monaco Dmitry Baryshkov
2025-09-23 11:01 ` [PATCH 2/3] arm64: dts: qcom: rename x1e80100 to hamoa Dmitry Baryshkov
@ 2025-09-23 11:01 ` Dmitry Baryshkov
2025-09-24 10:10 ` Konrad Dybcio
2025-09-23 13:00 ` [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300 Luca Weiss
2025-10-27 22:36 ` Bjorn Andersson
4 siblings, 1 reply; 13+ messages in thread
From: Dmitry Baryshkov @ 2025-09-23 11:01 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
SM6150 and QCS615 are two names for the same die, collectively known as
'talos'. Follow the example of other platforms and rename SM6150 to
talos.dtsi.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/qcs615-ride.dts | 2 +-
arch/arm64/boot/dts/qcom/{sm6150.dtsi => talos.dtsi} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/qcs615-ride.dts b/arch/arm64/boot/dts/qcom/qcs615-ride.dts
index 705ea71b07a10aea82b5789e8ab9f757683f678a..e8faa25da79f10e4c3b2849ab078e88b9b5d03ab 100644
--- a/arch/arm64/boot/dts/qcom/qcs615-ride.dts
+++ b/arch/arm64/boot/dts/qcom/qcs615-ride.dts
@@ -7,7 +7,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include <dt-bindings/gpio/gpio.h>
-#include "sm6150.dtsi"
+#include "talos.dtsi"
#include "pm8150.dtsi"
/ {
model = "Qualcomm Technologies, Inc. QCS615 Ride";
diff --git a/arch/arm64/boot/dts/qcom/sm6150.dtsi b/arch/arm64/boot/dts/qcom/talos.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/sm6150.dtsi
rename to arch/arm64/boot/dts/qcom/talos.dtsi
--
2.47.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 2/3] arm64: dts: qcom: rename x1e80100 to hamoa
2025-09-23 11:01 ` [PATCH 2/3] arm64: dts: qcom: rename x1e80100 to hamoa Dmitry Baryshkov
@ 2025-09-23 11:12 ` Stephan Gerhold
2025-09-23 15:14 ` Dmitry Baryshkov
0 siblings, 1 reply; 13+ messages in thread
From: Stephan Gerhold @ 2025-09-23 11:12 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-arm-msm, devicetree, linux-kernel
On Tue, Sep 23, 2025 at 02:01:55PM +0300, Dmitry Baryshkov wrote:
> The X1E80100 and several other similar names (X1E78100, X1E001DE) all
> belong to the platform now known as 'hamoa'. Follow the example of
> 'lemans' and rename the x1e80100.dtsi to hamoa.dtsi and
> x1e80100-pmics.dtsi to hamoa-pmics.dtsi.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
> arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi | 4 ++--
> arch/arm64/boot/dts/qcom/{x1e80100-pmics.dtsi => hamoa-pmics.dtsi} | 0
> arch/arm64/boot/dts/qcom/{x1e80100.dtsi => hamoa.dtsi} | 0
> arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/x1-crd.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1e80100-dell-inspiron-14-plus-7441.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1e80100-dell-latitude-7455.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1p42100.dtsi | 4 ++--
> 21 files changed, 29 insertions(+), 29 deletions(-)
>
> [...]
> diff --git a/arch/arm64/boot/dts/qcom/x1p42100.dtsi b/arch/arm64/boot/dts/qcom/x1p42100.dtsi
> index 10d26958d3c66a5a4faf2ca6065e7b661f967b4e..2cecd2dd0de8c39f0702d6983bead2bc2adccf9b 100644
> --- a/arch/arm64/boot/dts/qcom/x1p42100.dtsi
> +++ b/arch/arm64/boot/dts/qcom/x1p42100.dtsi
> @@ -3,8 +3,8 @@
> * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
> */
>
> -/* X1P42100 is heavily based on X1E80100, with some meaningful differences */
> -#include "x1e80100.dtsi"
> +/* X1P42100 is heavily based on hamoa, with some meaningful differences */
> +#include "hamoa.dtsi"
>
If you're renaming X1E, please also rename X1P42100 ("X1(P) with 8
cores"(?)) for consistency. That one also covers multiple SoCs.
Thanks,
Stephan
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300
2025-09-23 11:01 [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300 Dmitry Baryshkov
` (2 preceding siblings ...)
2025-09-23 11:01 ` [PATCH 3/3] arm64: dts: qcom: rename sm6150 to talos Dmitry Baryshkov
@ 2025-09-23 13:00 ` Luca Weiss
2025-09-23 15:17 ` Dmitry Baryshkov
2025-10-27 22:36 ` Bjorn Andersson
4 siblings, 1 reply; 13+ messages in thread
From: Luca Weiss @ 2025-09-23 13:00 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
On Tue Sep 23, 2025 at 1:01 PM CEST, Dmitry Baryshkov wrote:
> Bjorn said to me that he disliked the conseqeuences of renaming
> qcs615.dtsi to sm6150.dtsi. Let's increase entropy even more and rename
> even more base DTSI files.
>
> Leaving jokes aside. It's not uncommon to see different names for the
> same SoC (or almost same SoC, with no visible differences from the Linux
> side). The platform now known as 'lemans' is a good example, because it
> had been using SA8775P, QCS9100 and QCS9075 in different contexts for
> slightly different modifications. QCS8300 / QCS8275 is another example.
> All such names cause a lot of confusion when somebody tries to follow
> the actual SoC used by the platform.
>
> For 'lemans' after a lot of trial, error, Naks and reviews we've settled
> upon having 'lemans.dtsi', the core DT file for the platform and then
> naming individual DT files following the marketing name for the platform
> or for the SoC.
>
> Apply the same approach to several other platforms, renaming the base
> DTSI and keeping the DT names as is.
If we're doing this already, sc7280 -> kodiak? That also covers sc7280,
qc{m,s}6490 & 5430 and sm7325.
Also, does this mean that milos-based Fairphone 6 the dtsi should be
milos.dtsi while dts should be sm7635-fairphone-fp6? The latest patch
series uses milos-fairphone-fp6.dts.
Regards
Luca
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
> Dmitry Baryshkov (3):
> arm64: dts: qcom: rename qcs8300 to monaco
> arm64: dts: qcom: rename x1e80100 to hamoa
> arm64: dts: qcom: rename sm6150 to talos
>
> arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi | 4 ++--
> arch/arm64/boot/dts/qcom/{x1e80100-pmics.dtsi => hamoa-pmics.dtsi} | 0
> arch/arm64/boot/dts/qcom/{x1e80100.dtsi => hamoa.dtsi} | 0
> arch/arm64/boot/dts/qcom/monaco-evk.dts | 4 ++--
> arch/arm64/boot/dts/qcom/{qcs8300-pmics.dtsi => monaco-pmics.dtsi} | 0
> arch/arm64/boot/dts/qcom/{qcs8300.dtsi => monaco.dtsi} | 0
> arch/arm64/boot/dts/qcom/qcs615-ride.dts | 2 +-
> arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 4 ++--
> arch/arm64/boot/dts/qcom/{sm6150.dtsi => talos.dtsi} | 0
> arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/x1-crd.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1e80100-dell-inspiron-14-plus-7441.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1e80100-dell-latitude-7455.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 4 ++--
> arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 4 ++--
> arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 2 +-
> arch/arm64/boot/dts/qcom/x1p42100.dtsi | 4 ++--
> 27 files changed, 34 insertions(+), 34 deletions(-)
> ---
> base-commit: bf2602a3cb2381fb1a04bf1c39a290518d2538d1
> change-id: 20250923-rename-dts-5d74d6132f40
>
> Best regards,
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/3] arm64: dts: qcom: rename x1e80100 to hamoa
2025-09-23 11:12 ` Stephan Gerhold
@ 2025-09-23 15:14 ` Dmitry Baryshkov
2025-09-23 18:59 ` Stephan Gerhold
0 siblings, 1 reply; 13+ messages in thread
From: Dmitry Baryshkov @ 2025-09-23 15:14 UTC (permalink / raw)
To: Stephan Gerhold
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-arm-msm, devicetree, linux-kernel
On Tue, Sep 23, 2025 at 01:12:12PM +0200, Stephan Gerhold wrote:
> On Tue, Sep 23, 2025 at 02:01:55PM +0300, Dmitry Baryshkov wrote:
> > The X1E80100 and several other similar names (X1E78100, X1E001DE) all
> > belong to the platform now known as 'hamoa'. Follow the example of
> > 'lemans' and rename the x1e80100.dtsi to hamoa.dtsi and
> > x1e80100-pmics.dtsi to hamoa-pmics.dtsi.
> >
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> > ---
> > arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi | 4 ++--
> > arch/arm64/boot/dts/qcom/{x1e80100-pmics.dtsi => hamoa-pmics.dtsi} | 0
> > arch/arm64/boot/dts/qcom/{x1e80100.dtsi => hamoa.dtsi} | 0
> > arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi | 2 +-
> > arch/arm64/boot/dts/qcom/x1-crd.dtsi | 2 +-
> > arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 2 +-
> > arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1e80100-dell-inspiron-14-plus-7441.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1e80100-dell-latitude-7455.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1p42100.dtsi | 4 ++--
> > 21 files changed, 29 insertions(+), 29 deletions(-)
> >
> > [...]
> > diff --git a/arch/arm64/boot/dts/qcom/x1p42100.dtsi b/arch/arm64/boot/dts/qcom/x1p42100.dtsi
> > index 10d26958d3c66a5a4faf2ca6065e7b661f967b4e..2cecd2dd0de8c39f0702d6983bead2bc2adccf9b 100644
> > --- a/arch/arm64/boot/dts/qcom/x1p42100.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/x1p42100.dtsi
> > @@ -3,8 +3,8 @@
> > * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
> > */
> >
> > -/* X1P42100 is heavily based on X1E80100, with some meaningful differences */
> > -#include "x1e80100.dtsi"
> > +/* X1P42100 is heavily based on hamoa, with some meaningful differences */
> > +#include "hamoa.dtsi"
> >
>
> If you're renaming X1E, please also rename X1P42100 ("X1(P) with 8
> cores"(?)) for consistency. That one also covers multiple SoCs.
I haven't checked if we have clearence for that name.
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300
2025-09-23 13:00 ` [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300 Luca Weiss
@ 2025-09-23 15:17 ` Dmitry Baryshkov
2025-09-24 10:11 ` Konrad Dybcio
0 siblings, 1 reply; 13+ messages in thread
From: Dmitry Baryshkov @ 2025-09-23 15:17 UTC (permalink / raw)
To: Luca Weiss
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-arm-msm, devicetree, linux-kernel
On Tue, Sep 23, 2025 at 03:00:19PM +0200, Luca Weiss wrote:
> On Tue Sep 23, 2025 at 1:01 PM CEST, Dmitry Baryshkov wrote:
> > Bjorn said to me that he disliked the conseqeuences of renaming
> > qcs615.dtsi to sm6150.dtsi. Let's increase entropy even more and rename
> > even more base DTSI files.
> >
> > Leaving jokes aside. It's not uncommon to see different names for the
> > same SoC (or almost same SoC, with no visible differences from the Linux
> > side). The platform now known as 'lemans' is a good example, because it
> > had been using SA8775P, QCS9100 and QCS9075 in different contexts for
> > slightly different modifications. QCS8300 / QCS8275 is another example.
> > All such names cause a lot of confusion when somebody tries to follow
> > the actual SoC used by the platform.
> >
> > For 'lemans' after a lot of trial, error, Naks and reviews we've settled
> > upon having 'lemans.dtsi', the core DT file for the platform and then
> > naming individual DT files following the marketing name for the platform
> > or for the SoC.
> >
> > Apply the same approach to several other platforms, renaming the base
> > DTSI and keeping the DT names as is.
>
> If we're doing this already, sc7280 -> kodiak? That also covers sc7280,
> qc{m,s}6490 & 5430 and sm7325.
And few other platform names with multiple SoC names per platform.
>
> Also, does this mean that milos-based Fairphone 6 the dtsi should be
> milos.dtsi while dts should be sm7635-fairphone-fp6? The latest patch
> series uses milos-fairphone-fp6.dts.
I'd leave this to Bjorn's discretion.
>
> Regards
> Luca
>
> >
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> > ---
> > Dmitry Baryshkov (3):
> > arm64: dts: qcom: rename qcs8300 to monaco
> > arm64: dts: qcom: rename x1e80100 to hamoa
> > arm64: dts: qcom: rename sm6150 to talos
> >
> > arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi | 4 ++--
> > arch/arm64/boot/dts/qcom/{x1e80100-pmics.dtsi => hamoa-pmics.dtsi} | 0
> > arch/arm64/boot/dts/qcom/{x1e80100.dtsi => hamoa.dtsi} | 0
> > arch/arm64/boot/dts/qcom/monaco-evk.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/{qcs8300-pmics.dtsi => monaco-pmics.dtsi} | 0
> > arch/arm64/boot/dts/qcom/{qcs8300.dtsi => monaco.dtsi} | 0
> > arch/arm64/boot/dts/qcom/qcs615-ride.dts | 2 +-
> > arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/{sm6150.dtsi => talos.dtsi} | 0
> > arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi | 2 +-
> > arch/arm64/boot/dts/qcom/x1-crd.dtsi | 2 +-
> > arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 2 +-
> > arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1e80100-dell-inspiron-14-plus-7441.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1e80100-dell-latitude-7455.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 4 ++--
> > arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 4 ++--
> > arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 2 +-
> > arch/arm64/boot/dts/qcom/x1p42100.dtsi | 4 ++--
> > 27 files changed, 34 insertions(+), 34 deletions(-)
> > ---
> > base-commit: bf2602a3cb2381fb1a04bf1c39a290518d2538d1
> > change-id: 20250923-rename-dts-5d74d6132f40
> >
> > Best regards,
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/3] arm64: dts: qcom: rename x1e80100 to hamoa
2025-09-23 15:14 ` Dmitry Baryshkov
@ 2025-09-23 18:59 ` Stephan Gerhold
0 siblings, 0 replies; 13+ messages in thread
From: Stephan Gerhold @ 2025-09-23 18:59 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-arm-msm, devicetree, linux-kernel
On Tue, Sep 23, 2025 at 06:14:45PM +0300, Dmitry Baryshkov wrote:
> On Tue, Sep 23, 2025 at 01:12:12PM +0200, Stephan Gerhold wrote:
> > On Tue, Sep 23, 2025 at 02:01:55PM +0300, Dmitry Baryshkov wrote:
> > > The X1E80100 and several other similar names (X1E78100, X1E001DE) all
> > > belong to the platform now known as 'hamoa'. Follow the example of
> > > 'lemans' and rename the x1e80100.dtsi to hamoa.dtsi and
> > > x1e80100-pmics.dtsi to hamoa-pmics.dtsi.
> > >
> > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> > > ---
> > > arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi | 4 ++--
> > > arch/arm64/boot/dts/qcom/{x1e80100-pmics.dtsi => hamoa-pmics.dtsi} | 0
> > > arch/arm64/boot/dts/qcom/{x1e80100.dtsi => hamoa.dtsi} | 0
> > > arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi | 2 +-
> > > arch/arm64/boot/dts/qcom/x1-crd.dtsi | 2 +-
> > > arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 2 +-
> > > arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 4 ++--
> > > arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 4 ++--
> > > arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 4 ++--
> > > arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts | 2 +-
> > > arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 2 +-
> > > arch/arm64/boot/dts/qcom/x1e80100-dell-inspiron-14-plus-7441.dts | 2 +-
> > > arch/arm64/boot/dts/qcom/x1e80100-dell-latitude-7455.dts | 2 +-
> > > arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 4 ++--
> > > arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 4 ++--
> > > arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 4 ++--
> > > arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 4 ++--
> > > arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 4 ++--
> > > arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts | 2 +-
> > > arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 2 +-
> > > arch/arm64/boot/dts/qcom/x1p42100.dtsi | 4 ++--
> > > 21 files changed, 29 insertions(+), 29 deletions(-)
> > >
> > > [...]
> > > diff --git a/arch/arm64/boot/dts/qcom/x1p42100.dtsi b/arch/arm64/boot/dts/qcom/x1p42100.dtsi
> > > index 10d26958d3c66a5a4faf2ca6065e7b661f967b4e..2cecd2dd0de8c39f0702d6983bead2bc2adccf9b 100644
> > > --- a/arch/arm64/boot/dts/qcom/x1p42100.dtsi
> > > +++ b/arch/arm64/boot/dts/qcom/x1p42100.dtsi
> > > @@ -3,8 +3,8 @@
> > > * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
> > > */
> > >
> > > -/* X1P42100 is heavily based on X1E80100, with some meaningful differences */
> > > -#include "x1e80100.dtsi"
> > > +/* X1P42100 is heavily based on hamoa, with some meaningful differences */
> > > +#include "hamoa.dtsi"
> > >
> >
> > If you're renaming X1E, please also rename X1P42100 ("X1(P) with 8
> > cores"(?)) for consistency. That one also covers multiple SoCs.
>
> I haven't checked if we have clearence for that name.
>
This is a good chance to ask then? :-) I'm pretty sure I've seen it
being used by someone on the mailing list already ...
Thanks,
Stephan
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] arm64: dts: qcom: rename qcs8300 to monaco
2025-09-23 11:01 ` [PATCH 1/3] arm64: dts: qcom: rename qcs8300 to monaco Dmitry Baryshkov
@ 2025-09-24 10:10 ` Konrad Dybcio
0 siblings, 0 replies; 13+ messages in thread
From: Konrad Dybcio @ 2025-09-24 10:10 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
On 9/23/25 1:01 PM, Dmitry Baryshkov wrote:
> The QCS8300 and QCS8275 are two variants of the same die with no
> difference visible to the Linux kernel, which are collectively named as
> 'monaco'. Rather than trying to using the name, which is not always
> relevant, follow the example of 'lemans' and rename qcs8300.dtsi to
> monaco.dtsi (and qcs8300-pmics.dtsi to monaco-pmics.dtsi).
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Konrad
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] arm64: dts: qcom: rename sm6150 to talos
2025-09-23 11:01 ` [PATCH 3/3] arm64: dts: qcom: rename sm6150 to talos Dmitry Baryshkov
@ 2025-09-24 10:10 ` Konrad Dybcio
0 siblings, 0 replies; 13+ messages in thread
From: Konrad Dybcio @ 2025-09-24 10:10 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel
On 9/23/25 1:01 PM, Dmitry Baryshkov wrote:
> SM6150 and QCS615 are two names for the same die, collectively known as
> 'talos'. Follow the example of other platforms and rename SM6150 to
> talos.dtsi.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Konrad
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300
2025-09-23 15:17 ` Dmitry Baryshkov
@ 2025-09-24 10:11 ` Konrad Dybcio
0 siblings, 0 replies; 13+ messages in thread
From: Konrad Dybcio @ 2025-09-24 10:11 UTC (permalink / raw)
To: Dmitry Baryshkov, Luca Weiss
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-arm-msm, devicetree, linux-kernel
On 9/23/25 5:17 PM, Dmitry Baryshkov wrote:
> On Tue, Sep 23, 2025 at 03:00:19PM +0200, Luca Weiss wrote:
>> On Tue Sep 23, 2025 at 1:01 PM CEST, Dmitry Baryshkov wrote:
>>> Bjorn said to me that he disliked the conseqeuences of renaming
>>> qcs615.dtsi to sm6150.dtsi. Let's increase entropy even more and rename
>>> even more base DTSI files.
>>>
>>> Leaving jokes aside. It's not uncommon to see different names for the
>>> same SoC (or almost same SoC, with no visible differences from the Linux
>>> side). The platform now known as 'lemans' is a good example, because it
>>> had been using SA8775P, QCS9100 and QCS9075 in different contexts for
>>> slightly different modifications. QCS8300 / QCS8275 is another example.
>>> All such names cause a lot of confusion when somebody tries to follow
>>> the actual SoC used by the platform.
>>>
>>> For 'lemans' after a lot of trial, error, Naks and reviews we've settled
>>> upon having 'lemans.dtsi', the core DT file for the platform and then
>>> naming individual DT files following the marketing name for the platform
>>> or for the SoC.
>>>
>>> Apply the same approach to several other platforms, renaming the base
>>> DTSI and keeping the DT names as is.
>>
>> If we're doing this already, sc7280 -> kodiak? That also covers sc7280,
>> qc{m,s}6490 & 5430 and sm7325.
>
> And few other platform names with multiple SoC names per platform.
>
>>
>> Also, does this mean that milos-based Fairphone 6 the dtsi should be
>> milos.dtsi while dts should be sm7635-fairphone-fp6? The latest patch
>> series uses milos-fairphone-fp6.dts.
>
> I'd leave this to Bjorn's discretion.
I think this only makes sense if milos-nos-sm7635-fairphone-fp6 has
physical differences that stem from the SKU being equipped with a
differently capable SoC (which remains mostly software compatible
otherwise)
Konrad
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300
2025-09-23 11:01 [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300 Dmitry Baryshkov
` (3 preceding siblings ...)
2025-09-23 13:00 ` [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300 Luca Weiss
@ 2025-10-27 22:36 ` Bjorn Andersson
4 siblings, 0 replies; 13+ messages in thread
From: Bjorn Andersson @ 2025-10-27 22:36 UTC (permalink / raw)
To: Konrad Dybcio, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Dmitry Baryshkov
Cc: linux-arm-msm, devicetree, linux-kernel
On Tue, 23 Sep 2025 14:01:53 +0300, Dmitry Baryshkov wrote:
> Bjorn said to me that he disliked the conseqeuences of renaming
> qcs615.dtsi to sm6150.dtsi. Let's increase entropy even more and rename
> even more base DTSI files.
>
> Leaving jokes aside. It's not uncommon to see different names for the
> same SoC (or almost same SoC, with no visible differences from the Linux
> side). The platform now known as 'lemans' is a good example, because it
> had been using SA8775P, QCS9100 and QCS9075 in different contexts for
> slightly different modifications. QCS8300 / QCS8275 is another example.
> All such names cause a lot of confusion when somebody tries to follow
> the actual SoC used by the platform.
>
> [...]
Applied, thanks!
[1/3] arm64: dts: qcom: rename qcs8300 to monaco
commit: e50e601ef5b96def44c9ca9685cda6832eb7578e
[2/3] arm64: dts: qcom: rename x1e80100 to hamoa
commit: 8c0b058ab5983a4be6690a76be9b0294853e8e55
[3/3] arm64: dts: qcom: rename sm6150 to talos
commit: 9a5b294dcc21f0b20b586206e5bab9969b4add1c
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2025-10-27 22:34 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-23 11:01 [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300 Dmitry Baryshkov
2025-09-23 11:01 ` [PATCH 1/3] arm64: dts: qcom: rename qcs8300 to monaco Dmitry Baryshkov
2025-09-24 10:10 ` Konrad Dybcio
2025-09-23 11:01 ` [PATCH 2/3] arm64: dts: qcom: rename x1e80100 to hamoa Dmitry Baryshkov
2025-09-23 11:12 ` Stephan Gerhold
2025-09-23 15:14 ` Dmitry Baryshkov
2025-09-23 18:59 ` Stephan Gerhold
2025-09-23 11:01 ` [PATCH 3/3] arm64: dts: qcom: rename sm6150 to talos Dmitry Baryshkov
2025-09-24 10:10 ` Konrad Dybcio
2025-09-23 13:00 ` [PATCH 0/3] arm64: dts: qcom: rename dtsi files for sm6150, x1e80100 and qcs8300 Luca Weiss
2025-09-23 15:17 ` Dmitry Baryshkov
2025-09-24 10:11 ` Konrad Dybcio
2025-10-27 22:36 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox