OSDN Git Service

mtd: nand: mxc: Add own write_page
authorSascha Hauer <s.hauer@pengutronix.de>
Wed, 17 Jan 2018 11:32:11 +0000 (12:32 +0100)
committerBoris Brezillon <boris.brezillon@bootlin.com>
Mon, 12 Feb 2018 22:35:45 +0000 (23:35 +0100)
Now that we have our own read_page function add a write_page function
for consistency aswell. This can be a lot easier than the generic
function since we do not have to iterate over subpages but can write
the whole page at once. Also add write_page_raw and write_oob for
proper raw and oob write support.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
drivers/mtd/nand/mxc_nand.c

index 49885af..2811102 100644 (file)
@@ -890,6 +890,50 @@ static int mxc_nand_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
                                             page);
 }
 
+static int mxc_nand_write_page(struct nand_chip *chip, const uint8_t *buf,
+                              bool ecc, int page)
+{
+       struct mtd_info *mtd = nand_to_mtd(chip);
+       struct mxc_nand_host *host = nand_get_controller_data(chip);
+
+       host->devtype_data->enable_hwecc(chip, ecc);
+
+       host->devtype_data->send_cmd(host, NAND_CMD_SEQIN, false);
+       mxc_do_addr_cycle(mtd, 0, page);
+
+       memcpy32_toio(host->main_area0, buf, mtd->writesize);
+       copy_spare(mtd, false, chip->oob_poi);
+
+       host->devtype_data->send_page(mtd, NFC_INPUT);
+       host->devtype_data->send_cmd(host, NAND_CMD_PAGEPROG, true);
+       mxc_do_addr_cycle(mtd, 0, page);
+
+       return 0;
+}
+
+static int mxc_nand_write_page_ecc(struct mtd_info *mtd, struct nand_chip *chip,
+                                  const uint8_t *buf, int oob_required,
+                                  int page)
+{
+       return mxc_nand_write_page(chip, buf, true, page);
+}
+
+static int mxc_nand_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
+                                  const uint8_t *buf, int oob_required, int page)
+{
+       return mxc_nand_write_page(chip, buf, false, page);
+}
+
+static int mxc_nand_write_oob(struct mtd_info *mtd, struct nand_chip *chip,
+                             int page)
+{
+       struct mxc_nand_host *host = nand_get_controller_data(chip);
+
+       memset(host->data_buf, 0xff, mtd->writesize);
+
+       return mxc_nand_write_page(chip, host->data_buf, false, page);
+}
+
 static int mxc_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
                                  u_char *ecc_code)
 {
@@ -1904,6 +1948,9 @@ static int mxcnd_probe(struct platform_device *pdev)
                this->ecc.read_page = mxc_nand_read_page;
                this->ecc.read_page_raw = mxc_nand_read_page_raw;
                this->ecc.read_oob = mxc_nand_read_oob;
+               this->ecc.write_page = mxc_nand_write_page_ecc;
+               this->ecc.write_page_raw = mxc_nand_write_page_raw;
+               this->ecc.write_oob = mxc_nand_write_oob;
                this->ecc.calculate = mxc_nand_calculate_ecc;
                this->ecc.hwctl = mxc_nand_enable_hwecc;
                this->ecc.correct = host->devtype_data->correct_data;