Merge tag 'nand/for-6.10' into mtd/next

miquelraynal · miquelraynal · commit 552c9380f98f · 2024-05-16T10:55:36.000+02:00
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 &lt;miquel.raynal@bootlin.com&gt;
diff --git 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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -671,8 +671,11 @@ static int davinci_nand_exec_instr(struct davinci_nand_info *info,`
`671`	`671`	`break;`
`672`	`672`	`}`
`673`	`673`
`674`		`- if (instr->delay_ns)`
	`674`	`+ if (instr->delay_ns) {`
	`675`	`+ /* Dummy read to be sure that command is sent before ndelay starts */`
	`676`	`+ davinci_nand_readl(info, 0);`
`675`	`677`	`ndelay(instr->delay_ns);`
	`678`	`+ }`
`676`	`679`
`677`	`680`	`return 0;`
`678`	`681`	`}`
Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ static int hynix_nand_rr_init(struct nand_chip *chip)`
`401`	`401`	`if (ret)`
`402`	`402`	`pr_warn("failed to initialize read-retry infrastructure");`
`403`	`403`
`404`		`- return 0;`
	`404`	`+ return ret;`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`static void hynix_nand_extract_oobsize(struct nand_chip *chip,`