diff options
Diffstat (limited to 'include/linux/mtd')
-rw-r--r-- | include/linux/mtd/nand.h | 4 | ||||
-rw-r--r-- | include/linux/mtd/ndfc.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 1a749ba6130f..fd46bcf52281 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h | |||
@@ -518,10 +518,11 @@ extern int nand_do_read(struct mtd_info *mtd, loff_t from, size_t len, | |||
518 | * | 518 | * |
519 | * @nr_chips: max. number of chips to scan for | 519 | * @nr_chips: max. number of chips to scan for |
520 | * @chip_offs: chip number offset | 520 | * @chip_offs: chip number offset |
521 | * @nr_partitions: number of partitions pointed to be partitoons (or zero) | 521 | * @nr_partitions: number of partitions pointed to by partitions (or zero) |
522 | * @partitions: mtd partition list | 522 | * @partitions: mtd partition list |
523 | * @chip_delay: R/B delay value in us | 523 | * @chip_delay: R/B delay value in us |
524 | * @options: Option flags, e.g. 16bit buswidth | 524 | * @options: Option flags, e.g. 16bit buswidth |
525 | * @oobinfo: oob info structure (ecc placement) | ||
525 | * @priv: hardware controller specific settings | 526 | * @priv: hardware controller specific settings |
526 | */ | 527 | */ |
527 | struct platform_nand_chip { | 528 | struct platform_nand_chip { |
@@ -529,6 +530,7 @@ struct platform_nand_chip { | |||
529 | int chip_offset; | 530 | int chip_offset; |
530 | int nr_partitions; | 531 | int nr_partitions; |
531 | struct mtd_partition *partitions; | 532 | struct mtd_partition *partitions; |
533 | struct nand_oobinfo *oobinfo; | ||
532 | int chip_delay; | 534 | int chip_delay; |
533 | unsigned int options; | 535 | unsigned int options; |
534 | void *priv; | 536 | void *priv; |
diff --git a/include/linux/mtd/ndfc.h b/include/linux/mtd/ndfc.h index 31d61f07d768..d0558a982628 100644 --- a/include/linux/mtd/ndfc.h +++ b/include/linux/mtd/ndfc.h | |||
@@ -56,7 +56,8 @@ | |||
56 | #define NDFC_MAX_BANKS 4 | 56 | #define NDFC_MAX_BANKS 4 |
57 | 57 | ||
58 | struct ndfc_controller_settings { | 58 | struct ndfc_controller_settings { |
59 | uint32_t ccr_settings; | 59 | uint32_t ccr_settings; |
60 | uint64_t ndfc_erpn; | ||
60 | }; | 61 | }; |
61 | 62 | ||
62 | struct ndfc_chip_settings { | 63 | struct ndfc_chip_settings { |