| From f9c9db584d723b536f830cfaf02fb77aafe988cc Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 18 May 2021 12:36:45 -0500 |
| Subject: ARM: dts: OMAP2+: Replace underscores in sub-mailbox node names |
| |
| From: Suman Anna <s-anna@ti.com> |
| |
| [ 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> |
| --- |
| arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 8 ++++---- |
| arch/arm/boot/dts/dm816x.dtsi | 2 +- |
| arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi | 6 +++--- |
| arch/arm/boot/dts/dra72x.dtsi | 6 +++--- |
| arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi | 2 +- |
| arch/arm/boot/dts/dra74x.dtsi | 8 ++++---- |
| arch/arm/boot/dts/omap4-l4.dtsi | 4 ++-- |
| arch/arm/boot/dts/omap5-l4.dtsi | 4 ++-- |
| 8 files changed, 20 insertions(+), 20 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts |
| index 39eba2bc36dd..aed81568a297 100644 |
| --- 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 3551a64963f8..1825d912b8ab 100644 |
| --- 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 a25749a1c365..a5bdc6431d8d 100644 |
| --- 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 f3e934ef7d3e..90617261373c 100644 |
| --- 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 b1147a4b77f9..3256631510c5 100644 |
| --- 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 b4e07d99ffde..cfb39dde4930 100644 |
| --- 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 de742bf84efb..5015df4d876c 100644 |
| --- 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 f3d3a16b7c64..c67c8698cc30 100644 |
| --- 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>; |
| }; |
| -- |
| 2.30.2 |
| |