aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Anna2018-02-23 17:21:58 -0600
committerSuman Anna2019-03-04 10:02:38 -0600
commit521faf456439c09bf42fa162243aa716aa77aceb (patch)
treee900d8f640f82aff906700b76948b0cf72bbb331 /arch/arm/boot
parenta44621fd376a00aef822f60f1cc8faa6c7de67e9 (diff)
downloadremoteproc-521faf456439c09bf42fa162243aa716aa77aceb.tar.gz
remoteproc-521faf456439c09bf42fa162243aa716aa77aceb.tar.xz
remoteproc-521faf456439c09bf42fa162243aa716aa77aceb.zip
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 <s-anna@ti.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/am571x-idk.dts18
-rw-r--r--arch/arm/boot/dts/am572x-idk-common.dtsi21
-rw-r--r--arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi21
-rw-r--r--arch/arm/boot/dts/dra7-evm-common.dtsi21
-rw-r--r--arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi21
-rw-r--r--arch/arm/boot/dts/dra72-evm-common.dtsi18
-rw-r--r--arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi12
7 files changed, 38 insertions, 94 deletions
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index d9a2049a1ea8..e903db9047db 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -13,6 +13,7 @@
13#include "dra7-mmc-iodelay.dtsi" 13#include "dra7-mmc-iodelay.dtsi"
14#include "dra72x-mmc-iodelay.dtsi" 14#include "dra72x-mmc-iodelay.dtsi"
15#include "am57xx-idk-common.dtsi" 15#include "am57xx-idk-common.dtsi"
16#include "dra7-ipu-dsp-common.dtsi"
16 17
17/ { 18/ {
18 model = "TI AM5718 IDK"; 19 model = "TI AM5718 IDK";
@@ -71,23 +72,6 @@
71 vbus-gpio = <&gpio7 22 GPIO_ACTIVE_HIGH>; 72 vbus-gpio = <&gpio7 22 GPIO_ACTIVE_HIGH>;
72}; 73};
73 74
74&mailbox5 {
75 status = "okay";
76 mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
77 status = "okay";
78 };
79 mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
80 status = "okay";
81 };
82};
83
84&mailbox6 {
85 status = "okay";
86 mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
87 status = "okay";
88 };
89};
90
91&pcie1_rc { 75&pcie1_rc {
92 status = "okay"; 76 status = "okay";
93 gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>; 77 gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/boot/dts/am572x-idk-common.dtsi b/arch/arm/boot/dts/am572x-idk-common.dtsi
index 784639ddf451..fe9718fdabcc 100644
--- a/arch/arm/boot/dts/am572x-idk-common.dtsi
+++ b/arch/arm/boot/dts/am572x-idk-common.dtsi
@@ -6,6 +6,7 @@
6#include <dt-bindings/gpio/gpio.h> 6#include <dt-bindings/gpio/gpio.h>
7#include <dt-bindings/interrupt-controller/irq.h> 7#include <dt-bindings/interrupt-controller/irq.h>
8#include "am57xx-idk-common.dtsi" 8#include "am57xx-idk-common.dtsi"
9#include "dra74-ipu-dsp-common.dtsi"
9 10
10/ { 11/ {
11 memory@0 { 12 memory@0 {
@@ -74,23 +75,3 @@
74&pcie1_ep { 75&pcie1_ep {
75 gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>; 76 gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
76}; 77};
77
78&mailbox5 {
79 status = "okay";
80 mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
81 status = "okay";
82 };
83 mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
84 status = "okay";
85 };
86};
87
88&mailbox6 {
89 status = "okay";
90 mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
91 status = "okay";
92 };
93 mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
94 status = "okay";
95 };
96};
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index c9e844148c47..7228e442013e 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -10,6 +10,7 @@
10#include "dra74x.dtsi" 10#include "dra74x.dtsi"
11#include "am57xx-commercial-grade.dtsi" 11#include "am57xx-commercial-grade.dtsi"
12#include "dra74x-mmc-iodelay.dtsi" 12#include "dra74x-mmc-iodelay.dtsi"
13#include "dra74-ipu-dsp-common.dtsi"
13#include <dt-bindings/gpio/gpio.h> 14#include <dt-bindings/gpio/gpio.h>
14#include <dt-bindings/interrupt-controller/irq.h> 15#include <dt-bindings/interrupt-controller/irq.h>
15 16
@@ -569,26 +570,6 @@
569 rx-num-evt = <32>; 570 rx-num-evt = <32>;
570}; 571};
571 572
572&mailbox5 {
573 status = "okay";
574 mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
575 status = "okay";
576 };
577 mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
578 status = "okay";
579 };
580};
581
582&mailbox6 {
583 status = "okay";
584 mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
585 status = "okay";
586 };
587 mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
588 status = "okay";
589 };
590};
591
592&pruss_soc_bus1 { 573&pruss_soc_bus1 {
593 status = "okay"; 574 status = "okay";
594 575
diff --git a/arch/arm/boot/dts/dra7-evm-common.dtsi b/arch/arm/boot/dts/dra7-evm-common.dtsi
index 7e18147dc563..8e677f95366f 100644
--- a/arch/arm/boot/dts/dra7-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra7-evm-common.dtsi
@@ -6,6 +6,7 @@
6 * published by the Free Software Foundation. 6 * published by the Free Software Foundation.
7 */ 7 */
8 8
9#include "dra74-ipu-dsp-common.dtsi"
9#include <dt-bindings/gpio/gpio.h> 10#include <dt-bindings/gpio/gpio.h>
10#include <dt-bindings/clk/ti-dra7-atl.h> 11#include <dt-bindings/clk/ti-dra7-atl.h>
11#include <dt-bindings/input/input.h> 12#include <dt-bindings/input/input.h>
@@ -247,26 +248,6 @@
247 rx-num-evt = <32>; 248 rx-num-evt = <32>;
248}; 249};
249 250
250&mailbox5 {
251 status = "okay";
252 mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
253 status = "okay";
254 };
255 mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
256 status = "okay";
257 };
258};
259
260&mailbox6 {
261 status = "okay";
262 mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
263 status = "okay";
264 };
265 mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
266 status = "okay";
267 };
268};
269
270&pcie1_rc { 251&pcie1_rc {
271 status = "okay"; 252 status = "okay";
272}; 253};
diff --git a/arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi b/arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi
new file mode 100644
index 000000000000..478a07e29538
--- /dev/null
+++ b/arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi
@@ -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};
diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi
index e297b923b71a..637ed7a3c0dd 100644
--- a/arch/arm/boot/dts/dra72-evm-common.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-common.dtsi
@@ -8,6 +8,7 @@
8/dts-v1/; 8/dts-v1/;
9 9
10#include "dra72x.dtsi" 10#include "dra72x.dtsi"
11#include "dra7-ipu-dsp-common.dtsi"
11#include <dt-bindings/gpio/gpio.h> 12#include <dt-bindings/gpio/gpio.h>
12#include <dt-bindings/clk/ti-dra7-atl.h> 13#include <dt-bindings/clk/ti-dra7-atl.h>
13 14
@@ -563,23 +564,6 @@
563 rx-num-evt = <32>; 564 rx-num-evt = <32>;
564}; 565};
565 566
566&mailbox5 {
567 status = "okay";
568 mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
569 status = "okay";
570 };
571 mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
572 status = "okay";
573 };
574};
575
576&mailbox6 {
577 status = "okay";
578 mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
579 status = "okay";
580 };
581};
582
583&pcie1_rc { 567&pcie1_rc {
584 status = "okay"; 568 status = "okay";
585}; 569};
diff --git a/arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi b/arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi
new file mode 100644
index 000000000000..645063d0df13
--- /dev/null
+++ b/arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi
@@ -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};