diff options
| author | Tom Rini <trini@ti.com> | 2012-12-17 18:39:45 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-17 18:39:45 -0700 |
| commit | e80e588bb8db254fd939f83116ccf901bd233066 (patch) | |
| tree | 36cbbced46e1d476021f2664db7f7f9b41021a1a /drivers | |
| parent | ebbf0d20aa85f623c49b7ed3349ebfea450c152d (diff) | |
| parent | 71779d5b873186941652188a30bf703c951b1616 (diff) | |
| download | u-boot-imx-e80e588bb8db254fd939f83116ccf901bd233066.zip u-boot-imx-e80e588bb8db254fd939f83116ccf901bd233066.tar.gz u-boot-imx-e80e588bb8db254fd939f83116ccf901bd233066.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/mxs_nand.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index 4701be8..e38e151 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -1058,6 +1058,8 @@ int mxs_nand_init(struct mxs_nand_info *info) { struct mxs_gpmi_regs *gpmi_regs = (struct mxs_gpmi_regs *)MXS_GPMI_BASE; + struct mxs_bch_regs *bch_regs = + (struct mxs_bch_regs *)MXS_BCH_BASE; int i = 0, j; info->desc = malloc(sizeof(struct mxs_dma_desc *) * @@ -1081,6 +1083,7 @@ int mxs_nand_init(struct mxs_nand_info *info) /* Reset the GPMI block. */ mxs_reset_block(&gpmi_regs->hw_gpmi_ctrl0_reg); + mxs_reset_block(&bch_regs->hw_bch_ctrl_reg); /* * Choose NAND mode, set IRQ polarity, disable write protection and |