Skip to content

Commit 7ce9ea7

Browse files
tremmetcomputersforpeace
authored andcommitted
mtd: nand: omap2: Add check for old elm binding
commit c9711ec ("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 c9711ec ("mtd: nand: omap: Clean up device tree support") Signed-off-by: Teresa Remmet <[email protected]> Signed-off-by: Brian Norris <[email protected]>
1 parent becc7ae commit 7ce9ea7

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/mtd/nand/omap2.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,8 +1657,11 @@ static int omap_get_dt_info(struct device *dev, struct omap_nand_info *info)
16571657

16581658
/* detect availability of ELM module. Won't be present pre-OMAP4 */
16591659
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+
}
16621665

16631666
/* select ecc-scheme for NAND */
16641667
if (of_property_read_string(child, "ti,nand-ecc-opt", &s)) {

0 commit comments

Comments
 (0)