Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of github.com:MISL-EBU-System-SW...

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>

diff --cc arch/arm/boot/dts/armada-xp.dtsi
index 3744ea1,a099985..3c52e7a
--- 1/arch/arm/boot/dts/armada-xp.dtsi
--- 2/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@@ -72,20 -72,44 +72,60 @@@
                                reg = <0xd0018200 0x500>;
                };
  
 +              ethernet@d0030000 {
 +                              compatible = "marvell,armada-370-neta";
 +                              reg = <0xd0030000 0x2500>;
 +                              interrupts = <12>;
 +                              clocks = <&gateclk 2>;
 +                              status = "disabled";
 +              };
 +
 +              ethernet@d0034000 {
 +                              compatible = "marvell,armada-370-neta";
 +                              reg = <0xd0034000 0x2500>;
 +                              interrupts = <14>;
 +                              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;
+                       };
+               };
        };
  };