diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-30 15:21:15 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-31 08:36:51 +0100 |
| commit | 300c2d3fb395cd1f18f6944f44ed43b9c477151d (patch) | |
| tree | db3e62c273961936f02232e154b98e6f86dca5d3 /drivers/mtd | |
| parent | 359a6eb6d3058bc9f73fc17c9d0b4264ad710e3e (diff) | |
| download | barebox-300c2d3fb395cd1f18f6944f44ed43b9c477151d.tar.gz barebox-300c2d3fb395cd1f18f6944f44ed43b9c477151d.tar.xz | |
mtd: nand: mxs: check for errors when resetting ip core
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand_mxs.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/mtd/nand/nand_mxs.c b/drivers/mtd/nand/nand_mxs.c index 8aeb14d0cc..906d6958f2 100644 --- a/drivers/mtd/nand/nand_mxs.c +++ b/drivers/mtd/nand/nand_mxs.c @@ -1039,9 +1039,13 @@ static int mxs_nand_scan_bbt(struct mtd_info *mtd) struct mxs_nand_info *nand_info = nand->priv; void __iomem *bch_regs = (void __iomem *)MXS_BCH_BASE; uint32_t tmp; + int ret; /* Reset BCH. Don't use SFTRST on MX23 due to Errata #2847 */ - mxs_reset_block(bch_regs + BCH_CTRL, nand_info->version == GPMI_VERSION_TYPE_MX23); + ret = mxs_reset_block(bch_regs + BCH_CTRL, + nand_info->version == GPMI_VERSION_TYPE_MX23); + if (ret) + return ret; /* Configure layout 0 */ tmp = (mxs_nand_ecc_chunk_cnt(mtd->writesize) - 1) @@ -1124,7 +1128,7 @@ int mxs_nand_alloc_buffers(struct mxs_nand_info *nand_info) int mxs_nand_hw_init(struct mxs_nand_info *info) { void __iomem *gpmi_regs = (void *)MXS_GPMI_BASE; - int i = 0; + int i = 0, ret; u32 val; info->desc = malloc(sizeof(struct mxs_dma_desc *) * @@ -1145,7 +1149,9 @@ int mxs_nand_hw_init(struct mxs_nand_info *info) imx_enable_nandclk(); /* Reset the GPMI block. */ - mxs_reset_block(gpmi_regs + GPMI_CTRL0, 0); + ret = mxs_reset_block(gpmi_regs + GPMI_CTRL0, 0); + if (ret) + return ret; /* * Choose NAND mode, set IRQ polarity, disable write protection and |