From patchwork Wed May 23 21:54:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 10422441 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 E5C6B60224 for ; Wed, 23 May 2018 21:54:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D11CC2927C for ; Wed, 23 May 2018 21:54:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3C692927F; Wed, 23 May 2018 21:54:58 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,T_TVD_MIME_EPI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F16922927C for ; Wed, 23 May 2018 21:54:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933917AbeEWVy5 (ORCPT ); Wed, 23 May 2018 17:54:57 -0400 Received: from mail.bugwerft.de ([46.23.86.59]:40474 "EHLO mail.bugwerft.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933791AbeEWVyz (ORCPT ); Wed, 23 May 2018 17:54:55 -0400 Received: from [192.168.178.170] (p57BC9983.dip0.t-ipconnect.de [87.188.153.131]) by mail.bugwerft.de (Postfix) with ESMTPSA id 13191285031; Wed, 23 May 2018 21:52:16 +0000 (UTC) Subject: Re: [PATCH 05/15] mtd: nand: pxa3xx: remove the dmaengine compat need From: Daniel Mack 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 Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, dmaengine@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, netdev@vger.kernel.org, devel@driverdev.osuosl.org, alsa-devel@alsa-project.org, Robert Jarzmik References: <20180402142656.26815-1-robert.jarzmik@free.fr> <20180402142656.26815-6-robert.jarzmik@free.fr> Message-ID: <5f614736-31b6-6561-69c1-177595fbb210@zonque.org> Date: Wed, 23 May 2018 23:54:50 +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: Content-Language: en-US Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Robert, Please refer to the attached patch instead of the one I sent earlier. I missed to also remove the platform_get_resource(IORESOURCE_DMA) call. Thanks, Daniel On Friday, May 18, 2018 11:31 PM, Daniel Mack wrote: > 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 72a306157dedb21f8c3289f0f7a288fc4542bd96 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 | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c index ebb1d141b900..319fea77daf1 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)) { @@ -2626,20 +2624,7 @@ static int marvell_nfc_init_dma(struct marvell_nfc *nfc) if (ret) return ret; - r = platform_get_resource(pdev, IORESOURCE_DMA, 0); - if (!r) { - dev_err(nfc->dev, "No resource defined for data DMA\n"); - 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