Commit ad71148c authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal

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: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 1e809f7e
...@@ -122,6 +122,7 @@ enum access_mode { ...@@ -122,6 +122,7 @@ enum access_mode {
/** /**
* struct fsmc_nand_data - structure for FSMC NAND device state * 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 * @pid: Part ID on the AMBA PrimeCell format
* @nand: Chip related info for a NAND flash. * @nand: Chip related info for a NAND flash.
* *
...@@ -143,6 +144,7 @@ enum access_mode { ...@@ -143,6 +144,7 @@ enum access_mode {
* @regs_va: Registers base address for a given bank. * @regs_va: Registers base address for a given bank.
*/ */
struct fsmc_nand_data { struct fsmc_nand_data {
struct nand_controller base;
u32 pid; u32 pid;
struct nand_chip nand; struct nand_chip nand;
...@@ -1117,10 +1119,13 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) ...@@ -1117,10 +1119,13 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
nand->ecc.strength = 8; 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 * Scan to find existence of the device
*/ */
nand->dummy_controller.ops = &fsmc_nand_controller_ops;
ret = nand_scan(nand, 1); ret = nand_scan(nand, 1);
if (ret) if (ret)
goto release_dma_write_chan; goto release_dma_write_chan;
......
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