mtd: nand: raw: atmel_nand: Use ATMEL_BASE_ECC directly

This is the only driver, and only one platform makes use of, setting
CONFIG_SYS_NAND_ECC_BASE. Reference ATMEL_BASE_ECC directly in this
case.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c
index 61bfd175be40b95382b8db40472817ff31279fbc..a541af6db4a45451aaa966d0323eb35d9e850c2f 100644 (file)
--- a/drivers/mtd/nand/raw/atmel_nand.c
+++ b/drivers/mtd/nand/raw/atmel_nand.c
@@ -1012,13 +1012,13 @@ static int atmel_nand_calculate(struct mtd_info *mtd,
        unsigned int ecc_value;
 
        /* get the first 2 ECC bytes */
-       ecc_value = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, PR);
+       ecc_value = ecc_readl(ATMEL_BASE_ECC, PR);
 
        ecc_code[0] = ecc_value & 0xFF;
        ecc_code[1] = (ecc_value >> 8) & 0xFF;
 
        /* get the last 2 ECC bytes */
-       ecc_value = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, NPR) & ATMEL_ECC_NPARITY;
+       ecc_value = ecc_readl(ATMEL_BASE_ECC, NPR) & ATMEL_ECC_NPARITY;
 
        ecc_code[2] = ecc_value & 0xFF;
        ecc_code[3] = (ecc_value >> 8) & 0xFF;
@@ -1101,16 +1101,16 @@ static int atmel_nand_correct(struct mtd_info *mtd, u_char *dat,
        unsigned int ecc_word, ecc_bit;
 
        /* get the status from the Status Register */
-       ecc_status = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, SR);
+       ecc_status = ecc_readl(ATMEL_BASE_ECC, SR);
 
        /* if there's no error */
        if (likely(!(ecc_status & ATMEL_ECC_RECERR)))
                return 0;
 
        /* get error bit offset (4 bits) */
-       ecc_bit = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, PR) & ATMEL_ECC_BITADDR;
+       ecc_bit = ecc_readl(ATMEL_BASE_ECC, PR) & ATMEL_ECC_BITADDR;
        /* get word address (12 bits) */
-       ecc_word = ecc_readl(CONFIG_SYS_NAND_ECC_BASE, PR) & ATMEL_ECC_WORDADDR;
+       ecc_word = ecc_readl(ATMEL_BASE_ECC, PR) & ATMEL_ECC_WORDADDR;
        ecc_word >>= 4;
 
        /* if there are multiple errors */
@@ -1180,22 +1180,22 @@ int atmel_hwecc_nand_init_param(struct nand_chip *nand, struct mtd_info *mtd)
                switch (mtd->writesize) {
                case 512:
                        nand->ecc.layout = &atmel_oobinfo_small;
-                       ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR,
+                       ecc_writel(ATMEL_BASE_ECC, MR,
                                        ATMEL_ECC_PAGESIZE_528);
                        break;
                case 1024:
                        nand->ecc.layout = &atmel_oobinfo_large;
-                       ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR,
+                       ecc_writel(ATMEL_BASE_ECC, MR,
                                        ATMEL_ECC_PAGESIZE_1056);
                        break;
                case 2048:
                        nand->ecc.layout = &atmel_oobinfo_large;
-                       ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR,
+                       ecc_writel(ATMEL_BASE_ECC, MR,
                                        ATMEL_ECC_PAGESIZE_2112);
                        break;
                case 4096:
                        nand->ecc.layout = &atmel_oobinfo_large;
-                       ecc_writel(CONFIG_SYS_NAND_ECC_BASE, MR,
+                       ecc_writel(ATMEL_BASE_ECC, MR,
                                        ATMEL_ECC_PAGESIZE_4224);
                        break;
                default:

diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index 6aba1d3194c34ce7a30d28ef18234e5319c88013..29462c526ec5a67f3436c2c1445a2fc23a644f46 100644 (file)
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -29,7 +29,6 @@
 /* Mem test settings */
 
 /* NAND Flash */
-#define CONFIG_SYS_NAND_ECC_BASE       ATMEL_BASE_ECC
 #define CONFIG_SYS_NAND_BASE           ATMEL_BASE_CS3
 #define CONFIG_SYS_NAND_MASK_ALE       (1 << 21) /* AD21 */
 #define CONFIG_SYS_NAND_MASK_CLE       (1 << 22) /* AD22 */