diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2012-11-21 19:57:23 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-21 19:57:23 +0000 |
| commit | 98d8df630d4a508f7d5f7d3bb4d78ca436ef1c8c (patch) | |
| tree | b659c328bca921aa0653d5e9c88636ba5c4f3847 /arch/arm/boot/dts/armada-xp.dtsi | |
| parent | c9dc03ddbf4e71f20b78277d661388c1bc466258 (diff) | |
| parent | a1d53dab4f5b37c800d7a20c56e84a96180a8ea6 (diff) | |
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
Diffstat (limited to 'arch/arm/boot/dts/armada-xp.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 40 |
1 files changed, 40 insertions, 0 deletions
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; + }; + }; }; }; |