openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: nand: jz4780: switch to mtd_ooblayout_ops 

Implementing the mtd_ooblayout_ops interface is the new way of exposing
ECC/OOB layout to MTD users.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Tested-by: Harvey Hunt <harvey.hunt@imgtec.com>
This commit is contained in:
Boris Brezillon 2016-02-03 20:02:22 +01:00
parent 2ca9ec9acd
commit 36886be7dd
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/mtd/nand/jz4780_nand.c
View File

@ -55,8 +55,6 @@ struct jz4780_nand_chip {
struct nand_chip chip; struct nand_chip chip;
struct list_head chip_list; struct list_head chip_list;
struct nand_ecclayout ecclayout;
struct gpio_desc *busy_gpio; struct gpio_desc *busy_gpio;
struct gpio_desc *wp_gpio; struct gpio_desc *wp_gpio;
unsigned int reading: 1; unsigned int reading: 1;
@ -164,8 +162,7 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de
struct nand_chip *chip = &nand->chip; struct nand_chip *chip = &nand->chip;
struct mtd_info *mtd = nand_to_mtd(chip); struct mtd_info *mtd = nand_to_mtd(chip);
struct jz4780_nand_controller *nfc = to_jz4780_nand_controller(chip->controller); struct jz4780_nand_controller *nfc = to_jz4780_nand_controller(chip->controller);
struct nand_ecclayout *layout = &nand->ecclayout; int eccbytes;
u32 start, i;
chip->ecc.bytes = fls((1 + 8) * chip->ecc.size) * chip->ecc.bytes = fls((1 + 8) * chip->ecc.size) *
(chip->ecc.strength / 8); (chip->ecc.strength / 8);
@ -200,23 +197,17 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de
return 0; return 0;
/* Generate ECC layout. ECC codes are right aligned in the OOB area. */ /* Generate ECC layout. ECC codes are right aligned in the OOB area. */
layout->eccbytes = mtd->writesize / chip->ecc.size * chip->ecc.bytes; eccbytes = mtd->writesize / chip->ecc.size * chip->ecc.bytes;
if (layout->eccbytes > mtd->oobsize - 2) { if (eccbytes > mtd->oobsize - 2) {
dev_err(dev, dev_err(dev,
"invalid ECC config: required %d ECC bytes, but only %d are available", "invalid ECC config: required %d ECC bytes, but only %d are available",
layout->eccbytes, mtd->oobsize - 2); eccbytes, mtd->oobsize - 2);
return -EINVAL; return -EINVAL;
} }
start = mtd->oobsize - layout->eccbytes; mtd->ooblayout = &nand_ooblayout_lp_ops;
for (i = 0; i < layout->eccbytes; i++)
layout->eccpos[i] = start + i;
layout->oobfree[0].offset = 2;
layout->oobfree[0].length = mtd->oobsize - layout->eccbytes - 2;
chip->ecc.layout = layout;
return 0; return 0;
} }