[PATCH 8/8] ARM: mvebu: a38x: Enable A38x XOR engine features
From: Maxime Ripard <hidden>
Date: 2015-05-12 15:40:34
Also in:
linux-arm-kernel, lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Lior Amsalem <redacted> The new XOR engine has a new compatible of its own, together with new channel capabilities. Use that new compatible now that we have a driver that can handle it. Signed-off-by: Lior Amsalem <redacted> Reviewed-by: Ofer Heifetz <redacted> Reviewed-by: Nadav Haklai <redacted> Tested-by: Nadav Haklai <redacted> --- arch/arm/boot/dts/armada-38x.dtsi | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index ed2dd8ba4080..6d07b7389415 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi@@ -448,7 +448,7 @@ }; xor@60800 { - compatible = "marvell,orion-xor"; + compatible = "marvell,a38x-xor"; reg = <0x60800 0x100 0x60a00 0x100>; clocks = <&gateclk 22>;
@@ -458,17 +458,13 @@ interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; dmacap,memcpy; dmacap,xor; - }; - xor01 { - interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; - dmacap,memcpy; - dmacap,xor; - dmacap,memset; + dmacap,pq; + dmacap,interrupt; }; }; xor@60900 { - compatible = "marvell,orion-xor"; + compatible = "marvell,a38x-xor"; reg = <0x60900 0x100 0x60b00 0x100>; clocks = <&gateclk 28>;
@@ -478,12 +474,8 @@ interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>; dmacap,memcpy; dmacap,xor; - }; - xor11 { - interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>; - dmacap,memcpy; - dmacap,xor; - dmacap,memset; + dmacap,pq; + dmacap,interrupt; }; };
--
2.4.0