Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ce9ea7e authored by Teresa Remmet's avatar Teresa Remmet Committed by Brian Norris
Browse files

mtd: nand: omap2: Add check for old elm binding 



commit c9711ec5 ("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 c9711ec5 ("mtd: nand: omap: Clean up device tree support")
Signed-off-by: default avatarTeresa Remmet <t.remmet@phytec.de>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent becc7ae5

drivers/mtd/nand/omap2.c

+5 −2
Original line number Diff line number Diff line
@@ -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) {

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