summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-08-27 17:50:09 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-20 20:46:06 +0300
commit69116e3bae2b166c69fa39a08c85866c8d613ee9 (patch)
tree28129ea3fd5b9e24d7e88aad4bf4e775d272c979 /drivers/of
parentcc5f462c1b0813a313cc0cd23351a50adde454e4 (diff)
downloadlinux-69116e3bae2b166c69fa39a08c85866c8d613ee9.tar.xz
of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC
[ Upstream commit f6707fd6241e483f6fea2caae82d876e422bb11a ] 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 <robh@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 3f21ea6a90dc..f0dbb7ad88cf 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2066,7 +2066,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;