From patchwork Fri Aug 2 13:03:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2837888 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D77E89F479 for ; Fri, 2 Aug 2013 13:03:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B796320455 for ; Fri, 2 Aug 2013 13:03:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6DE8220453 for ; Fri, 2 Aug 2013 13:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751389Ab3HBNDq (ORCPT ); Fri, 2 Aug 2013 09:03:46 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:63248 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750904Ab3HBNDp (ORCPT ); Fri, 2 Aug 2013 09:03:45 -0400 Received: from axis700.grange (dslb-178-001-230-204.pools.arcor-ip.net [178.1.230.204]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0M35gF-1UEe8808RT-00scDW; Fri, 02 Aug 2013 15:03:43 +0200 Received: by axis700.grange (Postfix, from userid 1000) id A6BCB40BB4; Fri, 2 Aug 2013 15:03:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id A45E240BB3; Fri, 2 Aug 2013 15:03:42 +0200 (CEST) Date: Fri, 2 Aug 2013 15:03:42 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-sh@vger.kernel.org cc: Magnus Damm , linux-spi@vger.kernel.org, Mark Brown , "Shimoda, Yoshihiro" Subject: [PATCH] spi: rspi: provide port addresses to dmaengine driver via slave configuration Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:TP4dXDFV8xJAhb1XQEHdA1lQA6A/rAAJFHD1Fr7HUGG N35Aae9cqjXAde0pxSrrJI6Rs18RY+2F+ohG0W71gceadWaToK 13XRHzFVslAefHquD1xFfx+POSHiKPDtWoE/DjN3dMiMgKglkv CnMw8bKZQr0NG0VshaSlcFS20D1+v40sCLDjjIURxpptbjui4w S7mp4/AGnVPgOrA4z+T5z16dX4JhB/zdENSWgXON7AlaENsfhW +VgufrBZxVqjkweKrJaGKFigIgrM9avJdd23aiuhXsCd58NHcN t67/mZbJ1cWtXbcXoe2HlPvntGFOCe9byvzRnNhZAPBWif4f53 kVddPVhxsulqcH6cs/IPhKSz1MxRh4MIGLL3oTLeQaS1nxoPPJ GrMyTSu5NNKCA== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Don't rely on shdma dhaengine driver getting DMA slave addresses from its slave configuration. Instead provide those addresses, using a dmaengine_slave_config() call. Signed-off-by: Guennadi Liakhovetski --- drivers/spi/spi-rspi.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index b44a6ac..5f122d9 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -664,12 +664,13 @@ static irqreturn_t rspi_irq(int irq, void *_sr) static int rspi_request_dma(struct rspi_data *rspi, struct platform_device *pdev) { + struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct rspi_plat_data *rspi_pd = pdev->dev.platform_data; dma_cap_mask_t mask; struct dma_slave_config cfg; int ret; - if (!rspi_pd) + if (!res || !rspi_pd) return 0; /* The driver assumes no error. */ rspi->dma_width_16bit = rspi_pd->dma_width_16bit; @@ -683,6 +684,8 @@ static int rspi_request_dma(struct rspi_data *rspi, if (rspi->chan_rx) { cfg.slave_id = rspi_pd->dma_rx_id; cfg.direction = DMA_DEV_TO_MEM; + cfg.dst_addr = 0; + cfg.src_addr = res->start + RSPI_SPDR; ret = dmaengine_slave_config(rspi->chan_rx, &cfg); if (!ret) dev_info(&pdev->dev, "Use DMA when rx.\n"); @@ -698,6 +701,8 @@ static int rspi_request_dma(struct rspi_data *rspi, if (rspi->chan_tx) { cfg.slave_id = rspi_pd->dma_tx_id; cfg.direction = DMA_MEM_TO_DEV; + cfg.dst_addr = res->start + RSPI_SPDR; + cfg.src_addr = 0; ret = dmaengine_slave_config(rspi->chan_tx, &cfg); if (!ret) dev_info(&pdev->dev, "Use DMA when tx\n");