From patchwork Tue Jul 31 23:45:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Snyder X-Patchwork-Id: 174358 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 396E12C0B72 for ; Wed, 1 Aug 2012 09:50:13 +1000 (EST) Received: from ovro.ovro.caltech.edu (ovro.ovro.caltech.edu [192.100.16.2]) by ozlabs.org (Postfix) with ESMTP id BFA6A2C00CD for ; Wed, 1 Aug 2012 09:46:01 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by ovro.ovro.caltech.edu (Postfix) with ESMTP id C0C2721F8E; Tue, 31 Jul 2012 16:46:00 -0700 (PDT) X-Virus-Scanned: amavisd-new at ovro.caltech.edu Received: from ovro.ovro.caltech.edu ([127.0.0.1]) by localhost (ovro.ovro.caltech.edu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id VOhZkLa4t4pu; Tue, 31 Jul 2012 16:45:59 -0700 (PDT) Received: from rena.ovro.pvt (rena.ovro.pvt [192.168.0.80]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ovro.ovro.caltech.edu (Postfix) with ESMTPSA id 9EF9521FA8; Tue, 31 Jul 2012 16:45:55 -0700 (PDT) From: "Ira W. Snyder" To: linux-crypto@vger.kernel.org Subject: [PATCH 7/7] carma: remove unnecessary DMA_INTERRUPT capability Date: Tue, 31 Jul 2012 16:45:52 -0700 Message-Id: <1343778352-5549-8-git-send-email-iws@ovro.caltech.edu> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1343778352-5549-1-git-send-email-iws@ovro.caltech.edu> References: <1343778352-5549-1-git-send-email-iws@ovro.caltech.edu> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (ovro.ovro.caltech.edu); Tue, 31 Jul 2012 16:45:55 -0700 (PDT) Cc: B32616@freescale.com, linuxppc-dev@lists.ozlabs.org, "Ira W. Snyder" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: "Ira W. Snyder" These drivers set the DMA_INTERRUPT capability bit when requesting a DMA controller channel. This was historical, and is no longer needed. Recent changes to the drivers/dma/fsldma.c driver have removed support for this flag. This makes the carma drivers unable to find a DMA channel with the required capabilities. Signed-off-by: Ira W. Snyder --- drivers/misc/carma/carma-fpga-program.c | 1 - drivers/misc/carma/carma-fpga.c | 3 +-- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c index a2d25e4..eaddfe9 100644 --- a/drivers/misc/carma/carma-fpga-program.c +++ b/drivers/misc/carma/carma-fpga-program.c @@ -978,7 +978,6 @@ static int fpga_of_probe(struct platform_device *op) dev_set_drvdata(priv->dev, priv); dma_cap_zero(mask); dma_cap_set(DMA_MEMCPY, mask); - dma_cap_set(DMA_INTERRUPT, mask); dma_cap_set(DMA_SLAVE, mask); dma_cap_set(DMA_SG, mask); diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c index 8c279da..861b298 100644 --- a/drivers/misc/carma/carma-fpga.c +++ b/drivers/misc/carma/carma-fpga.c @@ -666,7 +666,7 @@ static int data_submit_dma(struct fpga_device *priv, struct data_buf *buf) src = SYS_FPGA_BLOCK; tx = chan->device->device_prep_dma_memcpy(chan, dst, src, REG_BLOCK_SIZE, - DMA_PREP_INTERRUPT); + 0); if (!tx) { dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n"); return -ENOMEM; @@ -1333,7 +1333,6 @@ static int data_of_probe(struct platform_device *op) dma_cap_zero(mask); dma_cap_set(DMA_MEMCPY, mask); - dma_cap_set(DMA_INTERRUPT, mask); dma_cap_set(DMA_SLAVE, mask); dma_cap_set(DMA_SG, mask);