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

mtd: rawnand: gpio: Inherit from nand_controller

Inherit from nand_controller so we don't rely on the
nand_chip.legacy.dummy_controller field.
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200603150746.1423257-2-boris.brezillon@collabora.com
parent 8fac41eb
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/of_address.h> #include <linux/of_address.h>
struct gpiomtd { struct gpiomtd {
struct nand_controller base;
void __iomem *io_sync; void __iomem *io_sync;
struct nand_chip nand_chip; struct nand_chip nand_chip;
struct gpio_nand_platdata plat; struct gpio_nand_platdata plat;
...@@ -273,6 +274,7 @@ static int gpio_nand_probe(struct platform_device *pdev) ...@@ -273,6 +274,7 @@ static int gpio_nand_probe(struct platform_device *pdev)
if (gpiomtd->rdy) if (gpiomtd->rdy)
chip->legacy.dev_ready = gpio_nand_devready; chip->legacy.dev_ready = gpio_nand_devready;
nand_controller_init(&gpiomtd->base);
nand_set_flash_node(chip, pdev->dev.of_node); nand_set_flash_node(chip, pdev->dev.of_node);
chip->legacy.IO_ADDR_W = chip->legacy.IO_ADDR_R; chip->legacy.IO_ADDR_W = chip->legacy.IO_ADDR_R;
chip->ecc.mode = NAND_ECC_SOFT; chip->ecc.mode = NAND_ECC_SOFT;
...@@ -280,6 +282,7 @@ static int gpio_nand_probe(struct platform_device *pdev) ...@@ -280,6 +282,7 @@ static int gpio_nand_probe(struct platform_device *pdev)
chip->options = gpiomtd->plat.options; chip->options = gpiomtd->plat.options;
chip->legacy.chip_delay = gpiomtd->plat.chip_delay; chip->legacy.chip_delay = gpiomtd->plat.chip_delay;
chip->legacy.cmd_ctrl = gpio_nand_cmd_ctrl; chip->legacy.cmd_ctrl = gpio_nand_cmd_ctrl;
chip->controller = &gpiomtd->base;
mtd = nand_to_mtd(chip); mtd = nand_to_mtd(chip);
mtd->dev.parent = dev; mtd->dev.parent = dev;
......
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