Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39468604 authored by Huang Shijie's avatar Huang Shijie Committed by David Woodhouse
Browse files

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: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarHuang Shijie <b32955@freescale.com>
Acked-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
Acked-by: default avatarChris Ball <cjb@laptop.org>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 273a65ad

drivers/dma/mxs-dma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,10 +22,10 @@ 
#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/dmaengine.h>

#include <linux/dmaengine.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/fsl/mxs-dma.h>





#include <asm/irq.h>

#include <asm/irq.h>

#include <mach/mxs.h>

#include <mach/mxs.h>

#include <mach/dma.h>

#include <mach/common.h>

#include <mach/common.h>





/*

/*

drivers/mmc/host/mxs-mmc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,10 +38,10 @@ 
#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/fsl/mxs-dma.h>





#include <mach/mxs.h>

#include <mach/mxs.h>

#include <mach/common.h>

#include <mach/common.h>

#include <mach/dma.h>

#include <mach/mmc.h>

#include <mach/mmc.h>





#define DRIVER_NAME	"mxs-mmc"

#define DRIVER_NAME	"mxs-mmc"

drivers/mtd/nand/gpmi-nand/gpmi-nand.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/mtd/nand.h>

#include <linux/mtd/nand.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <mach/dma.h>

#include <linux/fsl/mxs-dma.h>





struct resources {

struct resources {

	void          *gpmi_regs;

	void          *gpmi_regs;

sound/soc/mxs/mxs-pcm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/dmaengine.h>

#include <linux/dmaengine.h>

#include <linux/fsl/mxs-dma.h>





#include <sound/core.h>

#include <sound/core.h>

#include <sound/initval.h>

#include <sound/initval.h>
@@ -35,7 +36,6 @@ 
#include <sound/pcm_params.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <sound/soc.h>





#include <mach/dma.h>

#include "mxs-pcm.h"

#include "mxs-pcm.h"





static struct snd_pcm_hardware snd_mxs_hardware = {

static struct snd_pcm_hardware snd_mxs_hardware = {