From patchwork Fri Jul 12 13:43:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2826952 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 7E8659F756 for ; Fri, 12 Jul 2013 13:44:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D9B020169 for ; Fri, 12 Jul 2013 13:44:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55C912016A for ; Fri, 12 Jul 2013 13:44:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964914Ab3GLNoh (ORCPT ); Fri, 12 Jul 2013 09:44:37 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:60585 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964821Ab3GLNoI (ORCPT ); Fri, 12 Jul 2013 09:44:08 -0400 Received: from axis700.grange (dslb-178-001-224-050.pools.arcor-ip.net [178.1.224.50]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0MYcHS-1UcJQg1iuw-00UqQ2; Fri, 12 Jul 2013 15:44:00 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 024F540BC4; Fri, 12 Jul 2013 15:43:58 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1Uxdde-0004p2-Kf; Fri, 12 Jul 2013 15:43:58 +0200 From: Guennadi Liakhovetski To: linux-kernel@vger.kernel.org Cc: linux-sh@vger.kernel.org, Magnus Damm , Simon Horman , Vinod Koul , Laurent Pinchart , Guennadi Liakhovetski Subject: [PATCH 6/8] DMA: shdma: pass SoC-specific configuration to the driver via OF matching Date: Fri, 12 Jul 2013 15:43:56 +0200 Message-Id: <1373636638-18496-7-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1373636638-18496-1-git-send-email-g.liakhovetski@gmx.de> References: <1373636638-18496-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:oySkfp1FC/PGrZDAocL3mbKfvQLNc22XQ8Ai+aPyMZ6 J3htofDhQZytjEGmsDyw2Ss5PI6ZEopbLLfnzFEE0k+EnucYKm /MccyCsBDNjjAtSQZHWXoFsoBROdJyo2exA2utrDNiBxt9Iaxp wadXKP9+fH1oTLsPkpD8p7J39Frtut9dSIoxhKt+Fqk0HWFGb/ p95FhQeemmIVSD3ukTD8z6iyFk/h4jOIhseSvG7MALBuxFL3jD t2jLIvIoRRrwrDoYR7cgf81booRcgMiTprrwCEM/X2ECW/FaC4 cZHr+S+eSA1YGy93ULsVXplWV0X8N/QUO1FBHbE3GlspW0tzHt GsZZ1CLNaiFxyC1ygkzyv7LjZprbVK/izQ0BcOonEY8ptYa02j MIMh3oSrrDfrA== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Similar to the non-DT case, this patch passes SoC-specific configuration to the driver via device ID matching, instead of platform data. Signed-off-by: Guennadi Liakhovetski --- Documentation/devicetree/bindings/dma/shdma.txt | 7 +++++-- drivers/dma/sh/shdmac.c | 21 ++++++++++++++------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/shdma.txt b/Documentation/devicetree/bindings/dma/shdma.txt index c15994a..7702e35 100644 --- a/Documentation/devicetree/bindings/dma/shdma.txt +++ b/Documentation/devicetree/bindings/dma/shdma.txt @@ -22,7 +22,10 @@ Optional properties (currently unused): * DMA controller Required properties: -- compatible: should be "renesas,shdma" +- compatible: should be one of + "renesas,shdma-r8a73a4" for the system DMAC on r8a73a4 SoC + "renesas,shdma-r8a7740" for the DMACs (not RTDMAC) on r8a7740 + "renesas,shdma" for a generic DMAC Example: dmac: dma-mux0 { @@ -36,7 +39,7 @@ Example: ranges; dma0: shdma@fe008020 { - compatible = "renesas,shdma"; + compatible = "renesas,shdma-r8a7740"; reg = <0xfe008020 0x270>, <0xfe009000 0xc>; interrupt-parent = <&gic>; diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index a6d53fa..b095d74 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -665,6 +666,14 @@ static const struct shdma_ops sh_dmae_shdma_ops = { .get_partial = sh_dmae_get_partial, }; +static const struct of_device_id sh_dmae_of_match[] = { + {.compatible = "renesas,shdma",}, + {.compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,}, + {.compatible = "renesas,shdma-r8a7740", .data = r8a7740_shdma_devid,}, + { } +}; +MODULE_DEVICE_TABLE(of, sh_dmae_of_match); + static int sh_dmae_probe(struct platform_device *pdev) { struct sh_dmae_pdata *pdata; @@ -676,7 +685,11 @@ static int sh_dmae_probe(struct platform_device *pdev) struct dma_device *dma_dev; struct resource *chan, *dmars, *errirq_res, *chanirq_res; - pdata = (void *)pdev->id_entry->driver_data ? : pdev->dev.platform_data; + if (pdev->dev.of_node) + pdata = of_match_device(sh_dmae_of_match, &pdev->dev)->data; + else + pdata = (void *)pdev->id_entry->driver_data ? : + pdev->dev.platform_data; /* get platform data */ if (!pdata || !pdata->channel_num) @@ -915,12 +928,6 @@ static int sh_dmae_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id sh_dmae_of_match[] = { - { .compatible = "renesas,shdma", }, - { } -}; -MODULE_DEVICE_TABLE(of, sh_dmae_of_match); - const struct platform_device_id sh_dmae_id_table[] = { {.name = SH_DMAE_DRV_NAME,}, {.name = "shdma-r8a73a4", .driver_data = (kernel_ulong_t)r8a73a4_shdma_devid,},