Patchwork [v3,1/2] mxs-dma : move the mxs dma.h to a more common place

login
register
mail settings
Submitter Huang Shijie
Date Feb. 7, 2012, 10:54 a.m.
Message ID <1328612075-5825-2-git-send-email-b32955@freescale.com>
Download mbox | patch
Permalink /patch/139899/
State New
Headers show

Comments

Huang Shijie - Feb. 7, 2012, 10:54 a.m.
Move the header to a more common place.
The mxs dma engine is not only used in mx23/mx28, but also used
in mx50/mx6q.  It will also be used in the future chips.

Rename it to mxs-dma.h

change mxs-dma driver, mxs-mmc driver, gpmi-nand driver, mxs-saif driver
to the new header file.

Signed-off-by: Huang Shijie <b32955@freescale.com>
---
 drivers/dma/mxs-dma.c                              |    2 +-
 drivers/mmc/host/mxs-mmc.c                         |    2 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |    2 +-
 .../include/mach/dma.h => include/linux/mxs-dma.h  |    0
 sound/soc/mxs/mxs-pcm.c                            |    2 +-
 sound/soc/mxs/mxs-pcm.h                            |    2 +-
 sound/soc/mxs/mxs-saif.c                           |    2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename arch/arm/mach-mxs/include/mach/dma.h => include/linux/mxs-dma.h (100%)
Shawn Guo - Feb. 10, 2012, 4:21 p.m.
On Tue, Feb 07, 2012 at 06:54:34PM +0800, Huang Shijie wrote:
> Move the header to a more common place.
> The mxs dma engine is not only used in mx23/mx28, but also used
> in mx50/mx6q.  It will also be used in the future chips.
> 
> Rename it to mxs-dma.h
> 
> change mxs-dma driver, mxs-mmc driver, gpmi-nand driver, mxs-saif driver
> to the new header file.
> 
> Signed-off-by: Huang Shijie <b32955@freescale.com>
> ---
>  drivers/dma/mxs-dma.c                              |    2 +-
>  drivers/mmc/host/mxs-mmc.c                         |    2 +-
>  drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |    2 +-
>  .../include/mach/dma.h => include/linux/mxs-dma.h  |    0
>  sound/soc/mxs/mxs-pcm.c                            |    2 +-
>  sound/soc/mxs/mxs-pcm.h                            |    2 +-
>  sound/soc/mxs/mxs-saif.c                           |    2 +-
>  7 files changed, 6 insertions(+), 6 deletions(-)
>  rename arch/arm/mach-mxs/include/mach/dma.h => include/linux/mxs-dma.h (100%)

I suggested you rename it include/linux/fsl/mxs-dma.h [1].  It seems
you are ignoring the comment.  Can you explain why it's not a
reasonable suggestion?

And Wolfram and Mark told you that you need to Cc subsystem maintainers
to collect their acks [2].  But you are still not Ccing Mark Brown and
Chris Ball for sound/soc/ and drivers/mmc changes.  So you are not
listening.

Regards,
Shawn

[1] http://article.gmane.org/gmane.linux.kernel.mmc/12301
[2] http://article.gmane.org/gmane.linux.alsa.devel/93751
Huang Shijie - Feb. 10, 2012, 11:36 p.m.
hi,

On Sat, Feb 11, 2012 at 12:21 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Tue, Feb 07, 2012 at 06:54:34PM +0800, Huang Shijie wrote:
>> Move the header to a more common place.
>> The mxs dma engine is not only used in mx23/mx28, but also used
>> in mx50/mx6q.  It will also be used in the future chips.
>>
>> Rename it to mxs-dma.h
>>
>> change mxs-dma driver, mxs-mmc driver, gpmi-nand driver, mxs-saif driver
>> to the new header file.
>>
>> Signed-off-by: Huang Shijie <b32955@freescale.com>
>> ---
>>  drivers/dma/mxs-dma.c                              |    2 +-
>>  drivers/mmc/host/mxs-mmc.c                         |    2 +-
>>  drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |    2 +-
>>  .../include/mach/dma.h => include/linux/mxs-dma.h  |    0
>>  sound/soc/mxs/mxs-pcm.c                            |    2 +-
>>  sound/soc/mxs/mxs-pcm.h                            |    2 +-
>>  sound/soc/mxs/mxs-saif.c                           |    2 +-
>>  7 files changed, 6 insertions(+), 6 deletions(-)
>>  rename arch/arm/mach-mxs/include/mach/dma.h => include/linux/mxs-dma.h (100%)
>
> I suggested you rename it include/linux/fsl/mxs-dma.h [1].  It seems
> you are ignoring the comment.  Can you explain why it's not a
> reasonable suggestion?

For gpmi-nand.h is placed in include/linux/mtd/ directory, so i think
it's better to place the mxs-dma.h
to similar include/linux/dma/ directory, but the directory does not exit.

If i place it at include/linux/fsl/mxs-dma.h , i have to create a new
folder, I am not sure i have the right
to do so. But i can try it in the next version.

thanks a lot.



>
> And Wolfram and Mark told you that you need to Cc subsystem maintainers
> to collect their acks [2].  But you are still not Ccing Mark Brown and
> Chris Ball for sound/soc/ and drivers/mmc changes.  So you are not
> listening.

ok, i will CC them in next version.  I really did not know to whom I should cc .

