From: Jason Cooper <jason@lakedaemon.net>
Date: Wed, 21 Nov 2012 19:57:23 +0000 (+0000)
Subject: Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of git://github.com/MISL-EBU-System... 
X-Git-Tag: v3.8-rc1~106^2~1^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98d8df630d4a508f7d5f7d3bb4d78ca436ef1c8c;p=thirdparty%2Fkernel%2Flinux.git

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

Marvell XOR driver DT changes for 3.8

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

98d8df630d4a508f7d5f7d3bb4d78ca436ef1c8c
diff --cc arch/arm/boot/dts/armada-xp.dtsi
index 3744ea18be727,a09998523d40a..3c52e7ab19107
--- a/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;
+ 			};
+ 		};
  	};
  };