Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-2
+1
MAINTAINERS
+1
MAINTAINERS
+5
-2
drivers/mtd/nand/omap2.c
+5
-2
drivers/mtd/nand/omap2.c
···
1657
1657
1658
1658
/* detect availability of ELM module. Won't be present pre-OMAP4 */
1659
1659
info->elm_of_node = of_parse_phandle(child, "ti,elm-id", 0);
1660
-
if (!info->elm_of_node)
1661
-
dev_dbg(dev, "ti,elm-id not in DT\n");
1660
+
if (!info->elm_of_node) {
1661
+
info->elm_of_node = of_parse_phandle(child, "elm_id", 0);
1662
+
if (!info->elm_of_node)
1663
+
dev_dbg(dev, "ti,elm-id not in DT\n");
1664
+
}
1662
1665
1663
1666
/* select ecc-scheme for NAND */
1664
1667
if (of_property_read_string(child, "ti,nand-ecc-opt", &s)) {