Merge tag 'v4.0-rc6' into timers/core, before applying new patches

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

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index f4f78c40b564..3fdc84fddb70 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -92,6 +92,8 @@
                         ti,hwmods = "aes";
                         reg = <0x480c5000 0x50>;
                         interrupts = <0>;
+                        dmas = <&sdma 65 &sdma 66>;
+                        dma-names = "tx", "rx";
                 };
 
                 prm: prm@48306000 {
@@ -550,6 +552,8 @@
                         ti,hwmods = "sham";
                         reg = <0x480c3000 0x64>;
                         interrupts = <49>;
+                        dmas = <&sdma 69>;
+                        dma-names = "rx";
                 };
 
                 smartreflex_core: smartreflex@480cb000 {