diff options
| author | Tom Rini <trini@konsulko.com> | 2017-07-18 12:42:48 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-18 12:42:48 (GMT) |
| commit | 39632b4a01210e329333d787d828157dcd2c7328 (patch) | |
| tree | a1013e4161de425f81aea052eeabe572c5e557d3 /drivers/mtd | |
| parent | e14b1169c0c5a1b362b41451006b492bd16f2fff (diff) | |
| parent | 651782a08b5bb4e710bda1b11fff774b8ade384f (diff) | |
| download | u-boot-fsl-qoriq-39632b4a01210e329333d787d828157dcd2c7328.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/mxs_nand.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index 9200544..d774ab8 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -22,10 +22,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/mach-imx/regs-bch.h> +#include <asm/mach-imx/regs-gpmi.h> #include <asm/arch/sys_proto.h> -#include <asm/imx-common/dma.h> +#include <asm/mach-imx/dma.h> #define MXS_NAND_DMA_DESCRIPTOR_COUNT 4 @@ -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); |