arm64: dts: ti: k3-am64: Enable Mailbox nodes at the board level

Mailbox nodes defined in the top-level AM64x SoC dtsi files are incomplete
and may not be functional unless they are extended with a chosen interrupt
and connection to a remote processor.

As the remote processors depend on memory nodes which are only known at
the board integration level, these nodes should only be enabled when
provided with the above information.

Disable the Mailbox nodes in the dtsi files and only enable the ones that
are actually used on a given board.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20230515172137.474626-4-afd@ti.com
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index 9dea128893db1f94a230a6b93daa4b0b8e946f24..3c387d479b36695c6bf1a33b9a16fd01bed90ad7 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -820,6 +820,7 @@
                #mbox-cells = <1>;
                ti,mbox-num-users = <4>;
                ti,mbox-num-fifos = <16>;
+               status = "disabled";
        };
 
        mailbox0_cluster3: mailbox@29030000 {
@@ -830,6 +831,7 @@
                #mbox-cells = <1>;
                ti,mbox-num-users = <4>;
                ti,mbox-num-fifos = <16>;
+               status = "disabled";
        };
 
        mailbox0_cluster4: mailbox@29040000 {
@@ -840,6 +842,7 @@
                #mbox-cells = <1>;
                ti,mbox-num-users = <4>;
                ti,mbox-num-fifos = <16>;
+               status = "disabled";
        };
 
        mailbox0_cluster5: mailbox@29050000 {
@@ -850,6 +853,7 @@
                #mbox-cells = <1>;
                ti,mbox-num-users = <4>;
                ti,mbox-num-fifos = <16>;
+               status = "disabled";
        };
 
        mailbox0_cluster6: mailbox@29060000 {
@@ -859,6 +863,7 @@
                #mbox-cells = <1>;
                ti,mbox-num-users = <4>;
                ti,mbox-num-fifos = <16>;
+               status = "disabled";
        };
 
        mailbox0_cluster7: mailbox@29070000 {
@@ -868,6 +873,7 @@
                #mbox-cells = <1>;
                ti,mbox-num-users = <4>;
                ti,mbox-num-fifos = <16>;
+               status = "disabled";
        };
 
        main_r5fss0: r5fss@78000000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
index 8dfb6301b17dca255ebc05bf7e011bd3f5708061..7c2e26ef726c0164b746a599ebc9dd308b148794 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
@@ -160,30 +160,6 @@
        status = "disabled";
 };
 
-&mailbox0_cluster2 {
-       status = "disabled";
-};
-
-&mailbox0_cluster3 {
-       status = "disabled";
-};
-
-&mailbox0_cluster4 {
-       status = "disabled";
-};
-
-&mailbox0_cluster5 {
-       status = "disabled";
-};
-
-&mailbox0_cluster6 {
-       status = "disabled";
-};
-
-&mailbox0_cluster7 {
-       status = "disabled";
-};
-
 &main_i2c0 {
        status = "okay";
        pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index 3db740f78cd2518fe6995a119b04e29cb539f47c..7c90e284e2bff60aec72e84689971f7e2248333b 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -537,6 +537,8 @@
 };
 
 &mailbox0_cluster2 {
+       status = "okay";
+
        mbox_main_r5fss0_core0: mbox-main-r5fss0-core0 {
                ti,mbox-rx = <0 0 2>;
                ti,mbox-tx = <1 0 2>;
@@ -548,11 +550,9 @@
        };
 };
 
-&mailbox0_cluster3 {
-       status = "disabled";
-};
-
 &mailbox0_cluster4 {
+       status = "okay";
+
        mbox_main_r5fss1_core0: mbox-main-r5fss1-core0 {
                ti,mbox-rx = <0 0 2>;
                ti,mbox-tx = <1 0 2>;
@@ -564,21 +564,15 @@
        };
 };
 
-&mailbox0_cluster5 {
-       status = "disabled";
-};
-
 &mailbox0_cluster6 {
+       status = "okay";
+
        mbox_m4_0: mbox-m4-0 {
                ti,mbox-rx = <0 0 2>;
                ti,mbox-tx = <1 0 2>;
        };
 };
 
-&mailbox0_cluster7 {
-       status = "disabled";
-};
-
 &main_r5fss0_core0 {
        mboxes = <&mailbox0_cluster2 &mbox_main_r5fss0_core0>;
        memory-region = <&main_r5fss0_core0_dma_memory_region>,

diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index 003cff9a27990d573a9ff35713df5bf48a68a1f9..f9ed22c5a472098035570c7a8e7f54023c2b789a 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -535,6 +535,8 @@
 };
 
 &mailbox0_cluster2 {
+       status = "okay";
+
        mbox_main_r5fss0_core0: mbox-main-r5fss0-core0 {
                ti,mbox-rx = <0 0 2>;
                ti,mbox-tx = <1 0 2>;
@@ -546,11 +548,9 @@
        };
 };
 
-&mailbox0_cluster3 {
-       status = "disabled";
-};
-
 &mailbox0_cluster4 {
+       status = "okay";
+
        mbox_main_r5fss1_core0: mbox-main-r5fss1-core0 {
                ti,mbox-rx = <0 0 2>;
                ti,mbox-tx = <1 0 2>;
@@ -562,21 +562,15 @@
        };
 };
 
-&mailbox0_cluster5 {
-       status = "disabled";
-};
-
 &mailbox0_cluster6 {
+       status = "okay";
+
        mbox_m4_0: mbox-m4-0 {
                ti,mbox-rx = <0 0 2>;
                ti,mbox-tx = <1 0 2>;
        };
 };
 
-&mailbox0_cluster7 {
-       status = "disabled";
-};
-
 &main_r5fss0_core0 {
        mboxes = <&mailbox0_cluster2 &mbox_main_r5fss0_core0>;
        memory-region = <&main_r5fss0_core0_dma_memory_region>,