Merge branch 'linus' into timers/nohz

1 files changed, 41 insertions, 9 deletions

diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 539e02fb3526..7345743d3d96 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -114,18 +114,50 @@
                         interrupt-parent = <&ipic>;
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8323-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 crypto@30000 {
-                        device_type = "crypto";
-                        model = "SEC2";
-                        compatible = "talitos";
-                        reg = <0x30000 0x7000>;
+                        compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        /* Rev. 2.2 */
-                        num-channels = <1>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x0000004c>;
-                        descriptor-types-mask = <0x0122003f>;
+                        fsl,num-channels = <1>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x4c>;
+                        fsl,descriptor-types-mask = <0x0122003f>;
                 };
 
                 ipic: pic@700 {