diff options
author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-04-19 14:29:58 -0400 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-04-19 16:04:54 -0400 |
commit | f679888f29fe5c4a4c44459f2c1fc62b72188773 (patch) | |
tree | 9067cfb0cbe4700ce3eb6fe5009a161a5d5e5b38 /drivers/memory | |
parent | 24d990e237d1822fb108ed9be41d1542af001185 (diff) |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index 33d69b1e4c31..af4884ba6b7c 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
28 | #include <linux/of.h> | 28 | #include <linux/of.h> |
29 | #include <linux/of_address.h> | 29 | #include <linux/of_address.h> |
30 | #include <linux/of_mtd.h> | ||
31 | #include <linux/of_device.h> | 30 | #include <linux/of_device.h> |
32 | #include <linux/of_platform.h> | 31 | #include <linux/of_platform.h> |
33 | #include <linux/omap-gpmc.h> | 32 | #include <linux/omap-gpmc.h> |
@@ -2066,7 +2065,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, | |||
2066 | 2065 | ||
2067 | if (of_device_is_compatible(child, "ti,omap2-nand")) { | 2066 | if (of_device_is_compatible(child, "ti,omap2-nand")) { |
2068 | /* NAND specific setup */ | 2067 | /* NAND specific setup */ |
2069 | val = of_get_nand_bus_width(child); | 2068 | val = 8; |
2069 | of_property_read_u32(child, "nand-bus-width", &val); | ||
2070 | switch (val) { | 2070 | switch (val) { |
2071 | case 8: | 2071 | case 8: |
2072 | gpmc_s.device_width = GPMC_DEVWIDTH_8BIT; | 2072 | gpmc_s.device_width = GPMC_DEVWIDTH_8BIT; |