diff options
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/raw/davinci_nand.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/fsl_elbc_nand.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/nand_base.c | 10 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/nand_ids.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c index ef8e85a..e486056 100644 --- a/drivers/mtd/nand/raw/davinci_nand.c +++ b/drivers/mtd/nand/raw/davinci_nand.c @@ -39,7 +39,7 @@ #define NAND_TIMEOUT 10240 #define NAND_ECC_BUSY 0xC #define NAND_4BITECC_MASK 0x03FF03FF -#define EMIF_NANDFSR_ECC_STATE_MASK 0x00000F00 +#define EMIF_NANDFSR_ECC_STATE_MASK 0x00000F00 #define ECC_STATE_NO_ERR 0x0 #define ECC_STATE_TOO_MANY_ERRS 0x1 #define ECC_STATE_ERR_CORR_COMP_P 0x2 diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c index 0c1bd7b..ddfd75d 100644 --- a/drivers/mtd/nand/raw/fsl_elbc_nand.c +++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c @@ -716,7 +716,7 @@ static int fsl_elbc_chip_init(int devnum, u8 *addr) nand->bbt_td = &bbt_main_descr; nand->bbt_md = &bbt_mirror_descr; - /* set up nand options */ + /* set up nand options */ nand->options = NAND_NO_SUBPAGE_WRITE; nand->bbt_options = NAND_BBT_USE_FLASH; diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 0c26e1d..b533683 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -263,7 +263,7 @@ static void ioread8_rep(void *addr, uint8_t *buf, int len) static void ioread16_rep(void *addr, void *buf, int len) { int i; - u16 *p = (u16 *) buf; + u16 *p = (u16 *) buf; for (i = 0; i < len; i++) p[i] = readw(addr); @@ -905,11 +905,11 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip) if (ret) return ret; - u32 timer = (CONFIG_SYS_HZ * timeo) / 1000; - u32 time_start; + u32 timer = (CONFIG_SYS_HZ * timeo) / 1000; + u32 time_start; - time_start = get_timer(0); - while (get_timer(time_start) < timer) { + time_start = get_timer(0); + while (get_timer(time_start) < timer) { if (chip->dev_ready) { if (chip->dev_ready(mtd)) break; diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c index 3104f87..2a50f0b 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c @@ -30,7 +30,7 @@ struct nand_flash_dev nand_flash_ids[] = { LEGACY_ID_NAND("NAND 1MiB 3,3V 8-bit", 0xe8, 1, SZ_4K, SP_OPTIONS), LEGACY_ID_NAND("NAND 1MiB 3,3V 8-bit", 0xec, 1, SZ_4K, SP_OPTIONS), LEGACY_ID_NAND("NAND 2MiB 3,3V 8-bit", 0xea, 2, SZ_4K, SP_OPTIONS), - LEGACY_ID_NAND("NAND 4MiB 3,3V 8-bit", 0xd5, 4, SZ_8K, SP_OPTIONS), + LEGACY_ID_NAND("NAND 4MiB 3,3V 8-bit", 0xd5, 4, SZ_8K, SP_OPTIONS), LEGACY_ID_NAND("NAND 8MiB 3,3V 8-bit", 0xe6, 8, SZ_8K, SP_OPTIONS), #endif |