summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorScott Wood <oss@buserror.net>2016-05-30 13:57:57 -0500
committerScott Wood <oss@buserror.net>2016-06-03 20:27:48 -0500
commit81c772521ff26054a3fe75efa87d8daeae83e9b4 (patch)
tree8037d16f2aa0ba9a23625b16a412a2eca7df7a41 /include/linux
parent17cb4b8f327eb983cef7c510fcf77f1635a00e48 (diff)
downloadu-boot-imx-81c772521ff26054a3fe75efa87d8daeae83e9b4.zip
u-boot-imx-81c772521ff26054a3fe75efa87d8daeae83e9b4.tar.gz
u-boot-imx-81c772521ff26054a3fe75efa87d8daeae83e9b4.tar.bz2
mtd: nand: Add page argument to write_page() etc.
This change is part of the Linux 4.6 sync. It is being done before the main sync patch in order to make it easier to address the issue across all NAND drivers (many/most of which do not closely track their Linux counterparts) separately from other merge issues. Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mtd/nand.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index e1df66b..34945fd 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -519,16 +519,16 @@ struct nand_ecc_ctrl {
int (*read_page_raw)(struct mtd_info *mtd, struct nand_chip *chip,
uint8_t *buf, int oob_required, int page);
int (*write_page_raw)(struct mtd_info *mtd, struct nand_chip *chip,
- const uint8_t *buf, int oob_required);
+ const uint8_t *buf, int oob_required, int page);
int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip,
uint8_t *buf, int oob_required, int page);
int (*read_subpage)(struct mtd_info *mtd, struct nand_chip *chip,
uint32_t offs, uint32_t len, uint8_t *buf, int page);
int (*write_subpage)(struct mtd_info *mtd, struct nand_chip *chip,
uint32_t offset, uint32_t data_len,
- const uint8_t *data_buf, int oob_required);
+ const uint8_t *data_buf, int oob_required, int page);
int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
- const uint8_t *buf, int oob_required);
+ const uint8_t *buf, int oob_required, int page);
int (*write_oob_raw)(struct mtd_info *mtd, struct nand_chip *chip,
int page);
int (*read_oob_raw)(struct mtd_info *mtd, struct nand_chip *chip,