| From 94cad514f686a3602280dce26ea5252c9960ba8a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 27 Aug 2018 09:50:09 -0500 |
| Subject: of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC |
| |
| From: Rob Herring <robh@kernel.org> |
| |
| [ 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> |
| --- |
| drivers/of/base.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/of/base.c b/drivers/of/base.c |
| index 3f21ea6a90dcb..f0dbb7ad88cf6 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; |
| -- |
| 2.20.1 |
| |
