[PATCH v3 1/9] arm64: dts: ti: Move j784s4-{} include files to j784s4-j742s2-{}-common.dtsi

Manorit Chawdhry m-chawdhry at ti.com
Wed Jul 31 10:10:27 PDT 2024


J784S4 shares a lot of things with J742s2. Move the files to common so
that the split between j784s4 and j742s2 can be done at a later point.

Signed-off-by: Manorit Chawdhry <m-chawdhry at ti.com>
---
 .../ti/{k3-j784s4-main.dtsi => k3-j784s4-j742s2-main-common.dtsi}   | 2 +-
 ...84s4-mcu-wakeup.dtsi => k3-j784s4-j742s2-mcu-wakeup-common.dtsi} | 2 +-
 ...{k3-j784s4-thermal.dtsi => k3-j784s4-j742s2-thermal-common.dtsi} | 0
 arch/arm64/boot/dts/ti/k3-j784s4.dtsi                               | 6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi
similarity index 99%
rename from arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi
rename to arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi
index f170f80f00c1..17abd0f1560a 100644
--- a/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only OR MIT
 /*
- * Device Tree Source for J784S4 SoC Family Main Domain peripherals
+ * Device Tree Source for J784S4 and J742S2 SoC Family Main Domain peripherals
  *
  * Copyright (C) 2022-2024 Texas Instruments Incorporated - https://www.ti.com/
  */
diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-mcu-wakeup-common.dtsi
similarity index 99%
rename from arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi
rename to arch/arm64/boot/dts/ti/k3-j784s4-j742s2-mcu-wakeup-common.dtsi
index f3a6ed1c979d..346623fa2ee9 100644
--- a/arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-mcu-wakeup-common.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only OR MIT
 /*
- * Device Tree Source for J784S4 SoC Family MCU/WAKEUP Domain peripherals
+ * Device Tree Source for J784S4 and J742S2 SoC Family MCU/WAKEUP Domain peripherals
  *
  * Copyright (C) 2022-2024 Texas Instruments Incorporated - https://www.ti.com/
  */
diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-thermal.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-thermal-common.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/ti/k3-j784s4-thermal.dtsi
rename to arch/arm64/boot/dts/ti/k3-j784s4-j742s2-thermal-common.dtsi
diff --git a/arch/arm64/boot/dts/ti/k3-j784s4.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4.dtsi
index 73cc3c1fec08..76e43ee44496 100644
--- a/arch/arm64/boot/dts/ti/k3-j784s4.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j784s4.dtsi
@@ -296,10 +296,10 @@ cbass_mcu_wakeup: bus at 28380000 {
 	};
 
 	thermal_zones: thermal-zones {
-		#include "k3-j784s4-thermal.dtsi"
+		#include "k3-j784s4-j742s2-thermal-common.dtsi"
 	};
 };
 
 /* Now include peripherals from each bus segment */
-#include "k3-j784s4-main.dtsi"
-#include "k3-j784s4-mcu-wakeup.dtsi"
+#include "k3-j784s4-j742s2-main-common.dtsi"
+#include "k3-j784s4-j742s2-mcu-wakeup-common.dtsi"

-- 
2.45.1




More information about the linux-arm-kernel mailing list