[PATCH v6 5/8] arm64: dts: ti: k3-j722s: Move MAIN domain overrides to k3-j722s-main.dtsi

From: Siddharth Vadapalli
Date: Wed Jun 12 2024 - 09:25:51 EST


Since the MAIN domain peripherals specific to J722S SoC are present in the
"k3-j722s-main.dtsi" file, move the overrides for the MAIN domain from the
"k3-j722s.dtsi" file to the "k3-j722s-main.dtsi" file.

Signed-off-by: Siddharth Vadapalli <s-vadapalli@xxxxxx>
---
This patch has been newly introduced in this series and doesn't have a
Changelog.

arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 11 +++++++++++
arch/arm64/boot/dts/ti/k3-j722s.dtsi | 11 -----------
2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi b/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi
index 84378fc839d6..b75dab8230c2 100644
--- a/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi
@@ -38,3 +38,14 @@ usb1: usb@31200000{
};
};
};
+
+/* MAIN domain overrides */
+
+&inta_main_dmss {
+ ti,interrupt-ranges = <7 71 21>;
+};
+
+&oc_sram {
+ reg = <0x00 0x70000000 0x00 0x40000>;
+ ranges = <0x00 0x00 0x70000000 0x40000>;
+};
diff --git a/arch/arm64/boot/dts/ti/k3-j722s.dtsi b/arch/arm64/boot/dts/ti/k3-j722s.dtsi
index 1bcbc9152ff0..14c6c6a332ef 100644
--- a/arch/arm64/boot/dts/ti/k3-j722s.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j722s.dtsi
@@ -232,14 +232,3 @@ cbass_wakeup: bus@b00000 {

/* Include J722S specific peripherals */
#include "k3-j722s-main.dtsi"
-
-/* Main domain overrides */
-
-&inta_main_dmss {
- ti,interrupt-ranges = <7 71 21>;
-};
-
-&oc_sram {
- reg = <0x00 0x70000000 0x00 0x40000>;
- ranges = <0x00 0x00 0x70000000 0x40000>;
-};
--
2.40.1