diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2024-05-16 10:55:25 +0200 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2024-05-16 10:55:36 +0200 |
| commit | 552c9380f98fc47950870ef0935f94cf3acec087 (patch) | |
| tree | edd9e6adac956fd7ee21bc4302183d822994a954 /drivers/mtd | |
| parent | 964b8998fdce789fd06540e414fe0a044ccf5127 (diff) | |
| parent | 6819db94e1cd3ce24a432f3616cd563ed0c4eaba (diff) | |
| download | linux-552c9380f98fc47950870ef0935f94cf3acec087.tar.gz linux-552c9380f98fc47950870ef0935f94cf3acec087.tar.bz2 linux-552c9380f98fc47950870ef0935f94cf3acec087.zip | |
Merge tag 'nand/for-6.10' into mtd/next
Raw NAND:
Two small fixes, one in the Hynix vendor code for properly returning an
error which might have been ignored and another in the Davinci driver to
properly synchronize the controller with the gpio domain.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/raw/davinci_nand.c | 5 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/nand_hynix.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c index e75d81cf8c21..051deea768db 100644 --- a/drivers/mtd/nand/raw/davinci_nand.c +++ b/drivers/mtd/nand/raw/davinci_nand.c @@ -671,8 +671,11 @@ static int davinci_nand_exec_instr(struct davinci_nand_info *info, break; } - if (instr->delay_ns) + if (instr->delay_ns) { + /* Dummy read to be sure that command is sent before ndelay starts */ + davinci_nand_readl(info, 0); ndelay(instr->delay_ns); + } return 0; } diff --git a/drivers/mtd/nand/raw/nand_hynix.c b/drivers/mtd/nand/raw/nand_hynix.c index a74e64e0cfa3..c02e50608816 100644 --- a/drivers/mtd/nand/raw/nand_hynix.c +++ b/drivers/mtd/nand/raw/nand_hynix.c @@ -401,7 +401,7 @@ static int hynix_nand_rr_init(struct nand_chip *chip) if (ret) pr_warn("failed to initialize read-retry infrastructure"); - return 0; + return ret; } static void hynix_nand_extract_oobsize(struct nand_chip *chip, |