From patchwork Tue May 12 15:37:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 6389271 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3E9F9BEEE1 for ; Tue, 12 May 2015 15:41:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BA1620412 for ; Tue, 12 May 2015 15:41:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 671522041E for ; Tue, 12 May 2015 15:41:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932994AbbELPkZ (ORCPT ); Tue, 12 May 2015 11:40:25 -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 Received: by mail.free-electrons.com (Postfix, from userid 106) id E6AC1CA9; Tue, 12 May 2015 17:40:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 48E51DED; Tue, 12 May 2015 17:40:10 +0200 (CEST) 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: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; }; };