diff options
| author | Fabio Estevam <fabio.estevam@nxp.com> | 2017-06-29 09:33:44 -0300 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2017-07-12 09:44:22 +0200 |
| commit | a1d1fdc920cfb4c0126e5f8ff5233dd391548a0b (patch) | |
| tree | fb4d7ada045d2240312d87b9266c55dcb32e075a | |
| parent | 306dd7dabd6472b8b66ab5106d5a6a516ef15d79 (diff) | |
| download | u-boot-a1d1fdc920cfb4c0126e5f8ff5233dd391548a0b.tar.gz | |
mx6: soc: Move mxs_dma_init() into the mxs nand driver
Currently the following build error is seen when a board using MMC SPL
is built and the MXS nand driver is also selected:
arch/arm/cpu/armv7/built-in.o: In function `arch_cpu_init':
arch/arm/cpu/armv7/mx6/soc.c:432: undefined reference to 'mxs_dma_init'
On mx6 the only user of mxs_dma_init() is the mxs nand driver, so
move it there.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 5 | ||||
| -rw-r--r-- | drivers/mtd/nand/mxs_nand.c | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index b881766487..832ef251b8 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -427,11 +427,6 @@ int arch_cpu_init(void) imx_set_wdog_powerdown(false); /* Disable PDE bit of WMCR register */ -#ifdef CONFIG_APBH_DMA - /* Start APBH DMA */ - mxs_dma_init(); -#endif - init_src(); return 0; diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index 92005448d2..5aa36082dd 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -1114,6 +1114,7 @@ int mxs_nand_init(struct mxs_nand_info *info) } /* Init the DMA controller. */ + mxs_dma_init(); for (j = MXS_DMA_CHANNEL_AHB_APBH_GPMI0; j <= MXS_DMA_CHANNEL_AHB_APBH_GPMI7; j++) { ret = mxs_dma_init_channel(j); |