arm64: dts: ti: k3-am62p-j722s: Move SoC-specific node properties

Certain device-tree node properties of shared device-tree nodes are
different between the AM62P and J722S SoCs. To avoid overriding the
properties and to avoid redefining the nodes in the k3-{soc}-main.dtsi
having such SoC specific properties, move the properties to the SoC
specific k3-{soc}-main.dtsi files.

Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Acked-by: Roger Quadros <rogerq@kernel.org>
Link: https://lore.kernel.org/r/20240615081600.3602462-9-s-vadapalli@ti.com
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
index 870c95081ef5f6af5d05f9fe072e6a8659fb4fee..e787f9386eb56106e4485cd0762192aa5b00588a 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
@@ -8,10 +8,8 @@
 &cbass_main {
        oc_sram: sram@70000000 {
                compatible = "mmio-sram";
-               reg = <0x00 0x70000000 0x00 0x10000>;
                #address-cells = <1>;
                #size-cells = <1>;
-               ranges = <0x00 0x00 0x70000000 0x10000>;
        };
 
        gic500: interrupt-controller@1800000 {
@@ -92,7 +90,6 @@
                        msi-controller;
                        ti,sci = <&dmsc>;
                        ti,sci-dev-id = <28>;
-                       ti,interrupt-ranges = <5 69 35>;
                        ti,unmapped-event-sources = <&main_bcdma>, <&main_pktdma>;
                };
 
@@ -539,7 +536,6 @@
                             <193>, <194>, <195>;
                interrupt-controller;
                #interrupt-cells = <2>;
-               ti,ngpio = <92>;
                ti,davinci-gpio-unbanked = <0>;
                power-domains = <&k3_pds 77 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 77 0>;
@@ -556,7 +552,6 @@
                             <183>, <184>, <185>;
                interrupt-controller;
                #interrupt-cells = <2>;
-               ti,ngpio = <52>;
                ti,davinci-gpio-unbanked = <0>;
                power-domains = <&k3_pds 78 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 78 0>;

diff --git a/arch/arm64/boot/dts/ti/k3-am62p-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-main.dtsi
index 9caab7db5440b0e2df032aa69606c5f8afb17c54..f8a7f0cbd3273ac043915c548ae28a1666c9b912 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62p-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62p-main.dtsi
@@ -32,3 +32,20 @@
                };
        };
 };
+
+&oc_sram {
+       reg = <0x00 0x70000000 0x00 0x10000>;
+       ranges = <0x00 0x00 0x70000000 0x10000>;
+};
+
+&inta_main_dmss {
+       ti,interrupt-ranges = <5 69 35>;
+};
+
+&main_gpio0 {
+       ti,ngpio = <92>;
+};
+
+&main_gpio1 {
+       ti,ngpio = <52>;
+};

diff --git a/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi b/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi
index b16f3a7cb10977e4f9a5c06187578ecd36aa7758..228c6c89245c0ec2bbe0043a8352d9b7145833bb 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j722s-main.dtsi
@@ -171,3 +171,20 @@
                reg = <0x4070 0x4>;
        };
 };
+
+&oc_sram {
+       reg = <0x00 0x70000000 0x00 0x40000>;
+       ranges = <0x00 0x00 0x70000000 0x40000>;
+};
+
+&inta_main_dmss {
+       ti,interrupt-ranges = <7 71 21>;
+};
+
+&main_gpio0 {
+       ti,ngpio = <87>;
+};
+
+&main_gpio1 {
+       ti,ngpio = <73>;
+};

diff --git a/arch/arm64/boot/dts/ti/k3-j722s.dtsi b/arch/arm64/boot/dts/ti/k3-j722s.dtsi
index 705b99e35f0566250f081baae8ef15e4771d7349..14c6c6a332ef2f118e483744e97222865560e6ac 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j722s.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j722s.dtsi
@@ -232,22 +232,3 @@
 
 /* Include J722S specific peripherals */
 #include "k3-j722s-main.dtsi"
-
-/* Main domain overrides */
-
-&inta_main_dmss {
-       ti,interrupt-ranges = <7 71 21>;
-};
-
-&main_gpio0 {
-       ti,ngpio = <87>;
-};
-
-&main_gpio1 {
-       ti,ngpio = <73>;
-};
-
-&oc_sram {
-       reg = <0x00 0x70000000 0x00 0x40000>;
-       ranges = <0x00 0x00 0x70000000 0x40000>;
-};