Merge branch 'sched/urgent' into sched/core, to pick up fixes before merging new patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi
index 3c99cfa1a876..eee636de4cd8 100644
--- a/arch/arm/boot/dts/dm816x.dtsi
+++ b/arch/arm/boot/dts/dm816x.dtsi
@@ -218,6 +218,7 @@
                         reg = <0x480c8000 0x2000>;
                         interrupts = <77>;
                         ti,hwmods = "mailbox";
+                        #mbox-cells = <1>;
                         ti,mbox-num-users = <4>;
                         ti,mbox-num-fifos = <12>;
                         mbox_dsp: mbox_dsp {
@@ -279,8 +280,11 @@
                         ti,spi-num-cs = <4>;
                         ti,hwmods = "mcspi1";
                         dmas = <&edma 16 &edma 17
-                                &edma 18 &edma 19>;
-                        dma-names = "tx0", "rx0", "tx1", "rx1";
+                                &edma 18 &edma 19
+                                &edma 20 &edma 21
+                                &edma 22 &edma 23>;
+                        dma-names = "tx0", "rx0", "tx1", "rx1",
+                                    "tx2", "rx2", "tx3", "rx3";
                 };
 
                 mmc1: mmc@48060000 {