Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933073Ab3GVQRY (ORCPT ); Mon, 22 Jul 2013 12:17:24 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:62563 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932999Ab3GVQRP (ORCPT ); Mon, 22 Jul 2013 12:17:15 -0400 Date: Mon, 22 Jul 2013 09:29:40 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Laurent Pinchart cc: linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, Magnus Damm , Simon Horman , Vinod Koul , Sergei Shtylyov Subject: Re: [PATCH v2 05/15] DMA: shdma: pass SoC-specific configuration to the driver via OF matching In-Reply-To: <1625139.lQ0AJJW8Dp@avalon> Message-ID: References: <1374251374-30186-1-git-send-email-g.liakhovetski@gmx.de> <1374251374-30186-6-git-send-email-g.liakhovetski@gmx.de> <1625139.lQ0AJJW8Dp@avalon> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Provags-ID: V02:K0:E6r2nnZsNvUfJyQmFZ5h7kQSsV1CYVx93NdYYomdWk1 IIBmIjsNjGljcMDzFbmdZLwq/xhf+e/dwJdqE/8TtwbiFUI1Cu DvVTh8OWvBwoPJDiYXP3Hwn2ENVJuixYNPdtls52j86naLM0ry 7ivHwYH5dcq/xVxsX8f0Sb71E9Up+RVzkWOYzAv+GazCQhX3zJ VeV1UJ1XjsKysYqEiEnVZNLDpDWh8BEhAIImUvPm535/W0u3Ws jyy20qZyqWzxtNGC1783LjDZNBrQvQFKSDjmNzkU3Bdr4nivY0 Nd9i2n9aVCyDQo1U+vJGl5o+PpTS1C39mFwjQysG+2/9bE0AyI 3TY39GWcGZ3m3aiaWE7SqbmBZ1uPzzOKlDZEGvcy4SexQZeAmM P54+b5iFQvUQw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3534 Lines: 97 On Mon, 22 Jul 2013, Laurent Pinchart wrote: > Hi Guennadi, > > Thanks for the patch. > > On Friday 19 July 2013 18:29:30 Guennadi Liakhovetski wrote: > > 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 > > --- > > > > v2: adjust spacing within array definitions to keep a uniform style. > > > > Documentation/devicetree/bindings/dma/shdma.txt | 7 +++++-- > > drivers/dma/sh/shdmac.c | 22 +++++++++++++------- > > 2 files changed, 20 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 859ddbe..f80543c 100644 > > --- a/drivers/dma/sh/shdmac.c > > +++ b/drivers/dma/sh/shdmac.c > > @@ -20,6 +20,8 @@ > > > > #include > > #include > > +#include > > +#include > > #include > > #include > > #include > > @@ -663,6 +665,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,}, > > Nit-picking here, OF device ID entries are usually ordered from most specific > to most generic compatible strings. It's up to you. Yeah, in fact, I'm not even sure we need the generic line, so far I think we always need SoC configuration. Maybe I shall just remove it. Could do in an incremental patch. > > + {} > > +}; > > +MODULE_DEVICE_TABLE(of, sh_dmae_of_match); > > Shouldn't you guard the table with #ifdef CONFIG_OF ? If the driver can only > be used on ARM platforms it might not be worth it, but if it can be used on SH > as well that would make sense. Well, it is a pretty common practice, I admit, but what exactly does it bring us apart from saving a couple of bytes? I just tried a SuperH build - no problem. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/