mtd: rawnand: sm_common: convert driver to nand_scan_with_ids()
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_with_ids() (alternative to nand_scan() for passing a flash IDs table) 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:
Родитель
92aa292d2e
Коммит
fe13ae02b0
|
@ -160,19 +160,9 @@ static struct nand_flash_dev nand_xd_flash_ids[] = {
|
||||||
{NULL}
|
{NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
int sm_register_device(struct mtd_info *mtd, int smartmedia)
|
static int sm_attach_chip(struct nand_chip *chip)
|
||||||
{
|
{
|
||||||
struct nand_chip *chip = mtd_to_nand(mtd);
|
struct mtd_info *mtd = nand_to_mtd(chip);
|
||||||
int ret;
|
|
||||||
|
|
||||||
chip->options |= NAND_SKIP_BBTSCAN;
|
|
||||||
|
|
||||||
/* Scan for card properties */
|
|
||||||
ret = nand_scan_ident(mtd, 1, smartmedia ?
|
|
||||||
nand_smartmedia_flash_ids : nand_xd_flash_ids);
|
|
||||||
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
/* Bad block marker position */
|
/* Bad block marker position */
|
||||||
chip->badblockpos = 0x05;
|
chip->badblockpos = 0x05;
|
||||||
|
@ -187,8 +177,25 @@ int sm_register_device(struct mtd_info *mtd, int smartmedia)
|
||||||
else
|
else
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
ret = nand_scan_tail(mtd);
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct nand_controller_ops sm_controller_ops = {
|
||||||
|
.attach_chip = sm_attach_chip,
|
||||||
|
};
|
||||||
|
|
||||||
|
int sm_register_device(struct mtd_info *mtd, int smartmedia)
|
||||||
|
{
|
||||||
|
struct nand_chip *chip = mtd_to_nand(mtd);
|
||||||
|
struct nand_flash_dev *flash_ids;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
chip->options |= NAND_SKIP_BBTSCAN;
|
||||||
|
|
||||||
|
/* Scan for card properties */
|
||||||
|
chip->dummy_controller.ops = &sm_controller_ops;
|
||||||
|
flash_ids = smartmedia ? nand_smartmedia_flash_ids : nand_xd_flash_ids;
|
||||||
|
ret = nand_scan_with_ids(mtd, 1, flash_ids);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче