Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 10:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtd: rawnand: jz4740: 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>
Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com>
This commit is contained in:
Miquel Raynal 2018-07-25 15:31:46 +02:00
parent 2f2173449b
commit ccadc14975
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/mtd/nand/raw/jz4740_nand.c
View File

@ -309,7 +309,6 @@ static int jz_nand_detect_bank(struct platform_device *pdev,
size_t chipnr, uint8_t *nand_maf_id,
uint8_t *nand_dev_id)
{
struct jz_nand_platform_data *pdata = dev_get_platdata(&pdev->dev);
int ret;
char res_name[6];
uint32_t ctrl;
@ -332,20 +331,10 @@ static int jz_nand_detect_bank(struct platform_device *pdev,
if (chipnr == 0) {
/* Detect first chip. */
ret = nand_scan_ident(mtd, 1, NULL);
ret = nand_scan(mtd, 1);
if (ret)
goto notfound_id;
if (pdata && pdata->ident_callback)
pdata->ident_callback(pdev, mtd, &pdata->partitions,
&pdata->num_partitions);
ret = nand_scan_tail(mtd);
if (ret) {
dev_err(&pdev->dev, "Failed to scan NAND\n");
goto notfound_id;
}
/* Retrieve the IDs from the first chip. */
chip->select_chip(mtd, 0);
nand_reset_op(chip);
@ -379,6 +368,24 @@ notfound_id:
return ret;
}
static int jz_nand_attach_chip(struct nand_chip *chip)
{
struct mtd_info *mtd = nand_to_mtd(chip);
struct device *dev = mtd->dev.parent;
struct jz_nand_platform_data *pdata = dev_get_platdata(dev);
struct platform_device *pdev = to_platform_device(dev);
if (pdata && pdata->ident_callback)
pdata->ident_callback(pdev, mtd, &pdata->partitions,
&pdata->num_partitions);
return 0;
}
static const struct nand_controller_ops jz_nand_controller_ops = {
.attach_chip = jz_nand_attach_chip,
};
static int jz_nand_probe(struct platform_device *pdev)
{
int ret;
@ -422,6 +429,7 @@ static int jz_nand_probe(struct platform_device *pdev)
chip->chip_delay = 50;
chip->cmd_ctrl = jz_nand_cmd_ctrl;
chip->select_chip = jz_nand_select_chip;
chip->dummy_controller.ops = &jz_nand_controller_ops;
if (nand->busy_gpio)
chip->dev_ready = jz_nand_dev_ready;