From: Wolfram Sang <w.sang@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Wolfram Sang <w.sang@pengutronix.de>
Subject: [PATCH 3/3] mtd: nand: mxs: check for errors when resetting ip core
Date: Tue, 30 Oct 2012 15:21:15 +0100 [thread overview]
Message-ID: <1351606875-31558-3-git-send-email-w.sang@pengutronix.de> (raw)
In-Reply-To: <1351606875-31558-1-git-send-email-w.sang@pengutronix.de>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
drivers/mtd/nand/nand_mxs.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/nand_mxs.c b/drivers/mtd/nand/nand_mxs.c
index 8aeb14d..906d695 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
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-10-30 14:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 14:21 [PATCH 1/3] arm: mxs: use timeouts in block reset routines Wolfram Sang
2012-10-30 14:21 ` [PATCH 2/3] dma: apbh: check for errors when resetting ip core Wolfram Sang
2012-10-31 8:29 ` Juergen Beisert
2012-10-31 8:36 ` Wolfram Sang
2012-10-31 8:48 ` Juergen Beisert
2012-10-31 8:54 ` Wolfram Sang
2012-10-31 9:29 ` Juergen Beisert
2012-10-31 9:39 ` Wolfram Sang
2012-10-30 14:21 ` Wolfram Sang [this message]
2012-10-31 7:37 ` [PATCH 1/3] arm: mxs: use timeouts in block reset routines Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351606875-31558-3-git-send-email-w.sang@pengutronix.de \
--to=w.sang@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox