diff options
| author | Teresa Remmet <t.remmet@phytec.de> | 2016-07-05 11:32:30 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-07-14 17:57:36 +0200 |
| commit | 7ce9ea7e6b35a652034486133174d4e17055cef5 (patch) | |
| tree | 90ca4a1f075186d73c971b2090717061aa0197d5 /drivers/mtd | |
| parent | MAINTAINERS: Add file patterns for mtd device tree bindings (diff) | |
| download | linux-7ce9ea7e6b35a652034486133174d4e17055cef5.tar.xz linux-7ce9ea7e6b35a652034486133174d4e17055cef5.zip | |
mtd: nand: omap2: Add check for old elm binding
commit c9711ec5250b ("mtd: nand: omap: Clean up device tree support")
removes the check for the old elm phandle binding.
Add it again to keep backward compatibility.
Fixes: commit c9711ec5250b ("mtd: nand: omap: Clean up device tree support")
Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 08e158895635..a136da8df6fe 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1657,8 +1657,11 @@ static int omap_get_dt_info(struct device *dev, struct omap_nand_info *info) /* detect availability of ELM module. Won't be present pre-OMAP4 */ info->elm_of_node = of_parse_phandle(child, "ti,elm-id", 0); - if (!info->elm_of_node) - dev_dbg(dev, "ti,elm-id not in DT\n"); + if (!info->elm_of_node) { + info->elm_of_node = of_parse_phandle(child, "elm_id", 0); + if (!info->elm_of_node) + dev_dbg(dev, "ti,elm-id not in DT\n"); + } /* select ecc-scheme for NAND */ if (of_property_read_string(child, "ti,nand-ecc-opt", &s)) { |