diff options
Diffstat (limited to 'drivers/mtd/nand/sh_flctl.c')
-rw-r--r-- | drivers/mtd/nand/sh_flctl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c index e9b2b260de3a..aa9b8a5e0b8f 100644 --- a/drivers/mtd/nand/sh_flctl.c +++ b/drivers/mtd/nand/sh_flctl.c | |||
@@ -344,7 +344,7 @@ static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_va | |||
344 | } | 344 | } |
345 | 345 | ||
346 | static int flctl_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, | 346 | static int flctl_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, |
347 | uint8_t *buf, int page) | 347 | uint8_t *buf, int oob_required, int page) |
348 | { | 348 | { |
349 | int i, eccsize = chip->ecc.size; | 349 | int i, eccsize = chip->ecc.size; |
350 | int eccbytes = chip->ecc.bytes; | 350 | int eccbytes = chip->ecc.bytes; |
@@ -359,14 +359,14 @@ static int flctl_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, | |||
359 | if (flctl->hwecc_cant_correct[i]) | 359 | if (flctl->hwecc_cant_correct[i]) |
360 | mtd->ecc_stats.failed++; | 360 | mtd->ecc_stats.failed++; |
361 | else | 361 | else |
362 | mtd->ecc_stats.corrected += 0; | 362 | mtd->ecc_stats.corrected += 0; /* FIXME */ |
363 | } | 363 | } |
364 | 364 | ||
365 | return 0; | 365 | return 0; |
366 | } | 366 | } |
367 | 367 | ||
368 | static void flctl_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, | 368 | static void flctl_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, |
369 | const uint8_t *buf) | 369 | const uint8_t *buf, int oob_required) |
370 | { | 370 | { |
371 | int i, eccsize = chip->ecc.size; | 371 | int i, eccsize = chip->ecc.size; |
372 | int eccbytes = chip->ecc.bytes; | 372 | int eccbytes = chip->ecc.bytes; |
@@ -881,8 +881,6 @@ static int __devinit flctl_probe(struct platform_device *pdev) | |||
881 | flctl->hwecc = pdata->has_hwecc; | 881 | flctl->hwecc = pdata->has_hwecc; |
882 | flctl->holden = pdata->use_holden; | 882 | flctl->holden = pdata->use_holden; |
883 | 883 | ||
884 | nand->options = NAND_NO_AUTOINCR; | ||
885 | |||
886 | /* Set address of hardware control function */ | 884 | /* Set address of hardware control function */ |
887 | /* 20 us command delay time */ | 885 | /* 20 us command delay time */ |
888 | nand->chip_delay = 20; | 886 | nand->chip_delay = 20; |