BR
Huang Shijie

>
> Regards,
> Shawn
>
> [1] http://article.gmane.org/gmane.linux.kernel.mmc/12301
> [2] http://article.gmane.org/gmane.linux.alsa.devel/93751
Shawn Guo - Feb. 11, 2012, 7:39 a.m.
On Sat, Feb 11, 2012 at 07:36:50AM +0800, Huang Shijie wrote:
> hi,
> 
> On Sat, Feb 11, 2012 at 12:21 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> > On Tue, Feb 07, 2012 at 06:54:34PM +0800, Huang Shijie wrote:
> >> Move the header to a more common place.
> >> The mxs dma engine is not only used in mx23/mx28, but also used
> >> in mx50/mx6q.  It will also be used in the future chips.
> >>
> >> Rename it to mxs-dma.h
> >>
> >> change mxs-dma driver, mxs-mmc driver, gpmi-nand driver, mxs-saif driver
> >> to the new header file.
> >>
> >> Signed-off-by: Huang Shijie <b32955@freescale.com>
> >> ---
> >>  drivers/dma/mxs-dma.c                              |    2 +-
> >>  drivers/mmc/host/mxs-mmc.c                         |    2 +-
> >>  drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |    2 +-
> >>  .../include/mach/dma.h => include/linux/mxs-dma.h  |    0
> >>  sound/soc/mxs/mxs-pcm.c                            |    2 +-
> >>  sound/soc/mxs/mxs-pcm.h                            |    2 +-
> >>  sound/soc/mxs/mxs-saif.c                           |    2 +-
> >>  7 files changed, 6 insertions(+), 6 deletions(-)
> >>  rename arch/arm/mach-mxs/include/mach/dma.h => include/linux/mxs-dma.h (100%)
> >
> > I suggested you rename it include/linux/fsl/mxs-dma.h [1].  It seems
> > you are ignoring the comment.  Can you explain why it's not a
> > reasonable suggestion?
> 
> For gpmi-nand.h is placed in include/linux/mtd/ directory, so i think
> it's better to place the mxs-dma.h
> to similar include/linux/dma/ directory, but the directory does not exit.
> 
Yes, from subsystem point of view, it makes sense too.

> If i place it at include/linux/fsl/mxs-dma.h , i have to create a new
> folder, I am not sure i have the right
> to do so. But i can try it in the next version.
> 
So either way works for me.  But you need to create a folder anyway.
So let's do it to test people.

> thanks a lot.
> 
> 
> 
> >
> > And Wolfram and Mark told you that you need to Cc subsystem maintainers
> > to collect their acks [2].  But you are still not Ccing Mark Brown and
> > Chris Ball for sound/soc/ and drivers/mmc changes.  So you are not
> > listening.
> 
> ok, i will CC them in next version.  I really did not know to whom I should cc .
> 
The file MAINTAINERS is created for this purpose.

Patch

diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index b06cd4c..c80fbed 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -22,10 +22,10 @@ 
 #include <linux/platform_device.h>
 #include <linux/dmaengine.h>
 #include <linux/delay.h>
+#include <linux/mxs-dma.h>
 
 #include <asm/irq.h>
 #include <mach/mxs.h>
-#include <mach/dma.h>
 #include <mach/common.h>
 
 /*
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 382c835..1e18970 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -38,10 +38,10 @@ 
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
+#include <linux/mxs-dma.h>
 
 #include <mach/mxs.h>
 #include <mach/common.h>
-#include <mach/dma.h>
 #include <mach/mmc.h>
 
 #define DRIVER_NAME	"mxs-mmc"
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
index c93b0ae..a302dd1 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
@@ -20,7 +20,7 @@ 
 #include <linux/mtd/nand.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
-#include <mach/dma.h>
+#include <linux/mxs-dma.h>
 
 struct resources {
 	void          *gpmi_regs;
diff --git a/arch/arm/mach-mxs/include/mach/dma.h b/include/linux/mxs-dma.h
similarity index 100%
rename from arch/arm/mach-mxs/include/mach/dma.h
rename to include/linux/mxs-dma.h
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c
index 105f42a..7eb186f 100644
--- a/sound/soc/mxs/mxs-pcm.c
+++ b/sound/soc/mxs/mxs-pcm.c
@@ -28,6 +28,7 @@ 
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/dmaengine.h>
+#include <linux/mxs-dma.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -35,7 +36,6 @@ 
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <mach/dma.h>
 #include "mxs-pcm.h"
 
 static struct snd_pcm_hardware snd_mxs_hardware = {
diff --git a/sound/soc/mxs/mxs-pcm.h b/sound/soc/mxs/mxs-pcm.h
index f55ac4f..3ac9956 100644
--- a/sound/soc/mxs/mxs-pcm.h
+++ b/sound/soc/mxs/mxs-pcm.h
@@ -19,7 +19,7 @@ 
 #ifndef _MXS_PCM_H
 #define _MXS_PCM_H
 
-#include <mach/dma.h>
+#include <linux/mxs-dma.h>
 
 struct mxs_pcm_dma_params {
 	int chan_irq;
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index f204dba..af78446 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -24,12 +24,12 @@ 
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/time.h>
+#include <linux/mxs-dma.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/saif.h>
-#include <mach/dma.h>
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/mxs.h>