Commit abc846af authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: fsl_upm: Inherit from nand_controller 



Explicitly inherit from nand_controller instead of relying on the
nand_chip.legacy.dummy_controller field.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200603134922.1352340-8-boris.brezillon@collabora.com
parent a50895bb

drivers/mtd/nand/raw/fsl_upm.c

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#define FSL_UPM_WAIT_WRITE_BUFFER 0x4



struct fsl_upm_nand {

	struct nand_controller base;

	struct device *dev;

	struct nand_chip chip;

	int last_ctrl;
@@ -167,6 +168,7 @@ static int fun_chip_init(struct fsl_upm_nand *fun, 
	if (!fun->rnb_gpio[0])

		fun->chip.legacy.dev_ready = fun_chip_ready;



	fun->chip.controller = &fun->base;

	mtd->dev.parent = fun->dev;



	flash_np = of_get_next_child(upm_np, NULL);
@@ -268,6 +270,7 @@ static int fun_probe(struct platform_device *ofdev) 
		fun->wait_flags = FSL_UPM_WAIT_RUN_PATTERN |

				  FSL_UPM_WAIT_WRITE_BYTE;



	nand_controller_init(&fun->base);

	fun->dev = &ofdev->dev;

	fun->last_ctrl = NAND_CLE;