| Message ID | 1326953767-24155-2-git-send-email-b32955@freescale.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jan 19, 2012 at 02:15:58PM +0800, Huang Shijie wrote: > Move the header to a more common place. > The 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 > > Signed-off-by: Huang Shijie <b32955@freescale.com> > --- > arch/arm/mach-mxs/include/mach/dma.h | 28 ---------------------------- > include/linux/mxs-dma.h | 28 ++++++++++++++++++++++++++++ > 2 files changed, 28 insertions(+), 28 deletions(-) > delete mode 100644 arch/arm/mach-mxs/include/mach/dma.h > create mode 100644 include/linux/mxs-dma.h Please use -M with git format-patch, so we can better see that it is a pure rename. I'd also suggest to squash patches up to 05/10 into this one, (collecting all the proper acks from maintainers) since the changes are trivial and it will reduce dependencies and temporary build-failures. Regards, Wolfram
On Thu, Jan 19, 2012 at 09:58:56AM +0100, Wolfram Sang wrote:
> (collecting all the proper acks from maintainers) since the changes are
Which is much more likely if you send them the patches.
On Thu, Jan 19, 2012 at 02:15:58PM +0800, Huang Shijie wrote: > Move the header to a more common place. > The 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 > > Signed-off-by: Huang Shijie <b32955@freescale.com> > --- > arch/arm/mach-mxs/include/mach/dma.h | 28 ---------------------------- > include/linux/mxs-dma.h | 28 ++++++++++++++++++++++++++++ > 2 files changed, 28 insertions(+), 28 deletions(-) > delete mode 100644 arch/arm/mach-mxs/include/mach/dma.h > create mode 100644 include/linux/mxs-dma.h > I'm wondering if it would be better to create folder include/linux/fsl for mxs-dma.h accommodation, so that any headers that need to shared between mxs and imx later can find a place. Considering that Freescale has many IPs shared between MPCxxx (PowerPC) and i.MX (ARM) families, it could also be a good place for any headers that need to be shared between these two product lines from Freescale.
diff --git a/arch/arm/mach-mxs/include/mach/dma.h b/arch/arm/mach-mxs/include/mach/dma.h deleted file mode 100644 index 203d7c4..0000000 --- a/arch/arm/mach-mxs/include/mach/dma.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef __MACH_MXS_DMA_H__ -#define __MACH_MXS_DMA_H__ - -#include <linux/dmaengine.h> - -struct mxs_dma_data { - int chan_irq; -}; - -static inline int mxs_dma_is_apbh(struct dma_chan *chan) -{ - return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbh"); -} - -static inline int mxs_dma_is_apbx(struct dma_chan *chan) -{ - return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbx"); -} - -#endif /* __MACH_MXS_DMA_H__ */ diff --git a/include/linux/mxs-dma.h b/include/linux/mxs-dma.h new file mode 100644 index 0000000..203d7c4 --- /dev/null +++ b/include/linux/mxs-dma.h @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __MACH_MXS_DMA_H__ +#define __MACH_MXS_DMA_H__ + +#include <linux/dmaengine.h> + +struct mxs_dma_data { + int chan_irq; +}; + +static inline int mxs_dma_is_apbh(struct dma_chan *chan) +{ + return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbh"); +} + +static inline int mxs_dma_is_apbx(struct dma_chan *chan) +{ + return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbx"); +} + +#endif /* __MACH_MXS_DMA_H__ */
Move the header to a more common place. The 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 Signed-off-by: Huang Shijie <b32955@freescale.com> --- arch/arm/mach-mxs/include/mach/dma.h | 28 ---------------------------- include/linux/mxs-dma.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 arch/arm/mach-mxs/include/mach/dma.h create mode 100644 include/linux/mxs-dma.h