Merge tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd

Pull MTD fix from Brian Norris:
 "Late MTD fix for v4.7:

  One regression in the Device Tree handling for OMAP NAND handling of
  the ELM node.  TI migrated to using the property name "ti,elm-id", but
  forgot to keep compatibility with the old "elm_id" property.

  Also, might as well send out this MAINTAINERS fixup now"

* tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd:
  mtd: nand: omap2: Add check for old elm binding
  MAINTAINERS: Add file patterns for mtd device tree bindings

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)) {