aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/pxa3xx_nand.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/nand/pxa3xx_nand.c')
-rw-r--r--drivers/mtd/nand/pxa3xx_nand.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index c45227173efd..37ee75c7bacb 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -683,11 +683,13 @@ static void pxa3xx_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
683 info->state = STATE_IDLE; 683 info->state = STATE_IDLE;
684} 684}
685 685
686static void pxa3xx_nand_write_page_hwecc(struct mtd_info *mtd, 686static int pxa3xx_nand_write_page_hwecc(struct mtd_info *mtd,
687 struct nand_chip *chip, const uint8_t *buf, int oob_required) 687 struct nand_chip *chip, const uint8_t *buf, int oob_required)
688{ 688{
689 chip->write_buf(mtd, buf, mtd->writesize); 689 chip->write_buf(mtd, buf, mtd->writesize);
690 chip->write_buf(mtd, chip->oob_poi, mtd->oobsize); 690 chip->write_buf(mtd, chip->oob_poi, mtd->oobsize);
691
692 return 0;
691} 693}
692 694
693static int pxa3xx_nand_read_page_hwecc(struct mtd_info *mtd, 695static int pxa3xx_nand_read_page_hwecc(struct mtd_info *mtd,
@@ -771,12 +773,6 @@ static void pxa3xx_nand_write_buf(struct mtd_info *mtd,
771 info->buf_start += real_len; 773 info->buf_start += real_len;
772} 774}
773 775
774static int pxa3xx_nand_verify_buf(struct mtd_info *mtd,
775 const uint8_t *buf, int len)
776{
777 return 0;
778}
779
780static void pxa3xx_nand_select_chip(struct mtd_info *mtd, int chip) 776static void pxa3xx_nand_select_chip(struct mtd_info *mtd, int chip)
781{ 777{
782 return; 778 return;
@@ -1007,7 +1003,6 @@ KEEP_CONFIG:
1007 chip->ecc.size = host->page_size; 1003 chip->ecc.size = host->page_size;
1008 chip->ecc.strength = 1; 1004 chip->ecc.strength = 1;
1009 1005
1010 chip->options |= NAND_NO_READRDY;
1011 if (host->reg_ndcr & NDCR_DWIDTH_M) 1006 if (host->reg_ndcr & NDCR_DWIDTH_M)
1012 chip->options |= NAND_BUSWIDTH_16; 1007 chip->options |= NAND_BUSWIDTH_16;
1013 1008
@@ -1070,7 +1065,6 @@ static int alloc_nand_resource(struct platform_device *pdev)
1070 chip->read_byte = pxa3xx_nand_read_byte; 1065 chip->read_byte = pxa3xx_nand_read_byte;
1071 chip->read_buf = pxa3xx_nand_read_buf; 1066 chip->read_buf = pxa3xx_nand_read_buf;
1072 chip->write_buf = pxa3xx_nand_write_buf; 1067 chip->write_buf = pxa3xx_nand_write_buf;
1073 chip->verify_buf = pxa3xx_nand_verify_buf;
1074 } 1068 }
1075 1069
1076 spin_lock_init(&chip->controller->lock); 1070 spin_lock_init(&chip->controller->lock);