Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3946860409130038ef6e0e5c50f2203053eae2b7

Authored by Huang Shijie
Committed by David Woodhouse
1 parent 273a65ad32
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

mxs-dma : move the mxs dma.h to a more common place 

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, and create a new folder include/linux/fsl/ to
store the Freescale's header files.

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

Acked-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Huang Shijie <b32955@freescale.com>
Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
Acked-by: Chris Ball <cjb@laptop.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Showing 8 changed files with 34 additions and 34 deletions Side-by-side Diff

arch/arm/mach-mxs/include/mach/dma.h
View file @ 3946860
1   -/*
2   - * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
3   - *
4   - * This program is free software; you can redistribute it and/or modify
5   - * it under the terms of the GNU General Public License version 2 as
6   - * published by the Free Software Foundation.
7   - */
8   -
9   -#ifndef __MACH_MXS_DMA_H__
10   -#define __MACH_MXS_DMA_H__
11   -
12   -#include <linux/dmaengine.h>
13   -
14   -struct mxs_dma_data {
15   - int chan_irq;
16   -};
17   -
18   -static inline int mxs_dma_is_apbh(struct dma_chan *chan)
19   -{
20   - return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbh");
21   -}
22   -
23   -static inline int mxs_dma_is_apbx(struct dma_chan *chan)
24   -{
25   - return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbx");
26   -}
27   -
28   -#endif /* __MACH_MXS_DMA_H__ */
drivers/dma/mxs-dma.c
Diff comments   View file @ 3946860
... ... @@ -22,10 +22,10 @@
22 22 #include <linux/platform_device.h>
23 23 #include <linux/dmaengine.h>
24 24 #include <linux/delay.h>
  25 +#include <linux/fsl/mxs-dma.h>
25 26  
26 27 #include <asm/irq.h>
27 28 #include <mach/mxs.h>
28   -#include <mach/dma.h>
29 29 #include <mach/common.h>
30 30  
31 31 /*
drivers/mmc/host/mxs-mmc.c
Diff comments   View file @ 3946860
... ... @@ -38,10 +38,10 @@
38 38 #include <linux/gpio.h>
39 39 #include <linux/regulator/consumer.h>
40 40 #include <linux/module.h>
  41 +#include <linux/fsl/mxs-dma.h>
41 42  
42 43 #include <mach/mxs.h>
43 44 #include <mach/common.h>
44   -#include <mach/dma.h>
45 45 #include <mach/mmc.h>
46 46  
47 47 #define DRIVER_NAME "mxs-mmc"
drivers/mtd/nand/gpmi-nand/gpmi-nand.h
Diff comments   View file @ 3946860
... ... @@ -20,7 +20,7 @@
20 20 #include <linux/mtd/nand.h>
21 21 #include <linux/platform_device.h>
22 22 #include <linux/dma-mapping.h>
23   -#include <mach/dma.h>
  23 +#include <linux/fsl/mxs-dma.h>
24 24  
25 25 struct resources {
26 26 void *gpmi_regs;
include/linux/fsl/mxs-dma.h
Diff comments   View file @ 3946860
  1 +/*
  2 + * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
  3 + *
  4 + * This program is free software; you can redistribute it and/or modify
  5 + * it under the terms of the GNU General Public License version 2 as
  6 + * published by the Free Software Foundation.
  7 + */
  8 +
  9 +#ifndef __MACH_MXS_DMA_H__
  10 +#define __MACH_MXS_DMA_H__
  11 +
  12 +#include <linux/dmaengine.h>
  13 +
  14 +struct mxs_dma_data {
  15 + int chan_irq;
  16 +};
  17 +
  18 +static inline int mxs_dma_is_apbh(struct dma_chan *chan)
  19 +{
  20 + return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbh");
  21 +}
  22 +
  23 +static inline int mxs_dma_is_apbx(struct dma_chan *chan)
  24 +{
  25 + return !strcmp(dev_name(chan->device->dev), "mxs-dma-apbx");
  26 +}
  27 +
  28 +#endif /* __MACH_MXS_DMA_H__ */
sound/soc/mxs/mxs-pcm.c
Diff comments   View file @ 3946860
... ... @@ -28,6 +28,7 @@
28 28 #include <linux/platform_device.h>
29 29 #include <linux/slab.h>
30 30 #include <linux/dmaengine.h>
  31 +#include <linux/fsl/mxs-dma.h>
31 32  
32 33 #include <sound/core.h>
33 34 #include <sound/initval.h>
... ... @@ -35,7 +36,6 @@
35 36 #include <sound/pcm_params.h>
36 37 #include <sound/soc.h>
37 38  
38   -#include <mach/dma.h>
39 39 #include "mxs-pcm.h"
40 40  
41 41 static struct snd_pcm_hardware snd_mxs_hardware = {
sound/soc/mxs/mxs-pcm.h
Diff comments   View file @ 3946860
... ... @@ -19,7 +19,7 @@
19 19 #ifndef _MXS_PCM_H
20 20 #define _MXS_PCM_H
21 21  
22   -#include <mach/dma.h>
  22 +#include <linux/fsl/mxs-dma.h>
23 23  
24 24 struct mxs_pcm_dma_params {
25 25 int chan_irq;
sound/soc/mxs/mxs-saif.c
Diff comments   View file @ 3946860
... ... @@ -24,12 +24,12 @@
24 24 #include <linux/clk.h>
25 25 #include <linux/delay.h>
26 26 #include <linux/time.h>
  27 +#include <linux/fsl/mxs-dma.h>
27 28 #include <sound/core.h>
28 29 #include <sound/pcm.h>
29 30 #include <sound/pcm_params.h>
30 31 #include <sound/soc.h>
31 32 #include <sound/saif.h>
32   -#include <mach/dma.h>
33 33 #include <asm/mach-types.h>
34 34 #include <mach/hardware.h>
35 35 #include <mach/mxs.h>