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>

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 62d8c6b38cfb1b041609c7d1bd88ab9900adabda..4564b2509c240c471d7b0399a7221e551c35cb48 100644 (file)
--- 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 1c16c71d45c14f99f733f64003d20522263fbe2c..c248cef6549981389e68df2f554901edcffe8f1f 100644 (file)
--- 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 842943c651b598e610bb6e65005d379d9267c145..4c5a7feec1629aacc22d1c26ab1bd843339ea56c 100644 (file)
--- 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)