leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: rawnand: jz4780: convert driver to nand_scan()

Browse Source 
Two helpers have been added to the core to do all kind of controller
side configuration/initialization between the detection phase and the
final NAND scan. Implement these hooks so that we can convert the driver
to just use nand_scan() instead of the nand_scan_ident() +
nand_scan_tail() pair.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Acked-by: Harvey Hunt <harveyhuntnexus@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com>
This commit is contained in:
Miquel Raynal 2018-07-20 17:15:02 +02:00
parent 07c1a4b3d8
commit eef2b13a33
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/mtd/nand/raw/jz4780_nand.c
View File

@ -158,9 +158,8 @@ static int jz4780_nand_ecc_correct(struct mtd_info *mtd, u8 *dat,
return jz4780_bch_correct(nfc->bch, &params, dat, read_ecc); return jz4780_bch_correct(nfc->bch, &params, dat, read_ecc);
} }
static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *dev) static int jz4780_nand_attach_chip(struct nand_chip *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);
int eccbytes; int eccbytes;
@ -171,7 +170,8 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de
switch (chip->ecc.mode) { switch (chip->ecc.mode) {
case NAND_ECC_HW: case NAND_ECC_HW:
if (!nfc->bch) { if (!nfc->bch) {
dev_err(dev, "HW BCH selected, but BCH controller not found\n"); dev_err(nfc->dev,
"HW BCH selected, but BCH controller not found\n");
return -ENODEV; return -ENODEV;
} }
@ -180,15 +180,16 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de
chip->ecc.correct = jz4780_nand_ecc_correct; chip->ecc.correct = jz4780_nand_ecc_correct;
/* fall through */ /* fall through */
case NAND_ECC_SOFT: case NAND_ECC_SOFT:
dev_info(dev, "using %s (strength %d, size %d, bytes %d)\n", dev_info(nfc->dev, "using %s (strength %d, size %d, bytes %d)\n",
(nfc->bch) ? "hardware BCH" : "software ECC", (nfc->bch) ? "hardware BCH" : "software ECC",
chip->ecc.strength, chip->ecc.size, chip->ecc.bytes); chip->ecc.strength, chip->ecc.size, chip->ecc.bytes);
break; break;
case NAND_ECC_NONE: case NAND_ECC_NONE:
dev_info(dev, "not using ECC\n"); dev_info(nfc->dev, "not using ECC\n");
break; break;
default: default:
dev_err(dev, "ECC mode %d not supported\n", chip->ecc.mode); dev_err(nfc->dev, "ECC mode %d not supported\n",
chip->ecc.mode);
return -EINVAL; return -EINVAL;
} }
@ -200,7 +201,7 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de
eccbytes = mtd->writesize / chip->ecc.size * chip->ecc.bytes; eccbytes = mtd->writesize / chip->ecc.size * chip->ecc.bytes;
if (eccbytes > mtd->oobsize - 2) { if (eccbytes > mtd->oobsize - 2) {
dev_err(dev, dev_err(nfc->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",
eccbytes, mtd->oobsize - 2); eccbytes, mtd->oobsize - 2);
return -EINVAL; return -EINVAL;
@ -211,6 +212,10 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de
return 0; return 0;
} }
static const struct nand_controller_ops jz4780_nand_controller_ops = {
.attach_chip = jz4780_nand_attach_chip,
};
static int jz4780_nand_init_chip(struct platform_device *pdev, static int jz4780_nand_init_chip(struct platform_device *pdev,
struct jz4780_nand_controller *nfc, struct jz4780_nand_controller *nfc,
struct device_node *np, struct device_node *np,
@ -280,15 +285,8 @@ static int jz4780_nand_init_chip(struct platform_device *pdev,
chip->controller = &nfc->controller; chip->controller = &nfc->controller;
nand_set_flash_node(chip, np); nand_set_flash_node(chip, np);
ret = nand_scan_ident(mtd, 1, NULL); chip->controller->ops = &jz4780_nand_controller_ops;
if (ret) ret = nand_scan(mtd, 1);
return ret;
ret = jz4780_nand_init_ecc(nand, dev);
if (ret)
return ret;
ret = nand_scan_tail(mtd);
if (ret) if (ret)
return ret; return ret;