Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f679888f authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: nand: omap2: rely on generic DT parsing done in nand_scan_ident() 



The core now takes care of parsing generic DT properties in
nand_scan_ident() when nand_set_flash_node() has been called.
Rely on this initialization instead of calling of_get_nand_xxx()
manually.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarRoger Quadros <rogerq@ti.com>
Tested-by: default avatarFranklin S Cooper Jr. <fcooper@ti.com>
parent 24d990e2

drivers/memory/omap-gpmc.c

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/platform_device.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_mtd.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>

#include <linux/omap-gpmc.h>
@@ -2066,7 +2065,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, 


	if (of_device_is_compatible(child, "ti,omap2-nand")) {

		/* NAND specific setup */

		val = of_get_nand_bus_width(child);

		val = 8;

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

		switch (val) {

		case 8:

			gpmc_s.device_width = GPMC_DEVWIDTH_8BIT;

drivers/mtd/nand/omap2.c

+7 −11
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/slab.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_mtd.h>



#include <linux/mtd/nand_bch.h>

#include <linux/platform_data/elm.h>
@@ -1701,7 +1700,7 @@ static int omap_get_dt_info(struct device *dev, struct omap_nand_info *info) 
		for (i = 0; i < ARRAY_SIZE(nand_xfer_types); i++) {

			if (!strcasecmp(s, nand_xfer_types[i])) {

				info->xfer_type = i;

				goto next;

				return 0;

			}

		}
@@ -1709,12 +1708,6 @@ static int omap_get_dt_info(struct device *dev, struct omap_nand_info *info) 
		return -EINVAL;

	}



next:

	of_get_nand_on_flash_bbt(child);



	if (of_get_nand_bus_width(child) == 16)

		info->devsize = NAND_BUSWIDTH_16;



	return 0;

}
@@ -1810,9 +1803,7 @@ static int omap_nand_probe(struct platform_device *pdev) 
	}



	if (info->flash_bbt)

		nand_chip->bbt_options |= NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB;

	else

		nand_chip->options |= NAND_SKIP_BBTSCAN;

		nand_chip->bbt_options |= NAND_BBT_USE_FLASH;



	/* scan NAND device connected to chip controller */

	nand_chip->options |= info->devsize & NAND_BUSWIDTH_16;
@@ -1823,6 +1814,11 @@ static int omap_nand_probe(struct platform_device *pdev) 
		goto return_error;

	}



	if (nand_chip->bbt_options & NAND_BBT_USE_FLASH)

		nand_chip->bbt_options |= NAND_BBT_NO_OOB;

	else

		nand_chip->options |= NAND_SKIP_BBTSCAN;



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

	switch (info->xfer_type) {

	case NAND_OMAP_PREFETCH_POLLED: