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

Mailbox nodes defined in the top-level AM65x 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>
Signed-off-by: Nishanth Menon <nm@ti.com>
Tested-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Bryan Brattlof <bb@ti.com>
Link: https://lore.kernel.org/r/20221028142417.10642-11-afd@ti.com

diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
index dd7c6aee8c6135f55a406a5000ec7509820d5be4..c6c79dde79c529b50b67766456c74c43875cb069 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
@@ -644,6 +644,7 @@
 };
 
 &mailbox0_cluster0 {
+       status = "okay";
        interrupts = <436>;
 
        mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
@@ -653,6 +654,7 @@
 };
 
 &mailbox0_cluster1 {
+       status = "okay";
        interrupts = <432>;
 
        mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
@@ -661,46 +663,6 @@
        };
 };
 
-&mailbox0_cluster2 {
-       status = "disabled";
-};
-
-&mailbox0_cluster3 {
-       status = "disabled";
-};
-
-&mailbox0_cluster4 {
-       status = "disabled";
-};
-
-&mailbox0_cluster5 {
-       status = "disabled";
-};
-
-&mailbox0_cluster6 {
-       status = "disabled";
-};
-
-&mailbox0_cluster7 {
-       status = "disabled";
-};
-
-&mailbox0_cluster8 {
-       status = "disabled";
-};
-
-&mailbox0_cluster9 {
-       status = "disabled";
-};
-
-&mailbox0_cluster10 {
-       status = "disabled";
-};
-
-&mailbox0_cluster11 {
-       status = "disabled";
-};
-
 &mcu_r5fss0_core0 {
        memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
                        <&mcu_r5fss0_core0_memory_region>;

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 9081c791a31233bba9ea445e1f5f1df3a5d842af..3dc624a379c5fb3186ce863a36aefca78a1aae1f 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -514,6 +514,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                mailbox0_cluster1: mailbox@31f81000 {
@@ -523,6 +524,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                mailbox0_cluster2: mailbox@31f82000 {
@@ -532,6 +534,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                mailbox0_cluster3: mailbox@31f83000 {
@@ -541,6 +544,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                mailbox0_cluster4: mailbox@31f84000 {
@@ -550,6 +554,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                mailbox0_cluster5: mailbox@31f85000 {
@@ -559,6 +564,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                mailbox0_cluster6: mailbox@31f86000 {
@@ -568,6 +574,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                mailbox0_cluster7: mailbox@31f87000 {
@@ -577,6 +584,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                mailbox0_cluster8: mailbox@31f88000 {
@@ -586,6 +594,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                mailbox0_cluster9: mailbox@31f89000 {
@@ -595,6 +604,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                mailbox0_cluster10: mailbox@31f8a000 {
@@ -604,6 +614,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                mailbox0_cluster11: mailbox@31f8b000 {
@@ -613,6 +624,7 @@
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <16>;
                        interrupt-parent = <&intr_main_navss>;
+                       status = "disabled";
                };
 
                ringacc: ringacc@3c000000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index a61060c6bc198b9792f42deca1abe7642898e8f8..d1c8047d967268a7ebe2348962d4dc10c641d7b9 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -416,6 +416,7 @@
 };
 
 &mailbox0_cluster0 {
+       status = "okay";
        interrupts = <436>;
 
        mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
@@ -425,6 +426,7 @@
 };
 
 &mailbox0_cluster1 {
+       status = "okay";
        interrupts = <432>;
 
        mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
@@ -433,46 +435,6 @@
        };
 };
 
-&mailbox0_cluster2 {
-       status = "disabled";
-};
-
-&mailbox0_cluster3 {
-       status = "disabled";
-};
-
-&mailbox0_cluster4 {
-       status = "disabled";
-};
-
-&mailbox0_cluster5 {
-       status = "disabled";
-};
-
-&mailbox0_cluster6 {
-       status = "disabled";
-};
-
-&mailbox0_cluster7 {
-       status = "disabled";
-};
-
-&mailbox0_cluster8 {
-       status = "disabled";
-};
-
-&mailbox0_cluster9 {
-       status = "disabled";
-};
-
-&mailbox0_cluster10 {
-       status = "disabled";
-};
-
-&mailbox0_cluster11 {
-       status = "disabled";
-};
-
 &mcu_r5fss0_core0 {
        memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
                        <&mcu_r5fss0_core0_memory_region>;