Patchwork [1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma

login
register
mail settings
Submitter Richard Zhao
Date Jan. 5, 2012, 3:11 a.m.
Message ID <1325733074-10749-1-git-send-email-richard.zhao@linaro.org>
Download mbox | patch
Permalink /patch/134408/
State New
Headers show

Comments

Richard Zhao - Jan. 5, 2012, 3:11 a.m.
sdma device names var when use device tree. So we just check
whether it includes "sdma" substring.

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
 arch/arm/plat-mxc/include/mach/dma.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
Shawn Guo - Jan. 5, 2012, 9:42 a.m.
The arm-soc maintainers are requiring patch subject be like

ARM: <platform>: ...

In this case, it's "ARM: mxc: ..."

On Thu, Jan 05, 2012 at 11:11:13AM +0800, Richard Zhao wrote:
> sdma device names var when use device tree.

I think this needs some level rewording.  For given SoC, the name is
fixed, and the name may vary from SoC to SoC, whether or not it's
device tree case.

Other than that, it looks good to me.

Regards,
Shawn

> So we just check
> whether it includes "sdma" substring.
> 
> Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
> ---
>  arch/arm/plat-mxc/include/mach/dma.h |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/arch/arm/plat-mxc/include/mach/dma.h
> index 233d0a5..1b90803 100644
> --- a/arch/arm/plat-mxc/include/mach/dma.h
> +++ b/arch/arm/plat-mxc/include/mach/dma.h
> @@ -60,8 +60,7 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan)
>  
>  static inline int imx_dma_is_general_purpose(struct dma_chan *chan)
>  {
> -	return !strcmp(dev_name(chan->device->dev), "imx31-sdma") ||
> -		!strcmp(dev_name(chan->device->dev), "imx35-sdma") ||
> +	return strstr(dev_name(chan->device->dev), "sdma") ||
>  		!strcmp(dev_name(chan->device->dev), "imx-dma");
>  }
>  
> -- 
> 1.7.5.4
> 
>
Richard Zhao - Jan. 5, 2012, 2:31 p.m.
On Thu, Jan 05, 2012 at 05:42:38PM +0800, Shawn Guo wrote:
> The arm-soc maintainers are requiring patch subject be like
> 
> ARM: <platform>: ...
> 
> In this case, it's "ARM: mxc: ..."
ok
> 
> On Thu, Jan 05, 2012 at 11:11:13AM +0800, Richard Zhao wrote:
> > sdma device names var when use device tree.
> 
> I think this needs some level rewording.  For given SoC, the name is
> fixed, and the name may vary from SoC to SoC, whether or not it's
> device tree case.
Checking substring "sdma" cover the both cases, if we make the rule
that sdma node name must be "sdma@xxxxx". Maybe we can also check
compatible?
> 
> Other than that, it looks good to me.
Thanks

Richard
> 
> Regards,
> Shawn
> 
> > So we just check
> > whether it includes "sdma" substring.
> > 
> > Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
> > ---
> >  arch/arm/plat-mxc/include/mach/dma.h |    3 +--
> >  1 files changed, 1 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/arch/arm/plat-mxc/include/mach/dma.h
> > index 233d0a5..1b90803 100644
> > --- a/arch/arm/plat-mxc/include/mach/dma.h
> > +++ b/arch/arm/plat-mxc/include/mach/dma.h
> > @@ -60,8 +60,7 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan)
> >  
> >  static inline int imx_dma_is_general_purpose(struct dma_chan *chan)
> >  {
> > -	return !strcmp(dev_name(chan->device->dev), "imx31-sdma") ||
> > -		!strcmp(dev_name(chan->device->dev), "imx35-sdma") ||
> > +	return strstr(dev_name(chan->device->dev), "sdma") ||
> >  		!strcmp(dev_name(chan->device->dev), "imx-dma");
> >  }
> >  
> > -- 
> > 1.7.5.4
> > 
> > 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

Patch

diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/arch/arm/plat-mxc/include/mach/dma.h
index 233d0a5..1b90803 100644
--- a/arch/arm/plat-mxc/include/mach/dma.h
+++ b/arch/arm/plat-mxc/include/mach/dma.h
@@ -60,8 +60,7 @@  static inline int imx_dma_is_ipu(struct dma_chan *chan)
 
 static inline int imx_dma_is_general_purpose(struct dma_chan *chan)
 {
-	return !strcmp(dev_name(chan->device->dev), "imx31-sdma") ||
-		!strcmp(dev_name(chan->device->dev), "imx35-sdma") ||
+	return strstr(dev_name(chan->device->dev), "sdma") ||
 		!strcmp(dev_name(chan->device->dev), "imx-dma");
 }