Commit f2f8115f authored by Roger Quadros's avatar Roger Quadros Committed by Krzysztof Kozlowski
Browse files

memory: omap-gpmc: Use a compatible match table when checking for NAND controller 



As more compatibles can be added to the GPMC NAND controller driver
use a compatible match table.

Signed-off-by: default avatarRoger Quadros <rogerq@kernel.org>
Acked-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20211221131757.2030-4-rogerq@kernel.org


[krzysztof: remove "is_nand" variable]
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
parent 7e58accf

drivers/memory/omap-gpmc.c

+1 −1
Original line number Diff line number Diff line
@@ -2183,7 +2183,7 @@ 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)) {

		/* NAND specific setup */

		val = 8;

		of_property_read_u32(child, "nand-bus-width", &val);

drivers/mtd/nand/raw/omap2.c

+1 −4
Original line number Diff line number Diff line
@@ -2352,10 +2352,7 @@ static int omap_nand_remove(struct platform_device *pdev) 
	return ret;

}



static const struct of_device_id omap_nand_ids[] = {

	{ .compatible = "ti,omap2-nand", },

	{},

};

/* omap_nand_ids defined in linux/platform_data/mtd-nand-omap2.h */

MODULE_DEVICE_TABLE(of, omap_nand_ids);



static struct platform_driver omap_nand_driver = {

include/linux/platform_data/mtd-nand-omap2.h

+8 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#define	_MTD_NAND_OMAP2_H



#include <linux/mtd/partitions.h>

#include <linux/mod_devicetable.h>



#define	GPMC_BCH_NUM_REMAINDER	8
@@ -61,4 +62,10 @@ struct gpmc_nand_regs { 
	void __iomem	*gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER];

	void __iomem	*gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER];

};

#endif
 


static const struct of_device_id omap_nand_ids[] = {

	{ .compatible = "ti,omap2-nand", },

	{},

};



#endif /* _MTD_NAND_OMAP2_H */