diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-15 10:58:11 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-15 10:58:11 +0200 |
| commit | a6aab0ebab471e91beb4e14c2d305b326ac18928 (patch) | |
| tree | 44411e6dbed5e1c1f9999ae9827d678a5a88cdcb /include/linux | |
| parent | a0b3119905e16d7610f950d0fd04a8689979be2e (diff) | |
| parent | 6b309a2f91dca742a05a53922ff70970f28b428d (diff) | |
| download | barebox-a6aab0ebab471e91beb4e14c2d305b326ac18928.tar.gz barebox-a6aab0ebab471e91beb4e14c2d305b326ac18928.tar.xz | |
Merge branch 'for-next/mtd-gpmi-nand'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mtd/nand.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/nand_mxs.h | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 785cb06030..7f17767c69 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -52,6 +52,8 @@ extern int nand_check_erased_ecc_chunk(void *data, int datalen, int bitflips_threshold); int nand_check_erased_buf(void *buf, int len, int bitflips_threshold); +void nand_of_parse_node(struct mtd_info *mtd, struct device_node *np); + /* The maximum number of NAND chips in an array */ #define NAND_MAX_CHIPS 8 diff --git a/include/linux/mtd/nand_mxs.h b/include/linux/mtd/nand_mxs.h index eca31777f5..7eda0b8e63 100644 --- a/include/linux/mtd/nand_mxs.h +++ b/include/linux/mtd/nand_mxs.h @@ -27,11 +27,6 @@ * update handler code, the generic calculation from the driver code is used. */ -uint32_t mxs_nand_get_ecc_strength(uint32_t page_data_size, - uint32_t page_oob_size); - -uint32_t mxs_nand_mark_byte_offset(struct mtd_info *mtd); - -uint32_t mxs_nand_mark_bit_offset(struct mtd_info *mtd); +int mxs_nand_get_geo(int *ecc_strength, int *bb_mark_bit_offset); #endif /* __NAND_MXS_H */ |