mtd: nand: omap: Use gpmc_omap_get_nand_ops() to get NAND registers

Deprecate nand register passing via platform data and use gpmc_omap_get_nand_ops() instead.

Roger Quadros committed 11 years ago

Commit c509aef1 parent 384258f3 files · +11 −4Browse files

Unified · Split

3 files

@@ -121,8 +121,6 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data, · 120 unmodified lines
121	if (err < 0)	121	if (err < 0)
122	goto out_free_cs;	122	goto out_free_cs;
123		123
124	gpmc_update_nand_reg(&gpmc_nand_data->reg, gpmc_nand_data->cs);
125
126	if (!gpmc_hwecc_bch_capable(gpmc_nand_data->ecc_opt)) {	124	if (!gpmc_hwecc_bch_capable(gpmc_nand_data->ecc_opt)) {
127	pr_err("omap2-nand: Unsupported NAND ECC scheme selected\n");	125	pr_err("omap2-nand: Unsupported NAND ECC scheme selected\n");
128	err = -EINVAL;	126	err = -EINVAL;

 #include <linux/mtd/nand_bch.h>
 #include <linux/platform_data/elm.h>
+#include <linux/omap-gpmc.h>
 #include <linux/platform_data/mtd-nand-omap2.h>
 #define	DRIVER_NAME	"omap2-nand"
 	} iomode;
 	u_char				*buf;
 	int					buf_len;
+	/* Interface to GPMC */
 	struct gpmc_nand_regs		reg;
+	struct gpmc_nand_ops		*ops;
 	/* generated at runtime depending on ECC algorithm and layout selected */
 	struct nand_ecclayout		oobinfo;
 	/* fields specific for BCHx_HW ECC scheme */
 	platform_set_drvdata(pdev, info);
+	info->ops = gpmc_omap_get_nand_ops(&info->reg, info->gpmc_cs);
+	if (!info->ops) {
+		dev_err(&pdev->dev, "Failed to get GPMC->NAND interface\n");
+		return -ENODEV;
+	}
 	info->pdev		= pdev;
 	info->gpmc_cs		= pdata->cs;
-	info->reg		= pdata->reg;
 	info->of_node		= pdata->of_node;
 	info->ecc_opt		= pdata->ecc_opt;
 	nand_chip		= &info->nand;

 	enum nand_io		xfer_type;
 	int			devsize;
 	enum omap_ecc           ecc_opt;
-	struct gpmc_nand_regs	reg;
 	/* for passing the partitions */
 	struct device_node	*of_node;
 	struct device_node	*elm_of_node;
+	/* deprecated */
+	struct gpmc_nand_regs	reg;
 };
 #endif

Keyboard shortcuts