From patchwork Wed Jun 18 09:10:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 4374531 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4C6CFBEEAA for ; Wed, 18 Jun 2014 09:10:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4D378202FE for ; Wed, 18 Jun 2014 09:10:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 747A5202F2 for ; Wed, 18 Jun 2014 09:10:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965158AbaFRJKH (ORCPT ); Wed, 18 Jun 2014 05:10:07 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34112 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964840AbaFRJKE (ORCPT ); Wed, 18 Jun 2014 05:10:04 -0400 Received: by mail-pa0-f54.google.com with SMTP id et14so543802pad.13 for ; Wed, 18 Jun 2014 02:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:from:to:cc:subject:in-reply-to:references :user-agent:mime-version:content-type; bh=Q9DW+LR/1tN4qsZb9vHimwAkgkJMjiTTN1aRGwUn240=; b=qiMho0HPMaTP7M50WxLI6L4bCLFMMXLlnmNqcJzZ0pBqDt2JR3wPBe1Dah6SoX+rjb mhgpxpklLIswxUjNEZZgWK0WHK3U3+GsVWlUxqDIPsVpeAew66EnvHa7Xq/DFmTiOJQt eh3BDJ6gYGQiJx7JbYyOIgGsDki9ieZBbddxm44qLzsWOUBUxzPvQ0P11D4fvSKBCJH9 4YwQIkJ0B/z5HbAVzH4EiwvbDHK0a/9X6dAbOW0awgOB0hFOAwxlZw1XwvEpZ2NPqIPa 1fDZIBDKAsbq4P+zgycrA3BczqzvATW4uuTwXjifbTaiOUxFuN+vTGd0ABLgs2aqvsM1 q6+g== X-Received: by 10.66.162.137 with SMTP id ya9mr871545pab.31.1403082603996; Wed, 18 Jun 2014 02:10:03 -0700 (PDT) Received: from remon.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id tf10sm2319151pbc.70.2014.06.18.02.10.02 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 18 Jun 2014 02:10:03 -0700 (PDT) Date: Wed, 18 Jun 2014 02:10:03 -0700 (PDT) Message-ID: <87k38ey45w.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Simon Cc: Kuninori Morimoto , Magnus , linux-sh@vger.kernel.org Subject: [PROTOTYPE 2/8] DMA: shdma: wire r8a7790 In-Reply-To: <87mwday4gg.wl%kuninori.morimoto.gx@renesas.com> References: <87oaxqy4i1.wl%kuninori.morimoto.gx@gmail.com> <87mwday4gg.wl%kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_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 From: Ben Dooks Add support for R8A7790 with new device tree code. Signed-off-by: Ben Dooks --- drivers/dma/sh/shdmac.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index 146d5df..f2ecec8 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -343,11 +343,21 @@ static const struct sh_dmae_slave_config *dmae_find_slave( if (cfg->slave_id == match) return cfg; } else { - for (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++) - if (cfg->mid_rid == match) { + if (!pdata->slave) { + cfg = shdma_find_slave_of(shdev, match, &i); + if (cfg) { sh_chan->shdma_chan.slave_id = i; return cfg; } + + return NULL; + } else + for (i = 0, cfg = pdata->slave; i < pdata->slave_num; + i++, cfg++) + if (cfg->mid_rid == match) { + sh_chan->shdma_chan.slave_id = i; + return cfg; + } } return NULL; @@ -680,7 +690,8 @@ static const struct shdma_ops sh_dmae_shdma_ops = { }; static const struct of_device_id sh_dmae_of_match[] = { - {.compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,}, + { .compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid }, + { .compatible = "renesas,dma-r8a7790", .data = &shdma_arm_info }, {} }; MODULE_DEVICE_TABLE(of, sh_dmae_of_match); @@ -699,10 +710,17 @@ static int sh_dmae_probe(struct platform_device *pdev) struct dma_device *dma_dev; struct resource *chan, *dmars, *errirq_res, *chanirq_res; - if (pdev->dev.of_node) - pdata = of_match_device(sh_dmae_of_match, &pdev->dev)->data; - else + if (pdev->dev.of_node) { + const struct of_device_id *match; + + match = of_match_device(sh_dmae_of_match, &pdev->dev); + if (match->data == r8a73a4_shdma_devid) + pdata = match->data; + else + pdata = sh_dma_probe_of(pdev, match); + } else { pdata = dev_get_platdata(&pdev->dev); + } /* get platform data */ if (!pdata || !pdata->channel_num) @@ -751,7 +769,7 @@ static int sh_dmae_probe(struct platform_device *pdev) if (!pdata->slave_only) dma_cap_set(DMA_MEMCPY, dma_dev->cap_mask); - if (pdata->slave && pdata->slave_num) + if ((pdata->slave && pdata->slave_num) || pdev->dev.of_node) dma_cap_set(DMA_SLAVE, dma_dev->cap_mask); /* Default transfer size of 32 bytes requires 32-byte alignment */