diff options
| author |   Boris Brezillon <boris.brezillon@bootlin.com> | 2018-11-11 08:55:16 +0100 |
|---|---|---|
| committer |   Miquel Raynal <miquel.raynal@bootlin.com> | 2018-12-07 10:38:25 +0100 |
| commit | 02b4a52604a4d1734a666ed11f9fb43afff10656 (patch) | |
| tree | c66edcf2d423cf3cfacf8c5ece362c71f1308b0a /drivers/mtd/nand/raw/nand_base.c | |
| parent | mtd: rawnand: Pass the CS line to be selected in struct nand_operation (diff) | |
| download | linux-dev-02b4a52604a4d1734a666ed11f9fb43afff10656.tar.xz linux-dev-02b4a52604a4d1734a666ed11f9fb43afff10656.zip | |
mtd: rawnand: Make ->select_chip() optional when ->exec_op() is implemented
Now that the CS to be selected on a nand_operation is passed in
nand_operation->cs we can make the ->select_chip() hook optional for
drivers implementing ->exec_op().
When not implemented, the core is assuming the CS line is automatically
asserted/deasserted by the driver ->exec_op() implementation.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Tested-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/mtd/nand/raw/nand_base.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 7aa661f76891..93a19f551796 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -247,7 +247,9 @@ void nand_select_target(struct nand_chip *chip, unsigned int cs) return; chip->cur_cs = cs; - chip->select_chip(chip, cs); + + if (chip->select_chip) + chip->select_chip(chip, cs); } EXPORT_SYMBOL_GPL(nand_select_target); @@ -260,7 +262,9 @@ EXPORT_SYMBOL_GPL(nand_select_target); */ void nand_deselect_target(struct nand_chip *chip) { - chip->select_chip(chip, -1); + if (chip->select_chip) + chip->select_chip(chip, -1); + chip->cur_cs = -1; } EXPORT_SYMBOL_GPL(nand_deselect_target); @@ -5021,11 +5025,6 @@ static int nand_scan_ident(struct nand_chip *chip, unsigned int maxchips, if (!mtd->name && mtd->dev.parent) mtd->name = dev_name(mtd->dev.parent); - if (chip->exec_op && !chip->select_chip) { - pr_err("->select_chip() is mandatory when implementing ->exec_op()\n"); - return -EINVAL; - } - ret = nand_legacy_check_hooks(chip); if (ret) return ret; |