From patchwork Fri May 18 21:31:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 10412239 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CBFC6602CB for ; Fri, 18 May 2018 21:31:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8EFA28AF1 for ; Fri, 18 May 2018 21:31:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD12728AF7; Fri, 18 May 2018 21:31:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 236E628AF1 for ; Fri, 18 May 2018 21:31:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: In-Reply-To:MIME-Version:Date:Message-ID:From:References:To:Subject:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=n5jjFuZ6nfiBRSfk5y/YlgI7OGrmDB6cP2BjZhG5Jnk=; b=jfBOichoXCAMY/9RrrQMWxERX PgvlfSdqGyx4I/xi4dNshKAg4CdzFAyWbcM0n3PxuSx+weSmYBwkCy0ULlHe5pXbigw6tGl/KQwFP 66qvDQGcs3pR5u0+9NUxRs37aSIM0V4CPnss0gOyVum7ajwq28pCTi0gDwM6ZjiubsVEgTu7SbVWg yhmcFoHoxdLomrXLR5zn42PEvlnaobddZs5gzZIxK6xrGrlPVC6gwManXqsmtLXj5225ePybBTmkp qdgCqXQ4Ia1u5O3ZDRwSB2hRTed4yuzcO28/+wbqZPiZVinucLH4Zjp6uI5KT+6RVL/Y10GVDfEdG NDuWaG+Nw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJmy6-0006Fm-NJ; Fri, 18 May 2018 21:31:18 +0000 Received: from mail.bugwerft.de ([2a03:6000:1011::59]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJmy4-00069L-2H; Fri, 18 May 2018 21:31:17 +0000 Received: from [192.168.178.170] (pD95EF214.dip0.t-ipconnect.de [217.94.242.20]) by mail.bugwerft.de (Postfix) with ESMTPSA id A4D69283ED0; Fri, 18 May 2018 21:28:34 +0000 (UTC) Subject: Re: [PATCH 05/15] mtd: nand: pxa3xx: remove the dmaengine compat need To: Robert Jarzmik , Haojian Zhuang , Bartlomiej Zolnierkiewicz , Tejun Heo , Vinod Koul , Mauro Carvalho Chehab , Ulf Hansson , Ezequiel Garcia , Boris Brezillon , David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Cyrille Pitchen , Nicolas Pitre , Samuel Ortiz , Greg Kroah-Hartman , Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown , Arnd Bergmann References: <20180402142656.26815-1-robert.jarzmik@free.fr> <20180402142656.26815-6-robert.jarzmik@free.fr> From: Daniel Mack Message-ID: Date: Fri, 18 May 2018 23:31:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180402142656.26815-6-robert.jarzmik@free.fr> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180518_143116_389602_0417EC65 X-CRM114-Status: GOOD ( 24.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, alsa-devel@alsa-project.org, netdev@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, linux-mtd@lists.infradead.org, dmaengine@vger.kernel.org, Robert Jarzmik , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Robert, Thanks for this series. On Monday, April 02, 2018 04:26 PM, Robert Jarzmik wrote: > From: Robert Jarzmik > > As the pxa architecture switched towards the dmaengine slave map, the > old compatibility mechanism to acquire the dma requestor line number and > priority are not needed anymore. > > This patch simplifies the dma resource acquisition, using the more > generic function dma_request_slave_channel(). > > Signed-off-by: Robert Jarzmik > --- > drivers/mtd/nand/pxa3xx_nand.c | 10 +--------- This driver was replaced by drivers/mtd/nand/raw/marvell_nand.c recently, so this patch can be dropped. I attached a version for the new driver which you can pick instead. Thanks, Daniel From c63bc40bdfe2d596e42919235840109a2f1b2776 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Sat, 12 May 2018 21:50:13 +0200 Subject: [PATCH] mtd: rawnand: marvell: remove dmaengine compat code As the pxa architecture switched towards the dmaengine slave map, the old compatibility mechanism to acquire the dma requestor line number and priority are not needed anymore. This patch simplifies the dma resource acquisition, using the more generic function dma_request_slave_channel(). Signed-off-by: Daniel Mack --- drivers/mtd/nand/raw/marvell_nand.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c index ebb1d141b900..30017cd7d91c 100644 --- a/drivers/mtd/nand/raw/marvell_nand.c +++ b/drivers/mtd/nand/raw/marvell_nand.c @@ -2612,8 +2612,6 @@ static int marvell_nfc_init_dma(struct marvell_nfc *nfc) dev); struct dma_slave_config config = {}; struct resource *r; - dma_cap_mask_t mask; - struct pxad_param param; int ret; if (!IS_ENABLED(CONFIG_PXA_DMA)) { @@ -2632,14 +2630,7 @@ static int marvell_nfc_init_dma(struct marvell_nfc *nfc) return -ENXIO; } - param.drcmr = r->start; - param.prio = PXAD_PRIO_LOWEST; - dma_cap_zero(mask); - dma_cap_set(DMA_SLAVE, mask); - nfc->dma_chan = - dma_request_slave_channel_compat(mask, pxad_filter_fn, - ¶m, nfc->dev, - "data"); + nfc->dma_chan = dma_request_slave_channel(nfc->dev, "data"); if (!nfc->dma_chan) { dev_err(nfc->dev, "Unable to request data DMA channel\n"); -- 2.14.3