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

mtd: spinand: Add spinand_init_flash() helper

Browse Source 
Add spinand_init_flash() helper which implement
all needed init for future SPI-NAND resume ops.

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210602094913.26472-3-patrice.chotard@foss.st.com
This commit is contained in:
Patrice Chotard 2021-06-02 11:49:12 +02:00 committed by Miquel Raynal
parent ff0cd841d2
commit 41e005c23e
1 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/mtd/nand/spi/core.c
View File

@ -1086,12 +1086,55 @@ static int spinand_detect(struct spinand_device *spinand)
return 0; return 0;
} }
static int spinand_init_flash(struct spinand_device *spinand)
{
struct device *dev = &spinand->spimem->spi->dev;
struct nand_device *nand = spinand_to_nand(spinand);
int ret, i;
ret = spinand_read_cfg(spinand);
if (ret)
return ret;
ret = spinand_init_quad_enable(spinand);
if (ret)
return ret;
ret = spinand_upd_cfg(spinand, CFG_OTP_ENABLE, 0);
if (ret)
return ret;
ret = spinand_manufacturer_init(spinand);
if (ret) {
dev_err(dev,
"Failed to initialize the SPI NAND chip (err = %d)\n",
ret);
return ret;
}
/* After power up, all blocks are locked, so unlock them here. */
for (i = 0; i < nand->memorg.ntargets; i++) {
ret = spinand_select_target(spinand, i);
if (ret)
break;
ret = spinand_lock_block(spinand, BL_ALL_UNLOCKED);
if (ret)
break;
}
if (ret)
spinand_manufacturer_cleanup(spinand);
return ret;
}
static int spinand_init(struct spinand_device *spinand) static int spinand_init(struct spinand_device *spinand)
{ {
struct device *dev = &spinand->spimem->spi->dev; struct device *dev = &spinand->spimem->spi->dev;
struct mtd_info *mtd = spinand_to_mtd(spinand); struct mtd_info *mtd = spinand_to_mtd(spinand);
struct nand_device *nand = mtd_to_nanddev(mtd); struct nand_device *nand = mtd_to_nanddev(mtd);
int ret, i; int ret;
/* /*
* We need a scratch buffer because the spi_mem interface requires that * We need a scratch buffer because the spi_mem interface requires that
@ -1124,26 +1167,10 @@ static int spinand_init(struct spinand_device *spinand)
if (ret) if (ret)
goto err_free_bufs; goto err_free_bufs;
ret = spinand_read_cfg(spinand); ret = spinand_init_flash(spinand);
if (ret) if (ret)
goto err_free_bufs; goto err_free_bufs;
ret = spinand_init_quad_enable(spinand);
if (ret)
goto err_free_bufs;
ret = spinand_upd_cfg(spinand, CFG_OTP_ENABLE, 0);
if (ret)
goto err_free_bufs;
ret = spinand_manufacturer_init(spinand);
if (ret) {
dev_err(dev,
"Failed to initialize the SPI NAND chip (err = %d)\n",
ret);
goto err_free_bufs;
}
ret = spinand_create_dirmaps(spinand); ret = spinand_create_dirmaps(spinand);
if (ret) { if (ret) {
dev_err(dev, dev_err(dev,
@ -1152,17 +1179,6 @@ static int spinand_init(struct spinand_device *spinand)
goto err_manuf_cleanup; goto err_manuf_cleanup;
} }
/* After power up, all blocks are locked, so unlock them here. */
for (i = 0; i < nand->memorg.ntargets; i++) {
ret = spinand_select_target(spinand, i);
if (ret)
goto err_manuf_cleanup;
ret = spinand_lock_block(spinand, BL_ALL_UNLOCKED);
if (ret)
goto err_manuf_cleanup;
}
ret = nanddev_init(nand, &spinand_ops, THIS_MODULE); ret = nanddev_init(nand, &spinand_ops, THIS_MODULE);
if (ret) if (ret)
goto err_manuf_cleanup; goto err_manuf_cleanup;