Commit 01b95fc6 authored by Roger Quadros's avatar Roger Quadros
Browse files

mtd: nand: omap: Copy platform data parameters to omap_nand_info data 



Copy all the platform data parameters to the driver's local data
structure 'omap_nand_info' and use it in the entire driver. This will
make it easer for device tree migration.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Acked-by: default avatarBrian Norris <computersforpeace@gmail.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
parent d6e55216

drivers/mtd/nand/omap2.c

+18 −8
Original line number Diff line number Diff line
@@ -152,13 +152,17 @@ static struct nand_hw_control omap_gpmc_controller = { 
};



struct omap_nand_info {

	struct omap_nand_platform_data	*pdata;

	struct nand_chip		nand;

	struct platform_device		*pdev;



	int				gpmc_cs;

	unsigned long			phys_base;

	bool				dev_ready;

	enum nand_io			xfer_type;

	int				devsize;

	enum omap_ecc			ecc_opt;

	struct device_node		*elm_of_node;



	unsigned long			phys_base;

	struct completion		comp;

	struct dma_chan			*dma;

	int				gpmc_irq_fifo;
@@ -1631,7 +1635,7 @@ static bool omap2_nand_ecc_check(struct omap_nand_info *info, 
			"CONFIG_MTD_NAND_OMAP_BCH not enabled\n");

		return false;

	}

	if (ecc_needs_elm && !is_elm_present(info, pdata->elm_of_node)) {

	if (ecc_needs_elm && !is_elm_present(info, info->elm_of_node)) {

		dev_err(&info->pdev->dev, "ELM not available\n");

		return false;

	}
@@ -1675,6 +1679,11 @@ static int omap_nand_probe(struct platform_device *pdev) 
	info->gpmc_cs		= pdata->cs;

	info->of_node		= pdata->of_node;

	info->ecc_opt		= pdata->ecc_opt;

	info->dev_ready	= pdata->dev_ready;

	info->xfer_type = pdata->xfer_type;

	info->devsize = pdata->devsize;

	info->elm_of_node = pdata->elm_of_node;



	nand_chip		= &info->nand;

	mtd			= nand_to_mtd(nand_chip);

	mtd->dev.parent		= &pdev->dev;
@@ -1700,7 +1709,7 @@ static int omap_nand_probe(struct platform_device *pdev) 
	 * chip delay which is slightly more than tR (AC Timing) of the NAND

	 * device and read status register until you get a failure or success

	 */

	if (pdata->dev_ready) {

	if (info->dev_ready) {

		nand_chip->dev_ready = omap_dev_ready;

		nand_chip->chip_delay = 0;

	} else {
@@ -1714,15 +1723,16 @@ static int omap_nand_probe(struct platform_device *pdev) 
		nand_chip->options |= NAND_SKIP_BBTSCAN;



	/* scan NAND device connected to chip controller */

	nand_chip->options |= pdata->devsize & NAND_BUSWIDTH_16;

	nand_chip->options |= info->devsize & NAND_BUSWIDTH_16;

	if (nand_scan_ident(mtd, 1, NULL)) {

		dev_err(&info->pdev->dev, "scan failed, may be bus-width mismatch\n");

		dev_err(&info->pdev->dev,

			"scan failed, may be bus-width mismatch\n");

		err = -ENXIO;

		goto return_error;

	}



	/* re-populate low-level callbacks based on xfer modes */

	switch (pdata->xfer_type) {

	switch (info->xfer_type) {

	case NAND_OMAP_PREFETCH_POLLED:

		nand_chip->read_buf   = omap_read_buf_pref;

		nand_chip->write_buf  = omap_write_buf_pref;
@@ -1802,7 +1812,7 @@ static int omap_nand_probe(struct platform_device *pdev) 


	default:

		dev_err(&pdev->dev,

			"xfer_type(%d) not supported!\n", pdata->xfer_type);

			"xfer_type(%d) not supported!\n", info->xfer_type);

		err = -EINVAL;

		goto return_error;

	}