lkml.org 
[lkml]   [2012]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 1/2] mxs-dma : move the mxs dma.h to a more common place
    Date
    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%)

    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 e023bcc..1c7fdbb 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 dccfb37..ada6344 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>
    --
    1.7.3.2



    \
     
     \ /
      Last update: 2012-01-20 08:35    [W:0.044 / U:29.396 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site