summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2012-08-13 22:49:42 +0200
committerScott Wood <scottwood@freescale.com>2012-09-17 19:42:46 -0500
commitc1db8dd62b337372a08942e1c5945a8590afbc58 (patch)
tree62cff26c6d18c4d7ac88ce615fbdc6f9d10475aa
parent0e55ad7271259b1de183fb5329ea7f07774e368d (diff)
mxc nand: Access all ecc_status_result fields
On the NFC IP 1.1, the 32-bit ecc_status_result value comes from 2 consecutive 16-bit registers. This patch reads all the fields of this value, which makes a difference for 4-kiB NF pages. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Scott Wood <scottwood@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Signed-off-by: Scott Wood <scottwood@freescale.com>
-rw-r--r--drivers/mtd/nand/mxc_nand.c2
-rw-r--r--include/fsl_nfc.h3
-rw-r--r--nand_spl/nand_boot_fsl_nfc.c4
3 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 62d8c6b38c..4564b2509c 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -653,7 +653,7 @@ static int mxc_nand_correct_data(struct mtd_info *mtd, u_char *dat,
{
struct nand_chip *nand_chip = mtd->priv;
struct mxc_nand_host *host = nand_chip->priv;
- uint16_t ecc_status = readw(&host->regs->ecc_status_result);
+ uint32_t ecc_status = readl(&host->regs->ecc_status_result);
int subpages = mtd->writesize / nand_chip->subpagesize;
int pg2blk_shift = nand_chip->phys_erase_shift -
nand_chip->page_shift;
diff --git a/include/fsl_nfc.h b/include/fsl_nfc.h
index 1c16c71d45..c248cef654 100644
--- a/include/fsl_nfc.h
+++ b/include/fsl_nfc.h
@@ -94,8 +94,7 @@ struct fsl_nfc_regs {
u16 flash_addr;
u16 flash_cmd;
u16 config;
- u16 ecc_status_result;
- u16 ecc_status_result2;
+ u32 ecc_status_result;
u16 spare_area_size;
u16 wrprot;
u16 reserved3[2];
diff --git a/nand_spl/nand_boot_fsl_nfc.c b/nand_spl/nand_boot_fsl_nfc.c
index 842943c651..4c5a7feec1 100644
--- a/nand_spl/nand_boot_fsl_nfc.c
+++ b/nand_spl/nand_boot_fsl_nfc.c
@@ -139,7 +139,11 @@ static void nfc_nand_data_output(void)
static int nfc_nand_check_ecc(void)
{
+#if defined(MXC_NFC_V1)
return readw(&nfc->ecc_status_result);
+#elif defined(MXC_NFC_V1_1)
+ return readl(&nfc->ecc_status_result);
+#endif
}
static void nfc_nand_read_page(unsigned int page_address)