diff options
| author | Stefan Roese <sr@denx.de> | 2013-04-09 21:06:07 +0000 | 
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-04-22 10:22:22 +0200 | 
| commit | 0499218dbcc30532bcc1b7b2ee44b8876675bced (patch) | |
| tree | 0c20b24f785e2015eeb166cee12395a309103af9 /drivers | |
| parent | 57ca432fb9f59cea48d8cde1dc1d5cc2f80993c7 (diff) | |
| download | olio-uboot-2014.01-0499218dbcc30532bcc1b7b2ee44b8876675bced.tar.xz olio-uboot-2014.01-0499218dbcc30532bcc1b7b2ee44b8876675bced.zip | |
imx: Move some header files from arch-mxs to imx-common
The following headers are moved to a i.MX common location:
- regs-common.h
- regs-apbh.h
- regs-bch.h
- regs-gpmi.h
- dma.h
This way this header can be re-used also by other i.MX platforms.
For example the i.MX6 which will need it for the upcoming NAND
support.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/apbh_dma.c | 3 | ||||
| -rw-r--r-- | drivers/mmc/mxsmmc.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/mxs_nand.c | 4 | ||||
| -rw-r--r-- | drivers/spi/mxs_spi.c | 2 | 
4 files changed, 7 insertions, 4 deletions
| diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c index 0c1cd831e..eb46bcfcb 100644 --- a/drivers/dma/apbh_dma.c +++ b/drivers/dma/apbh_dma.c @@ -31,7 +31,8 @@  #include <asm/arch/clock.h>  #include <asm/arch/imx-regs.h>  #include <asm/arch/sys_proto.h> -#include <asm/arch/dma.h> +#include <asm/imx-common/dma.h> +#include <asm/imx-common/regs-apbh.h>  static struct mxs_dma_chan mxs_dma_channels[MXS_MAX_DMA_CHANNELS]; diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c index a89660f13..fdaf9c763 100644 --- a/drivers/mmc/mxsmmc.c +++ b/drivers/mmc/mxsmmc.c @@ -41,7 +41,7 @@  #include <asm/arch/clock.h>  #include <asm/arch/imx-regs.h>  #include <asm/arch/sys_proto.h> -#include <asm/arch/dma.h> +#include <asm/imx-common/dma.h>  #include <bouncebuf.h>  struct mxsmmc_priv { diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index e38e15125..c21fd692c 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -34,8 +34,10 @@  #include <asm/io.h>  #include <asm/arch/clock.h>  #include <asm/arch/imx-regs.h> +#include <asm/imx-common/regs-bch.h> +#include <asm/imx-common/regs-gpmi.h>  #include <asm/arch/sys_proto.h> -#include <asm/arch/dma.h> +#include <asm/imx-common/dma.h>  #define	MXS_NAND_DMA_DESCRIPTOR_COUNT		4 diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index aa999f9a9..db98a136e 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -31,7 +31,7 @@  #include <asm/arch/clock.h>  #include <asm/arch/imx-regs.h>  #include <asm/arch/sys_proto.h> -#include <asm/arch/dma.h> +#include <asm/imx-common/dma.h>  #define	MXS_SPI_MAX_TIMEOUT	1000000  #define	MXS_SPI_PORT_OFFSET	0x2000 |