diff options
| author |   Boris Brezillon <boris.brezillon@bootlin.com> | 2018-11-20 10:02:33 +0100 |
|---|---|---|
| committer |   Miquel Raynal <miquel.raynal@bootlin.com> | 2018-12-07 10:54:44 +0100 |
| commit | ad71148c1804c334544068514bc318bfd3490334 (patch) | |
| tree | cc7a69b8d9d715ba1b79b13765246ca4ae68da0a /drivers/mtd | |
| parent | mtd: rawnand: fsmc: Make conversion from chip to fsmc consistent (diff) | |
| download | linux-dev-ad71148c1804c334544068514bc318bfd3490334.tar.xz linux-dev-ad71148c1804c334544068514bc318bfd3490334.zip | |
mtd: rawnand: fsmc: Stop using the dummy controller obj
The dummy controller is kept around to support old drivers. Let's
patch this one and declare our own nand_controller instance.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/raw/fsmc_nand.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c index 23d00a2c926f..db5174c336d4 100644 --- a/drivers/mtd/nand/raw/fsmc_nand.c +++ b/drivers/mtd/nand/raw/fsmc_nand.c @@ -122,6 +122,7 @@ enum access_mode { /** * struct fsmc_nand_data - structure for FSMC NAND device state * + * @base: Inherit from the nand_controller struct * @pid: Part ID on the AMBA PrimeCell format * @nand: Chip related info for a NAND flash. * @@ -143,6 +144,7 @@ enum access_mode { * @regs_va: Registers base address for a given bank. */ struct fsmc_nand_data { + struct nand_controller base; u32 pid; struct nand_chip nand; @@ -1117,10 +1119,13 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) nand->ecc.strength = 8; } + nand_controller_init(&host->base); + host->base.ops = &fsmc_nand_controller_ops; + nand->controller = &host->base; + /* * Scan to find existence of the device */ - nand->dummy_controller.ops = &fsmc_nand_controller_ops; ret = nand_scan(nand, 1); if (ret) goto release_dma_write_chan; |