Thread (13 messages) 13 messages, 3 authors, 2021-12-22

Re: [PATCH v4 3/4] memory: omap-gpmc: Use a compatible match table when checking for NAND controller

From: Roger Quadros <rogerq@kernel.org>
Date: 2021-12-22 17:04:38
Also in: linux-omap, lkml


On 22/12/2021 17:49, Krzysztof Kozlowski wrote:
On 22/12/2021 15:18, Miquel Raynal wrote:
quoted
Hi Roger,

rogerq@kernel.org wrote on Tue, 21 Dec 2021 22:01:28 +0200:
quoted
Hi Miquel,

On 21/12/2021 15:17, Roger Quadros wrote:
quoted
As more compatibles can be added to the GPMC NAND controller driver
use a compatible match table.

Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
 drivers/memory/omap-gpmc.c                   | 6 +++++-
 drivers/mtd/nand/raw/omap2.c                 | 5 +----  
Will need your Ack for this one as well. Thanks :)

quoted
 include/linux/platform_data/mtd-nand-omap2.h | 9 ++++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)  
cheers,
-roger
quoted
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 624153048182..d19ffc895e5b 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -2091,6 +2091,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
 	u32 val;
 	struct gpio_desc *waitpin_desc = NULL;
 	struct gpmc_device *gpmc = platform_get_drvdata(pdev);
+	bool is_nand = false;
 
 	if (of_property_read_u32(child, "reg", &cs) < 0) {
 		dev_err(&pdev->dev, "%pOF has no 'reg' property\n",
@@ -2183,7 +2184,10 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
 		}
 	}
 
-	if (of_device_is_compatible(child, "ti,omap2-nand")) {
+	if (of_match_node(omap_nand_ids, child))
+		is_nand = true;
+
+	if (is_nand) {
nitpick: why this intermediate variable?
Indeed, it looks useless. I think it is left-over from previous version.
I will remove it while applying.
You are right. Thanks for saving me a re-spin Krzysztof :)

cheers,
-roger
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help