Skip to content

Commit a11a2f7

Browse files
sumanannatmlind
authored andcommitted
ARM: dts: dra7-ipu-dsp-common: Move mailboxes into common files
The System Mailboxes 5 and 6 and their corresponding child sub-mailbox (IPC 3.x) nodes are enabled in each of the DRA7xx and AM57xx board dts files individually at present. These mailboxes enable the Remote Processor Messaging (RPMsg) communication stack between the MPU host processor and each of the IPU1, IPU2, DSP1 and DSP2 remote processors. Move these nodes into two common dtsi files - dra7-ipu-dsp-common and dra74-ipu-dsp-common files, which are then included in various board dts files. These files can be used to add all the common configuration properties (except memory data) required by remote processor nodes. The memory pools and the remote processor nodes themselves are to be enabled in the actual board dts files. The first file is to used by platforms using DRA72x/DRA71x/AM571x/AM570x SoCs, and the second file is to be used by platforms using DRA74x/DRA76x/AM572x/AM574x SoCs. The second file includes the first file and contains additional data only applicable for DSP2 remote processor. Signed-off-by: Suman Anna <[email protected]> Signed-off-by: Tero Kristo <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent 0ed073c commit a11a2f7

File tree

7 files changed

+38
-74
lines changed

7 files changed

+38
-74
lines changed

arch/arm/boot/dts/am571x-idk.dts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "dra7-mmc-iodelay.dtsi"
1111
#include "dra72x-mmc-iodelay.dtsi"
1212
#include "am57xx-idk-common.dtsi"
13+
#include "dra7-ipu-dsp-common.dtsi"
1314

1415
/ {
1516
model = "TI AM5718 IDK";
@@ -148,23 +149,6 @@
148149
load-gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
149150
};
150151

151-
&mailbox5 {
152-
status = "okay";
153-
mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
154-
status = "okay";
155-
};
156-
mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
157-
status = "okay";
158-
};
159-
};
160-
161-
&mailbox6 {
162-
status = "okay";
163-
mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
164-
status = "okay";
165-
};
166-
};
167-
168152
&pcie1_rc {
169153
status = "okay";
170154
gpios = <&gpio5 18 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/am572x-idk-common.dtsi

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <dt-bindings/gpio/gpio.h>
77
#include <dt-bindings/interrupt-controller/irq.h>
88
#include "am57xx-idk-common.dtsi"
9+
#include "dra74-ipu-dsp-common.dtsi"
910

1011
/ {
1112
memory@0 {
@@ -146,23 +147,3 @@
146147
status = "okay";
147148
gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
148149
};
149-
150-
&mailbox5 {
151-
status = "okay";
152-
mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
153-
status = "okay";
154-
};
155-
mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
156-
status = "okay";
157-
};
158-
};
159-
160-
&mailbox6 {
161-
status = "okay";
162-
mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
163-
status = "okay";
164-
};
165-
mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
166-
status = "okay";
167-
};
168-
};

arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "am5728.dtsi"
88
#include "am57xx-commercial-grade.dtsi"
99
#include "dra74x-mmc-iodelay.dtsi"
10+
#include "dra74-ipu-dsp-common.dtsi"
1011
#include <dt-bindings/gpio/gpio.h>
1112
#include <dt-bindings/interrupt-controller/irq.h>
1213

@@ -583,23 +584,3 @@
583584
tx-num-evt = <32>;
584585
rx-num-evt = <32>;
585586
};
586-
587-
&mailbox5 {
588-
status = "okay";
589-
mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
590-
status = "okay";
591-
};
592-
mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
593-
status = "okay";
594-
};
595-
};
596-
597-
&mailbox6 {
598-
status = "okay";
599-
mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
600-
status = "okay";
601-
};
602-
mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
603-
status = "okay";
604-
};
605-
};

arch/arm/boot/dts/dra7-evm-common.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
44
*/
55

6+
#include "dra74-ipu-dsp-common.dtsi"
67
#include <dt-bindings/gpio/gpio.h>
78
#include <dt-bindings/clock/ti-dra7-atl.h>
89
#include <dt-bindings/input/input.h>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* Common IPU and DSP data for TI DRA7xx/AM57xx platforms
4+
*/
5+
6+
&mailbox5 {
7+
status = "okay";
8+
mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
9+
status = "okay";
10+
};
11+
mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
12+
status = "okay";
13+
};
14+
};
15+
16+
&mailbox6 {
17+
status = "okay";
18+
mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
19+
status = "okay";
20+
};
21+
};

arch/arm/boot/dts/dra72-evm-common.dtsi

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/dts-v1/;
66

77
#include "dra72x.dtsi"
8+
#include "dra7-ipu-dsp-common.dtsi"
89
#include <dt-bindings/gpio/gpio.h>
910
#include <dt-bindings/clock/ti-dra7-atl.h>
1011

@@ -583,23 +584,6 @@
583584
rx-num-evt = <32>;
584585
};
585586

586-
&mailbox5 {
587-
status = "okay";
588-
mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
589-
status = "okay";
590-
};
591-
mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
592-
status = "okay";
593-
};
594-
};
595-
596-
&mailbox6 {
597-
status = "okay";
598-
mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
599-
status = "okay";
600-
};
601-
};
602-
603587
&pcie1_rc {
604588
status = "okay";
605589
};
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* Common IPU and DSP data for TI DRA74x/DRA76x/AM572x/AM574x platforms
4+
*/
5+
6+
#include "dra7-ipu-dsp-common.dtsi"
7+
8+
&mailbox6 {
9+
mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
10+
status = "okay";
11+
};
12+
};

0 commit comments

Comments
 (0)