Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933103AbbELPke (ORCPT ); Tue, 12 May 2015 11:40:34 -0400 Received: from down.free-electrons.com ([37.187.137.238]:57324 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753355AbbELPkP (ORCPT ); Tue, 12 May 2015 11:40:15 -0400 From: Maxime Ripard To: Vinod Koul , Dan Williams , Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth Cc: dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, Lior Amsalem , Thomas Petazzoni , Herbert Xu , "David S. Miller" Subject: [PATCH 8/8] ARM: mvebu: a38x: Enable A38x XOR engine features Date: Tue, 12 May 2015 17:37:43 +0200 Message-Id: <1431445063-20226-9-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.4.0 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1957 Lines: 72 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@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@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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/