Commit c49f3bee authored by Miquel Raynal's avatar Miquel Raynal

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

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: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 73a27db8
...@@ -184,6 +184,7 @@ static struct nand_bbt_descr lpc32xx_nand_bbt_mirror = { ...@@ -184,6 +184,7 @@ static struct nand_bbt_descr lpc32xx_nand_bbt_mirror = {
}; };
struct lpc32xx_nand_host { struct lpc32xx_nand_host {
struct platform_device *pdev;
struct nand_chip nand_chip; struct nand_chip nand_chip;
struct lpc32xx_mlc_platform_data *pdata; struct lpc32xx_mlc_platform_data *pdata;
struct clk *clk; struct clk *clk;
...@@ -653,6 +654,32 @@ static struct lpc32xx_nand_cfg_mlc *lpc32xx_parse_dt(struct device *dev) ...@@ -653,6 +654,32 @@ static struct lpc32xx_nand_cfg_mlc *lpc32xx_parse_dt(struct device *dev)
return ncfg; return ncfg;
} }
static int lpc32xx_nand_attach_chip(struct nand_chip *chip)
{
struct mtd_info *mtd = nand_to_mtd(chip);
struct lpc32xx_nand_host *host = nand_get_controller_data(chip);
struct device *dev = &host->pdev->dev;
host->dma_buf = devm_kzalloc(dev, mtd->writesize, GFP_KERNEL);
if (!host->dma_buf)
return -ENOMEM;
host->dummy_buf = devm_kzalloc(dev, mtd->writesize, GFP_KERNEL);
if (!host->dummy_buf)
return -ENOMEM;
chip->ecc.mode = NAND_ECC_HW;
chip->ecc.size = 512;
mtd_set_ooblayout(mtd, &lpc32xx_ooblayout_ops);
host->mlcsubpages = mtd->writesize / 512;
return 0;
}
static const struct nand_controller_ops lpc32xx_nand_controller_ops = {
.attach_chip = lpc32xx_nand_attach_chip,
};
/* /*
* Probe for NAND controller * Probe for NAND controller
*/ */
...@@ -669,6 +696,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) ...@@ -669,6 +696,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
if (!host) if (!host)
return -ENOMEM; return -ENOMEM;
host->pdev = pdev;
rc = platform_get_resource(pdev, IORESOURCE_MEM, 0); rc = platform_get_resource(pdev, IORESOURCE_MEM, 0);
host->io_base = devm_ioremap_resource(&pdev->dev, rc); host->io_base = devm_ioremap_resource(&pdev->dev, rc);
if (IS_ERR(host->io_base)) if (IS_ERR(host->io_base))
...@@ -748,31 +777,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) ...@@ -748,31 +777,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
} }
} }
/*
* Scan to find existance of the device and
* Get the type of NAND device SMALL block or LARGE block
*/
res = nand_scan_ident(mtd, 1, NULL);
if (res)
goto release_dma_chan;
host->dma_buf = devm_kzalloc(&pdev->dev, mtd->writesize, GFP_KERNEL);
if (!host->dma_buf) {
res = -ENOMEM;
goto release_dma_chan;
}
host->dummy_buf = devm_kzalloc(&pdev->dev, mtd->writesize, GFP_KERNEL);
if (!host->dummy_buf) {
res = -ENOMEM;
goto release_dma_chan;
}
nand_chip->ecc.mode = NAND_ECC_HW;
nand_chip->ecc.size = 512;
mtd_set_ooblayout(mtd, &lpc32xx_ooblayout_ops);
host->mlcsubpages = mtd->writesize / 512;
/* initially clear interrupt status */ /* initially clear interrupt status */
readb(MLC_IRQ_SR(host->io_base)); readb(MLC_IRQ_SR(host->io_base));
...@@ -794,10 +798,11 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) ...@@ -794,10 +798,11 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
} }
/* /*
* Fills out all the uninitialized function pointers with the defaults * Scan to find existence of the device and get the type of NAND device:
* And scans for a bad block table if appropriate. * SMALL block or LARGE block.
*/ */
res = nand_scan_tail(mtd); nand_chip->dummy_controller.ops = &lpc32xx_nand_controller_ops;
res = nand_scan(mtd, 1);
if (res) if (res)
goto free_irq; goto free_irq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment