From mboxrd@z Thu Jan 1 00:00:00 1970 From: maxime.ripard@free-electrons.com (Maxime Ripard) Date: Tue, 12 May 2015 17:37:43 +0200 Subject: [PATCH 8/8] ARM: mvebu: a38x: Enable A38x XOR engine features In-Reply-To: <1431445063-20226-1-git-send-email-maxime.ripard@free-electrons.com> References: <1431445063-20226-1-git-send-email-maxime.ripard@free-electrons.com> Message-ID: <1431445063-20226-9-git-send-email-maxime.ripard@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Lior Amsalem 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 Reviewed-by: Ofer Heifetz Reviewed-by: Nadav Haklai Tested-by: Nadav Haklai --- 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 at 60800 { - compatible = "marvell,orion-xor"; + compatible = "marvell,a38x-xor"; reg = <0x60800 0x100 0x60a00 0x100>; clocks = <&gateclk 22>; @@ -458,17 +458,13 @@ interrupts = ; dmacap,memcpy; dmacap,xor; - }; - xor01 { - interrupts = ; - dmacap,memcpy; - dmacap,xor; - dmacap,memset; + dmacap,pq; + dmacap,interrupt; }; }; xor at 60900 { - compatible = "marvell,orion-xor"; + compatible = "marvell,a38x-xor"; reg = <0x60900 0x100 0x60b00 0x100>; clocks = <&gateclk 28>; @@ -478,12 +474,8 @@ interrupts = ; dmacap,memcpy; dmacap,xor; - }; - xor11 { - interrupts = ; - dmacap,memcpy; - dmacap,xor; - dmacap,memset; + dmacap,pq; + dmacap,interrupt; }; }; -- 2.4.0