ARM: OMAP2+: only search for GPMC DT child nodes on probe (f2b09f67) · Commits · 戴 / test

The GPMC DT probe function use for_each_node_by_name() to search child device nodes of the GPMC controller. But this function does not use the GPMC device node as the root of the search and instead search across the complete Device Tree. This means that any device node on the DT that is using any of the GPMC child nodes names searched for will be returned even if they are not connected to the GPMC, making the gpmc_probe_xxx_child() function to fail. Fix this by using the GPMC device node as the search root so the search will be restricted to its children. Reported-by:

Lars Poeschel <poeschel@lemonage.de> Signed-off-by:

Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by:

Jon Hunter <jon-hunter@ti.com>

arch/arm/mach-omap2/gpmc.c

+10 −23

Original line number	Diff line number	Diff line
		@@ -1520,32 +1520,19 @@ static int gpmc_probe_dt(struct platform_device *pdev)
		return ret;
		}

		for_each_node_by_name(child, "nand") {
		ret = gpmc_probe_nand_child(pdev, child);
		if (ret < 0) {
		of_node_put(child);
		return ret;
		}
		}
		for_each_child_of_node(pdev->dev.of_node, child) {

		for_each_node_by_name(child, "onenand") {
		ret = gpmc_probe_onenand_child(pdev, child);
		if (ret < 0) {
		of_node_put(child);
		return ret;
		}
		}
		if (!child->name)
		continue;

		for_each_node_by_name(child, "nor") {
		if (of_node_cmp(child->name, "nand") == 0)
		ret = gpmc_probe_nand_child(pdev, child);
		else if (of_node_cmp(child->name, "onenand") == 0)
		ret = gpmc_probe_onenand_child(pdev, child);
		else if (of_node_cmp(child->name, "ethernet") == 0 \|\|
		of_node_cmp(child->name, "nor") == 0)
		ret = gpmc_probe_generic_child(pdev, child);
		if (ret < 0) {
		of_node_put(child);
		return ret;
		}
		}

		for_each_node_by_name(child, "ethernet") {
		ret = gpmc_probe_generic_child(pdev, child);
		if (ret < 0) {
		of_node_put(child);
		return ret;

Admin message