summaryrefslogtreecommitdiffstats
path: root/drivers/memory
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2016-04-19 20:29:58 +0200
committerBoris Brezillon <boris.brezillon@free-electrons.com>2016-04-19 22:04:54 +0200
commitf679888f29fe5c4a4c44459f2c1fc62b72188773 (patch)
tree9067cfb0cbe4700ce3eb6fe5009a161a5d5e5b38 /drivers/memory
parent24d990e237d1822fb108ed9be41d1542af001185 (diff)
downloadop-kernel-dev-f679888f29fe5c4a4c44459f2c1fc62b72188773.zip
op-kernel-dev-f679888f29fe5c4a4c44459f2c1fc62b72188773.tar.gz
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: Boris Brezillon <boris.brezillon@free-electrons.com> Acked-by: Roger Quadros <rogerq@ti.com> Tested-by: Franklin S Cooper Jr. <fcooper@ti.com>
Diffstat (limited to 'drivers/memory')
-rw-r--r--drivers/memory/omap-gpmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 33d69b1..af4884b 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -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;
OpenPOWER on IntegriCloud