leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: rawnand: omap2: Use nand_controller_init()

Browse Source 
Stop initializing omap_gpmc_controller fields are declaration time and
replace that by a call to nand_controller_init(). Since the same object
might be shared by several NAND chips and the NAND controller driver
expects a ->probe() per-chip, we need to keep track of the
omap_gpmc_controller state (whether it's already been initialized or
not).

Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
Boris Brezillon 2018-11-20 11:57:18 +01:00 committed by Miquel Raynal
parent a0916c94e9
commit efe5d132cb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mtd/nand/raw/omap2.c
View File

@ -2173,11 +2173,8 @@ static const struct nand_controller_ops omap_nand_controller_ops = {
}; };
/* Shared among all NAND instances to synchronize access to the ECC Engine */ /* Shared among all NAND instances to synchronize access to the ECC Engine */
static struct nand_controller omap_gpmc_controller = { static struct nand_controller omap_gpmc_controller;
.lock = __SPIN_LOCK_UNLOCKED(omap_gpmc_controller.lock), static bool omap_gpmc_controller_initialized;
.wq = __WAIT_QUEUE_HEAD_INITIALIZER(omap_gpmc_controller.wq),
.ops = &omap_nand_controller_ops,
};
static int omap_nand_probe(struct platform_device *pdev) static int omap_nand_probe(struct platform_device *pdev)
{ {
@ -2227,6 +2224,12 @@ static int omap_nand_probe(struct platform_device *pdev)
info->phys_base = res->start; info->phys_base = res->start;
if (!omap_gpmc_controller_initialized) {
omap_gpmc_controller.ops = &omap_nand_controller_ops;
nand_controller_init(&omap_gpmc_controller);
omap_gpmc_controller_initialized = true;
}
nand_chip->controller = &omap_gpmc_controller; nand_chip->controller = &omap_gpmc_controller;
nand_chip->legacy.IO_ADDR_W = nand_chip->legacy.IO_ADDR_R; nand_chip->legacy.IO_ADDR_W = nand_chip->legacy.IO_ADDR_R;