of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC

PATCH New Rob Herring 1 participant 1 message Aug 29, 2018 Device tree

lore

Share & tools

lore

Rob Herring

author maintainer

2018-08-29 19:04 UTC #0 lore raw

PATCH 1/1 of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC

Cache nodes under the cpu node(s) is PowerMac specific according to the comment above, so make the code enforce that.

Signed-off-by Rob Herring <[email protected]>

---
 drivers/of/base.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/of/base.c +1 -1

index 466e3c8582f0..cadcb470198a 100644
@@ -1963,7 +1963,7 @@ struct device_node *of_find_next_cache_node(const struct device_node *np)
 	/* OF on pmac has nodes instead of properties named "l2-cache"
 	 * beneath CPU nodes.
 	 */
-	if (!strcmp(np->type, "cpu"))
+	if (IS_ENABLED(CONFIG_PPC_PMAC) && !strcmp(np->type, "cpu"))
 		for_each_child_of_node(np, child)
 			if (!strcmp(child->type, "cache"))
 				return child;

Signature · 1 line

2.17.1