From patchwork Fri Jul 12 13:43:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2826956 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 D68D7C0AB2 for ; Fri, 12 Jul 2013 13:45:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6A3C2017B for ; Fri, 12 Jul 2013 13:45:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 92D452017A for ; Fri, 12 Jul 2013 13:45:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964871Ab3GLNoG (ORCPT ); Fri, 12 Jul 2013 09:44:06 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:49256 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964842Ab3GLNoD (ORCPT ); Fri, 12 Jul 2013 09:44:03 -0400 Received: from axis700.grange (dslb-178-001-224-050.pools.arcor-ip.net [178.1.224.50]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0LxHby-1U5Raf12CI-016zZJ; Fri, 12 Jul 2013 15:43:59 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 8ED5240BB3; Fri, 12 Jul 2013 15:43:58 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1Uxdde-0004oo-9V; 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 1/8] DMA: shdma: add support for DMAC configuration data, supplied via device ID Date: Fri, 12 Jul 2013 15:43:51 +0200 Message-Id: <1373636638-18496-2-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:PpN5IpVoGEb0jRD7nEg6roHR3uP93tIt1NuFNY/6OWm FJpPgPdjkhq+ongJ5jiaWWQcuyxl34JqOLzKgeRUQkVsCGAlt5 2ctsZrK1Lzd9o/4j10ttf/ti3sXexwLZuf9MFmRZDmDZ2fWUil d1v1wsnjQAZfb/SUQl3mBnYGRtRfz/VkzBNSvcexP+TjovzeRk sFaqtszgEGLXqghwp9qYgcGMAV3QB4EMJXMd6j90WP31GlCBjO YQCb80KJMeFAopPq3uiNwwZ8OXykeBMuHyK6hw8rpbqqzH6IDi zoqefUU++ZkdgNlIEP17QcYsVup/wfLvZeUxLOjPmZHSv03aIm 9cZiiYYNwFmE0Z6BnFWhtONJOdBFYUBHGzH4ckzS8Z0fPb1quZ OO6ua9YlV2dDQ== 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 This is going to facilitate DT support by eliminating the need in AUXDATA and avoiding creating complex DT data. This also fits well with DMAC devices, because SoCs with them often have multiple identical DMAC instances and it is perfectly valid to use a single configuration data set for all of them. Signed-off-by: Guennadi Liakhovetski --- A file has to be renamed to preserve the driver module name. drivers/dma/sh/Makefile | 2 ++ drivers/dma/sh/{shdma.c => shdmac.c} | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) rename drivers/dma/sh/{shdma.c => shdmac.c} (98%) diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile index c962138..893ee09 100644 --- a/drivers/dma/sh/Makefile +++ b/drivers/dma/sh/Makefile @@ -1,3 +1,5 @@ obj-$(CONFIG_SH_DMAE_BASE) += shdma-base.o shdma-of.o obj-$(CONFIG_SH_DMAE) += shdma.o +shdma-y := shdmac.o +shdma-objs := $(shdma-y) obj-$(CONFIG_SUDMAC) += sudmac.o diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdmac.c similarity index 98% rename from drivers/dma/sh/shdma.c rename to drivers/dma/sh/shdmac.c index 0e9b719..3c5634e 100644 --- a/drivers/dma/sh/shdma.c +++ b/drivers/dma/sh/shdmac.c @@ -667,7 +667,7 @@ static const struct shdma_ops sh_dmae_shdma_ops = { static int sh_dmae_probe(struct platform_device *pdev) { - struct sh_dmae_pdata *pdata = pdev->dev.platform_data; + struct sh_dmae_pdata *pdata; unsigned long irqflags = IRQF_DISABLED, chan_flag[SH_DMAE_MAX_CHANNELS] = {}; int errirq, chan_irq[SH_DMAE_MAX_CHANNELS]; @@ -676,6 +676,8 @@ 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; + /* get platform data */ if (!pdata || !pdata->channel_num) return -ENODEV; @@ -919,6 +921,12 @@ static const struct of_device_id sh_dmae_of_match[] = { }; MODULE_DEVICE_TABLE(of, sh_dmae_of_match); +const struct platform_device_id sh_dmae_id_table[] = { + {.name = SH_DMAE_DRV_NAME,}, + {} +}; +MODULE_DEVICE_TABLE(platform, sh_dmae_id_table); + static struct platform_driver sh_dmae_driver = { .driver = { .owner = THIS_MODULE, @@ -928,6 +936,7 @@ static struct platform_driver sh_dmae_driver = { }, .remove = sh_dmae_remove, .shutdown = sh_dmae_shutdown, + .id_table = sh_dmae_id_table, }; static int __init sh_dmae_init(void)