Skip to content

Commit

Permalink
ARM: dts: dra7-ipu-dsp-common: Move mailboxes into common files
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
sumananna authored and tmlind committed May 5, 2020
1 parent 0ed073c commit a11a2f7
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 74 deletions.
18 changes: 1 addition & 17 deletions arch/arm/boot/dts/am571x-idk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "dra7-mmc-iodelay.dtsi"
#include "dra72x-mmc-iodelay.dtsi"
#include "am57xx-idk-common.dtsi"
#include "dra7-ipu-dsp-common.dtsi"

/ {
model = "TI AM5718 IDK";
Expand Down Expand Up @@ -148,23 +149,6 @@
load-gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
};

&mailbox5 {
status = "okay";
mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
status = "okay";
};
mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
status = "okay";
};
};

&mailbox6 {
status = "okay";
mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
status = "okay";
};
};

&pcie1_rc {
status = "okay";
gpios = <&gpio5 18 GPIO_ACTIVE_HIGH>;
Expand Down
21 changes: 1 addition & 20 deletions arch/arm/boot/dts/am572x-idk-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include "am57xx-idk-common.dtsi"
#include "dra74-ipu-dsp-common.dtsi"

/ {
memory@0 {
Expand Down Expand Up @@ -146,23 +147,3 @@
status = "okay";
gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
};

&mailbox5 {
status = "okay";
mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
status = "okay";
};
mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
status = "okay";
};
};

&mailbox6 {
status = "okay";
mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
status = "okay";
};
mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
status = "okay";
};
};
21 changes: 1 addition & 20 deletions arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "am5728.dtsi"
#include "am57xx-commercial-grade.dtsi"
#include "dra74x-mmc-iodelay.dtsi"
#include "dra74-ipu-dsp-common.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>

Expand Down Expand Up @@ -583,23 +584,3 @@
tx-num-evt = <32>;
rx-num-evt = <32>;
};

&mailbox5 {
status = "okay";
mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
status = "okay";
};
mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
status = "okay";
};
};

&mailbox6 {
status = "okay";
mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
status = "okay";
};
mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
status = "okay";
};
};
1 change: 1 addition & 0 deletions arch/arm/boot/dts/dra7-evm-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
*/

#include "dra74-ipu-dsp-common.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clock/ti-dra7-atl.h>
#include <dt-bindings/input/input.h>
Expand Down
21 changes: 21 additions & 0 deletions arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Common IPU and DSP data for TI DRA7xx/AM57xx platforms
*/

&mailbox5 {
status = "okay";
mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
status = "okay";
};
mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
status = "okay";
};
};

&mailbox6 {
status = "okay";
mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
status = "okay";
};
};
18 changes: 1 addition & 17 deletions arch/arm/boot/dts/dra72-evm-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/dts-v1/;

#include "dra72x.dtsi"
#include "dra7-ipu-dsp-common.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clock/ti-dra7-atl.h>

Expand Down Expand Up @@ -583,23 +584,6 @@
rx-num-evt = <32>;
};

&mailbox5 {
status = "okay";
mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
status = "okay";
};
mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
status = "okay";
};
};

&mailbox6 {
status = "okay";
mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
status = "okay";
};
};

&pcie1_rc {
status = "okay";
};
Expand Down
12 changes: 12 additions & 0 deletions arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Common IPU and DSP data for TI DRA74x/DRA76x/AM572x/AM574x platforms
*/

#include "dra7-ipu-dsp-common.dtsi"

&mailbox6 {
mbox_dsp2_ipc3x: mbox_dsp2_ipc3x {
status = "okay";
};
};

0 comments on commit a11a2f7

Please sign in to comment.