Re: [PATCH v4 01/14] ARM: davinci: move private EDMA API to arm/common
On Fri, Jan 11, 2013 at 06:15:06AM +, Hebbar, Gururaja wrote:
> On Fri, Jan 11, 2013 at 11:18:37, Porter, Matt wrote:
> > Move mach-davinci/dma.c to common/edma.c so it can be used
> > by OMAP (specifically AM33xx) as well. This just moves the
> > private EDMA API and enables it to build on OMAP.
> >
> > Signed-off-by: Matt Porter
> > ---
> > arch/arm/Kconfig |1 +
> > arch/arm/common/Kconfig|3 +
> > arch/arm/common/Makefile |1 +
> > arch/arm/{mach-davinci/dma.c => common/edma.c} |2 +-
> > arch/arm/mach-davinci/Makefile |2 +-
> > arch/arm/mach-davinci/board-tnetv107x-evm.c|2 +-
> > arch/arm/mach-davinci/davinci.h|2 +-
> > arch/arm/mach-davinci/devices-tnetv107x.c |2 +-
> > arch/arm/mach-davinci/devices.c|7 +-
> > arch/arm/mach-davinci/dm355.c |2 +-
> > arch/arm/mach-davinci/dm365.c |2 +-
> > arch/arm/mach-davinci/dm644x.c |2 +-
> > arch/arm/mach-davinci/dm646x.c |2 +-
> > arch/arm/mach-davinci/include/mach/da8xx.h |2 +-
> > arch/arm/mach-davinci/include/mach/edma.h | 267
> >
> > arch/arm/plat-omap/Kconfig |1 +
> > drivers/dma/edma.c |2 +-
> > drivers/mmc/host/davinci_mmc.c |1 +
> > include/linux/mfd/davinci_voicecodec.h |3 +-
> > include/linux/platform_data/edma.h | 182
>
> Headers file are just moved here. So "git mv file1 flie2; and the git
> format-patch -C" on commit should just generate few lines of patch.
Ok, good catch.
>
> > include/linux/platform_data/spi-davinci.h |2 +-
> > sound/soc/davinci/davinci-evm.c|1 +
> > sound/soc/davinci/davinci-pcm.c|1 +
> > sound/soc/davinci/davinci-pcm.h|2 +-
> > sound/soc/davinci/davinci-sffsdr.c |6 +-
> > 25 files changed, 212 insertions(+), 288 deletions(-)
> > rename arch/arm/{mach-davinci/dma.c => common/edma.c} (99%)
> > delete mode 100644 arch/arm/mach-davinci/include/mach/edma.h
> > create mode 100644 include/linux/platform_data/edma.h
> >
> > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > index 67874b8..7637d31 100644
> > --- a/arch/arm/Kconfig
> > +++ b/arch/arm/Kconfig
> > @@ -932,6 +932,7 @@ config ARCH_DAVINCI
> > select GENERIC_IRQ_CHIP
> > select HAVE_IDE
> > select NEED_MACH_GPIO_H
> > + select TI_PRIV_EDMA
> > select USE_OF
> > select ZONE_DMA
> > help
> > diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
> > index 45ceeb0..9e32d0d 100644
> > --- a/arch/arm/common/Kconfig
> > +++ b/arch/arm/common/Kconfig
> > @@ -40,3 +40,6 @@ config SHARP_PARAM
> >
> > config SHARP_SCOOP
> > bool
> > +
> > +config TI_PRIV_EDMA
> > + bool
> > diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
> > index e8a4e58..d09a39b 100644
> > --- a/arch/arm/common/Makefile
> > +++ b/arch/arm/common/Makefile
> > @@ -13,3 +13,4 @@ obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o
> > obj-$(CONFIG_SHARP_SCOOP) += scoop.o
> > obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o
> > obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
> > +obj-$(CONFIG_TI_PRIV_EDMA) += edma.o
> > diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/common/edma.c
> > similarity index 99%
> > rename from arch/arm/mach-davinci/dma.c
> > rename to arch/arm/common/edma.c
> > index a685e97..4411087 100644
> > --- a/arch/arm/mach-davinci/dma.c
> > +++ b/arch/arm/common/edma.c
> > @@ -25,7 +25,7 @@
> > #include
> > #include
> >
> > -#include
> > +#include
> >
> > /* Offsets matching "struct edmacc_param" */
> > #define PARM_OPT 0x00
> > diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile
> > index fb5c1aa..493a36b 100644
> > --- a/arch/arm/mach-davinci/Makefile
> > +++ b/arch/arm/mach-davinci/Makefile
> > @@ -5,7 +5,7 @@
> >
> > # Common objects
> > obj-y := time.o clock.o serial.o psc.o \
> > - dma.o usb.o common.o sram.o aemif.o
> > + usb.o common.o sram.o aemif.o
> >
> > obj-$(CONFIG_DAVINCI_MUX) += mux.o
> >
> > diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c
> > b/arch/arm/mach-davinci/board-tnetv107x-evm.c
> > index be30997..86f55ba 100644
> > --- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
> > +++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
> > @@ -26,12 +26,12 @@
> > #include
> > #include
> > #include
> > +#include
> >
> > #include
> > #include
> >
> > #include
> > -#include
> > #include
> > #include
> > #include
> > diff --git a/arch/arm/mach-davinci/davinci.h
> > b/arch/arm/mach-davinci/davinci.h
> > index 12d544b..d26a6bc 100644
> > --- a/arch/arm/mach-davinc
RE: [PATCH v4 01/14] ARM: davinci: move private EDMA API to arm/common
On Fri, Jan 11, 2013 at 11:18:37, Porter, Matt wrote:
> Move mach-davinci/dma.c to common/edma.c so it can be used
> by OMAP (specifically AM33xx) as well. This just moves the
> private EDMA API and enables it to build on OMAP.
>
> Signed-off-by: Matt Porter
> ---
> arch/arm/Kconfig |1 +
> arch/arm/common/Kconfig|3 +
> arch/arm/common/Makefile |1 +
> arch/arm/{mach-davinci/dma.c => common/edma.c} |2 +-
> arch/arm/mach-davinci/Makefile |2 +-
> arch/arm/mach-davinci/board-tnetv107x-evm.c|2 +-
> arch/arm/mach-davinci/davinci.h|2 +-
> arch/arm/mach-davinci/devices-tnetv107x.c |2 +-
> arch/arm/mach-davinci/devices.c|7 +-
> arch/arm/mach-davinci/dm355.c |2 +-
> arch/arm/mach-davinci/dm365.c |2 +-
> arch/arm/mach-davinci/dm644x.c |2 +-
> arch/arm/mach-davinci/dm646x.c |2 +-
> arch/arm/mach-davinci/include/mach/da8xx.h |2 +-
> arch/arm/mach-davinci/include/mach/edma.h | 267
>
> arch/arm/plat-omap/Kconfig |1 +
> drivers/dma/edma.c |2 +-
> drivers/mmc/host/davinci_mmc.c |1 +
> include/linux/mfd/davinci_voicecodec.h |3 +-
> include/linux/platform_data/edma.h | 182
Headers file are just moved here. So "git mv file1 flie2; and the git
format-patch -C" on commit should just generate few lines of patch.
> include/linux/platform_data/spi-davinci.h |2 +-
> sound/soc/davinci/davinci-evm.c|1 +
> sound/soc/davinci/davinci-pcm.c|1 +
> sound/soc/davinci/davinci-pcm.h|2 +-
> sound/soc/davinci/davinci-sffsdr.c |6 +-
> 25 files changed, 212 insertions(+), 288 deletions(-)
> rename arch/arm/{mach-davinci/dma.c => common/edma.c} (99%)
> delete mode 100644 arch/arm/mach-davinci/include/mach/edma.h
> create mode 100644 include/linux/platform_data/edma.h
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 67874b8..7637d31 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -932,6 +932,7 @@ config ARCH_DAVINCI
> select GENERIC_IRQ_CHIP
> select HAVE_IDE
> select NEED_MACH_GPIO_H
> + select TI_PRIV_EDMA
> select USE_OF
> select ZONE_DMA
> help
> diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
> index 45ceeb0..9e32d0d 100644
> --- a/arch/arm/common/Kconfig
> +++ b/arch/arm/common/Kconfig
> @@ -40,3 +40,6 @@ config SHARP_PARAM
>
> config SHARP_SCOOP
> bool
> +
> +config TI_PRIV_EDMA
> + bool
> diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
> index e8a4e58..d09a39b 100644
> --- a/arch/arm/common/Makefile
> +++ b/arch/arm/common/Makefile
> @@ -13,3 +13,4 @@ obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o
> obj-$(CONFIG_SHARP_SCOOP)+= scoop.o
> obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o
> obj-$(CONFIG_ARM_TIMER_SP804)+= timer-sp.o
> +obj-$(CONFIG_TI_PRIV_EDMA) += edma.o
> diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/common/edma.c
> similarity index 99%
> rename from arch/arm/mach-davinci/dma.c
> rename to arch/arm/common/edma.c
> index a685e97..4411087 100644
> --- a/arch/arm/mach-davinci/dma.c
> +++ b/arch/arm/common/edma.c
> @@ -25,7 +25,7 @@
> #include
> #include
>
> -#include
> +#include
>
> /* Offsets matching "struct edmacc_param" */
> #define PARM_OPT 0x00
> diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile
> index fb5c1aa..493a36b 100644
> --- a/arch/arm/mach-davinci/Makefile
> +++ b/arch/arm/mach-davinci/Makefile
> @@ -5,7 +5,7 @@
>
> # Common objects
> obj-y:= time.o clock.o serial.o psc.o \
> -dma.o usb.o common.o sram.o aemif.o
> +usb.o common.o sram.o aemif.o
>
> obj-$(CONFIG_DAVINCI_MUX)+= mux.o
>
> diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c
> b/arch/arm/mach-davinci/board-tnetv107x-evm.c
> index be30997..86f55ba 100644
> --- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
> +++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
> @@ -26,12 +26,12 @@
> #include
> #include
> #include
> +#include
>
> #include
> #include
>
> #include
> -#include
> #include
> #include
> #include
> diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
> index 12d544b..d26a6bc 100644
> --- a/arch/arm/mach-davinci/davinci.h
> +++ b/arch/arm/mach-davinci/davinci.h
> @@ -23,9 +23,9 @@
> #include
> #include
> #include
> +#include
> #include
> #include
> -#include
>
> #include
> #include
> diff --git a/arch/arm/mach-davinci/devices-tnetv107x.c
> b/arch/arm/mach-davinci/devices-tnetv107x.c
> inde
