From 42f236b33b955e0aa3a0c5274cd0e665f750b6e3 Mon Sep 17 00:00:00 2001
From: Tobias Kahlki <tobias.kahlki@seco.com>
Date: Thu, 30 Jan 2025 14:24:57 +0100
Subject: [PATCH] [E81][DTS] Add baseboard to devicetree sources
Rename the B79 include file and also add the file -b79 file extension to
the base devicetrees.
---
arch/arm64/boot/dts/seco/Makefile | 6 +++---
.../seco/include/{e81-b79.dtsi => baseboard-e81-b79.dtsi} | 4 ++--
...eco-qcs5430-fp1-e81.dts => seco-qcs5430-fp1-e81-b79.dts} | 2 +-
...eco-qcs5430-fp2-e81.dts => seco-qcs5430-fp2-e81-b79.dts} | 2 +-
.../seco/{seco-qcs6490-e81.dts => seco-qcs6490-e81-b79.dts} | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
rename arch/arm64/boot/dts/seco/include/{e81-b79.dtsi => baseboard-e81-b79.dtsi} (97%)
rename arch/arm64/boot/dts/seco/{seco-qcs5430-fp1-e81.dts => seco-qcs5430-fp1-e81-b79.dts} (95%)
rename arch/arm64/boot/dts/seco/{seco-qcs5430-fp2-e81.dts => seco-qcs5430-fp2-e81-b79.dts} (93%)
rename arch/arm64/boot/dts/seco/{seco-qcs6490-e81.dts => seco-qcs6490-e81-b79.dts} (93%)
diff --git a/arch/arm64/boot/dts/seco/Makefile b/arch/arm64/boot/dts/seco/Makefile
index 0df20369ccc71..444d3319dd2f8 100644
--- a/arch/arm64/boot/dts/seco/Makefile
+++ b/arch/arm64/boot/dts/seco/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
-dtb-$(CONFIG_ARCH_QCOM) += seco-qcs6490-e81.dtb
-dtb-$(CONFIG_ARCH_QCOM) += seco-qcs5430-fp1-e81.dtb
-dtb-$(CONFIG_ARCH_QCOM) += seco-qcs5430-fp2-e81.dtb
+dtb-$(CONFIG_ARCH_QCOM) += seco-qcs6490-e81-b79.dtb
+dtb-$(CONFIG_ARCH_QCOM) += seco-qcs5430-fp1-e81-b79.dtb
+dtb-$(CONFIG_ARCH_QCOM) += seco-qcs5430-fp2-e81-b79.dtb
diff --git a/arch/arm64/boot/dts/seco/include/e81-b79.dtsi b/arch/arm64/boot/dts/seco/include/baseboard-e81-b79.dtsi
similarity index 97%
rename from arch/arm64/boot/dts/seco/include/e81-b79.dtsi
rename to arch/arm64/boot/dts/seco/include/baseboard-e81-b79.dtsi
index db9bff779712b..a996a702d1e03 100644
--- a/arch/arm64/boot/dts/seco/include/e81-b79.dtsi
+++ b/arch/arm64/boot/dts/seco/include/baseboard-e81-b79.dtsi
@@ -8,8 +8,8 @@
*
*****************************************************************************/
-#ifndef SECO_B79_DTSI
-#define SECO_B79_DTSI
+#ifndef BASEBOARD_E81_B79_DTSI
+#define BASEBOARD_E81_B79_DTSI
/ {
reg_1v8: 1v8 {
diff --git a/arch/arm64/boot/dts/seco/seco-qcs5430-fp1-e81.dts b/arch/arm64/boot/dts/seco/seco-qcs5430-fp1-e81-b79.dts
similarity index 95%
rename from arch/arm64/boot/dts/seco/seco-qcs5430-fp1-e81.dts
rename to arch/arm64/boot/dts/seco/seco-qcs5430-fp1-e81-b79.dts
index eae9573cb7331..d70769ebd2592 100644
--- a/arch/arm64/boot/dts/seco/seco-qcs5430-fp1-e81.dts
+++ b/arch/arm64/boot/dts/seco/seco-qcs5430-fp1-e81-b79.dts
@@ -10,7 +10,7 @@
/dts-v1/;
#include "include/e81-common.dtsi"
-#include "include/e81-b79.dtsi"
+#include "include/baseboard-e81-b79.dtsi"
/ {
model = "Qualcomm QCS5430 FP1 SECO board (E81) with B79 baseboard";
diff --git a/arch/arm64/boot/dts/seco/seco-qcs5430-fp2-e81.dts b/arch/arm64/boot/dts/seco/seco-qcs5430-fp2-e81-b79.dts
similarity index 93%
rename from arch/arm64/boot/dts/seco/seco-qcs5430-fp2-e81.dts
rename to arch/arm64/boot/dts/seco/seco-qcs5430-fp2-e81-b79.dts
index 2f95dbccf44a5..374167d8af482 100644
--- a/arch/arm64/boot/dts/seco/seco-qcs5430-fp2-e81.dts
+++ b/arch/arm64/boot/dts/seco/seco-qcs5430-fp2-e81-b79.dts
@@ -10,7 +10,7 @@
/dts-v1/;
#include "include/e81-common.dtsi"
-#include "include/e81-b79.dtsi"
+#include "include/baseboard-e81-b79.dtsi"
/ {
model = "Qualcomm QCS5430 FP2 SECO board (E81) with B79 baseboard";
diff --git a/arch/arm64/boot/dts/seco/seco-qcs6490-e81.dts b/arch/arm64/boot/dts/seco/seco-qcs6490-e81-b79.dts
similarity index 93%
rename from arch/arm64/boot/dts/seco/seco-qcs6490-e81.dts
rename to arch/arm64/boot/dts/seco/seco-qcs6490-e81-b79.dts
index ce5f70e2f86d5..e38c31dff4459 100644
--- a/arch/arm64/boot/dts/seco/seco-qcs6490-e81.dts
+++ b/arch/arm64/boot/dts/seco/seco-qcs6490-e81-b79.dts
@@ -10,7 +10,7 @@
/dts-v1/;
#include "include/e81-common.dtsi"
-#include "include/e81-b79.dtsi"
+#include "include/baseboard-e81-b79.dtsi"
/ {
model = "Qualcomm QCS6490 SECO board (E81) with B79 baseboard";
--
GitLab