Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge

Marvell XOR driver DT changes for 3.8

Conflicts:
	arch/arm/boot/dts/armada-xp.dtsi

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

4 files changed, 158 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 175df2887076..7fbac28b01f3 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -89,6 +89,42 @@
                         #clock-cells = <1>;
                 };
 
+                xor@d0060800 {
+                        compatible = "marvell,orion-xor";
+                        reg = <0xd0060800 0x100
+                               0xd0060A00 0x100>;
+                        status = "okay";
 
+                        xor00 {
+                                interrupts = <51>;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                        };
+                        xor01 {
+                                interrupts = <52>;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                                dmacap,memset;
+                        };
+                };
+
+                xor@d0060900 {
+                        compatible = "marvell,orion-xor";
+                        reg = <0xd0060900 0x100
+                               0xd0060b00 0x100>;
+                        status = "okay";
+
+                        xor10 {
+                                interrupts = <94>;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                        };
+                        xor11 {
+                                interrupts = <95>;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                                dmacap,memset;
+                        };
+                };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 3744ea18be72..3c52e7ab1910 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -87,5 +87,45 @@
                                 clocks = <&gateclk 1>;
                                 status = "disabled";
                 };
+
+                xor@d0060900 {
+                        compatible = "marvell,orion-xor";
+                        reg = <0xd0060900 0x100
+                               0xd0060b00 0x100>;
+                        clocks = <&gateclk 22>;
+                        status = "okay";
+
+                        xor10 {
+                                interrupts = <51>;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                        };
+                        xor11 {
+                                interrupts = <52>;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                                dmacap,memset;
+                        };
+                };
+
+                xor@d00f0900 {
+                        compatible = "marvell,orion-xor";
+                        reg = <0xd00F0900 0x100
+                               0xd00F0B00 0x100>;
+                        clocks = <&gateclk 28>;
+                        status = "okay";
+
+                        xor00 {
+                                interrupts = <94>;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                        };
+                        xor01 {
+                                interrupts = <95>;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                                dmacap,memset;
+                        };
+                };
         };
 };
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index b524ee377f83..b1cfa52ae223 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -174,5 +174,47 @@
                         clocks = <&gate_clk 15>;
                         status = "okay";
                 };
+
+                xor0: dma-engine@60800 {
+                        compatible = "marvell,orion-xor";
+                        reg = <0x60800 0x100
+                               0x60a00 0x100>;
+                        clocks = <&gate_clk 23>;
+                        status = "okay";
+
+                        channel0 {
+                                interrupts = <39>;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                        };
+
+                        channel1 {
+                                interrupts = <40>;
+                                dmacap,memset;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                        };
+                };
+
+                xor1: dma-engine@60900 {
+                        compatible = "marvell,orion-xor";
+                        reg = <0x60900 0x100
+                               0x60b00 0x100>;
+                        clocks = <&gate_clk 24>;
+                        status = "okay";
+
+                        channel0 {
+                                interrupts = <42>;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                        };
+
+                        channel1 {
+                                interrupts = <43>;
+                                dmacap,memset;
+                                dmacap,memcpy;
+                                dmacap,xor;
+                        };
+                };
         };
 };
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 7a9fac0d4251..2388f9936ebf 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -94,6 +94,46 @@
                         status = "okay";
                 };
 
+                xor@60800 {
+                        compatible = "marvell,orion-xor";
+                        reg = <0x60800 0x100
+                               0x60A00 0x100>;
+                        status = "okay";
+                        clocks = <&gate_clk 8>;
+
+                        xor00 {
+                              interrupts = <5>;
+                              dmacap,memcpy;
+                              dmacap,xor;
+                        };
+                        xor01 {
+                              interrupts = <6>;
+                              dmacap,memcpy;
+                              dmacap,xor;
+                              dmacap,memset;
+                        };
+                };
+
+                xor@60900 {
+                        compatible = "marvell,orion-xor";
+                        reg = <0x60900 0x100
+                               0xd0B00 0x100>;
+                        status = "okay";
+                        clocks = <&gate_clk 16>;
+
+                        xor00 {
+                              interrupts = <7>;
+                              dmacap,memcpy;
+                              dmacap,xor;
+                        };
+                        xor01 {
+                              interrupts = <8>;
+                              dmacap,memcpy;
+                              dmacap,xor;
+                              dmacap,memset;
+                        };
+                };
+
                 sata@80000 {
                         compatible = "marvell,orion-sata";
                         reg = <0x80000 0x5000>;