ARM: dts: OMAP2+: Replace underscores in sub-mailbox node names

[ Upstream commit 9e7f5ee1137397def6580461e27e5efcb68183ee ]

A number of sub-mailbox node names in various OMAP2+ dts files are
currently using underscores. This is not adhering to the node name
convention, fix all of these to use hiphens.

These nodes are already using the prefix mbox, so they will be in
compliance with the sub-mailbox node name convention being added in
the OMAP Mailbox YAML binding as well.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
index 39eba2bc36ddf82a5dcbf6182eaeda07fb72c84d..aed81568a297d0e2c252ed9879479560763715f8 100644 (file)
--- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
+++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
@@ -454,20 +454,20 @@
 
 &mailbox5 {
        status = "okay";
-       mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
+       mbox_ipu1_ipc3x: mbox-ipu1-ipc3x {
                status = "okay";
        };
-       mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
+       mbox_dsp1_ipc3x: mbox-dsp1-ipc3x {
                status = "okay";
        };
 };
 
 &mailbox6 {
        status = "okay";
-       mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
+       mbox_ipu2_ipc3x: mbox-ipu2-ipc3x {
                status = "okay";
        };
-       mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
+       mbox_dsp2_ipc3x: mbox-dsp2-ipc3x {
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi
index 3551a64963f8d456541724213c00a821464cbad8..1825d912b8ab45d225787e6e3e82434308d9b420 100644 (file)
--- a/arch/arm/boot/dts/dm816x.dtsi
+++ b/arch/arm/boot/dts/dm816x.dtsi
@@ -351,7 +351,7 @@
                        #mbox-cells = <1>;
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <12>;
-                       mbox_dsp: mbox_dsp {
+                       mbox_dsp: mbox-dsp {
                                ti,mbox-tx = <3 0 0>;
                                ti,mbox-rx = <0 0 0>;
                        };

diff --git a/arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi b/arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi
index a25749a1c365908692a53ff5d87e2052e5524589..a5bdc6431d8d03c2e42ab483476b05edd2d4c513 100644 (file)
--- a/arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi
+++ b/arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi
@@ -5,17 +5,17 @@
 
 &mailbox5 {
        status = "okay";
-       mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
+       mbox_ipu1_ipc3x: mbox-ipu1-ipc3x {
                status = "okay";
        };
-       mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
+       mbox_dsp1_ipc3x: mbox-dsp1-ipc3x {
                status = "okay";
        };
 };
 
 &mailbox6 {
        status = "okay";
-       mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
+       mbox_ipu2_ipc3x: mbox-ipu2-ipc3x {
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
index f3e934ef7d3e2a2716a037d77d4a682a11c3e4b7..90617261373cf12c37643ac0d3aa61e244d2fa07 100644 (file)
--- a/arch/arm/boot/dts/dra72x.dtsi
+++ b/arch/arm/boot/dts/dra72x.dtsi
@@ -77,12 +77,12 @@
 };
 
 &mailbox5 {
-       mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
+       mbox_ipu1_ipc3x: mbox-ipu1-ipc3x {
                ti,mbox-tx = <6 2 2>;
                ti,mbox-rx = <4 2 2>;
                status = "disabled";
        };
-       mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
+       mbox_dsp1_ipc3x: mbox-dsp1-ipc3x {
                ti,mbox-tx = <5 2 2>;
                ti,mbox-rx = <1 2 2>;
                status = "disabled";
@@ -90,7 +90,7 @@
 };
 
 &mailbox6 {
-       mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
+       mbox_ipu2_ipc3x: mbox-ipu2-ipc3x {
                ti,mbox-tx = <6 2 2>;
                ti,mbox-rx = <4 2 2>;
                status = "disabled";

diff --git a/arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi b/arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi
index b1147a4b77f9d693209ac514994da0666b6bde3e..3256631510c5640112adc9a7d19a86ea8373670e 100644 (file)
--- a/arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi
+++ b/arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi
@@ -6,7 +6,7 @@
 #include "dra7-ipu-dsp-common.dtsi"
 
 &mailbox6 {
-       mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
+       mbox_dsp2_ipc3x: mbox-dsp2-ipc3x {
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi
index b4e07d99ffde178d6c3fc6235df0887dc2e04bc1..cfb39dde4930042b73aeea0383e6a8e8655e91ab 100644 (file)
--- a/arch/arm/boot/dts/dra74x.dtsi
+++ b/arch/arm/boot/dts/dra74x.dtsi
@@ -145,12 +145,12 @@
 };
 
 &mailbox5 {
-       mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
+       mbox_ipu1_ipc3x: mbox-ipu1-ipc3x {
                ti,mbox-tx = <6 2 2>;
                ti,mbox-rx = <4 2 2>;
                status = "disabled";
        };
-       mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
+       mbox_dsp1_ipc3x: mbox-dsp1-ipc3x {
                ti,mbox-tx = <5 2 2>;
                ti,mbox-rx = <1 2 2>;
                status = "disabled";
@@ -158,12 +158,12 @@
 };
 
 &mailbox6 {
-       mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
+       mbox_ipu2_ipc3x: mbox-ipu2-ipc3x {
                ti,mbox-tx = <6 2 2>;
                ti,mbox-rx = <4 2 2>;
                status = "disabled";
        };
-       mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
+       mbox_dsp2_ipc3x: mbox-dsp2-ipc3x {
                ti,mbox-tx = <5 2 2>;
                ti,mbox-rx = <1 2 2>;
                status = "disabled";

diff --git a/arch/arm/boot/dts/omap4-l4.dtsi b/arch/arm/boot/dts/omap4-l4.dtsi
index de742bf84efb01ff27d5ec8fcc9ea7fc7c0b2fe3..5015df4d876c20fb6d01d401f7d191ab6bdc990d 100644 (file)
--- a/arch/arm/boot/dts/omap4-l4.dtsi
+++ b/arch/arm/boot/dts/omap4-l4.dtsi
@@ -597,11 +597,11 @@
                                #mbox-cells = <1>;
                                ti,mbox-num-users = <3>;
                                ti,mbox-num-fifos = <8>;
-                               mbox_ipu: mbox_ipu {
+                               mbox_ipu: mbox-ipu {
                                        ti,mbox-tx = <0 0 0>;
                                        ti,mbox-rx = <1 0 0>;
                                };
-                               mbox_dsp: mbox_dsp {
+                               mbox_dsp: mbox-dsp {
                                        ti,mbox-tx = <3 0 0>;
                                        ti,mbox-rx = <2 0 0>;
                                };

diff --git a/arch/arm/boot/dts/omap5-l4.dtsi b/arch/arm/boot/dts/omap5-l4.dtsi
index f3d3a16b7c64e123be897869f0723f18b28ee7a7..c67c8698cc30d4d52c15be6b69111a4d07f852ba 100644 (file)
--- a/arch/arm/boot/dts/omap5-l4.dtsi
+++ b/arch/arm/boot/dts/omap5-l4.dtsi
@@ -613,11 +613,11 @@
                                #mbox-cells = <1>;
                                ti,mbox-num-users = <3>;
                                ti,mbox-num-fifos = <8>;
-                               mbox_ipu: mbox_ipu {
+                               mbox_ipu: mbox-ipu {
                                        ti,mbox-tx = <0 0 0>;
                                        ti,mbox-rx = <1 0 0>;
                                };
-                               mbox_dsp: mbox_dsp {
+                               mbox_dsp: mbox-dsp {
                                        ti,mbox-tx = <3 0 0>;
                                        ti,mbox-rx = <2 0 0>;
                                };