summaryrefslogtreecommitdiffstats
path: root/arch/nios2
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-09-28 15:48:39 -0500
committerRob Herring <robh@kernel.org>2018-09-28 15:48:39 -0500
commit389d0a8a7af8ff8bb6301382333c7e8f748d7cd6 (patch)
tree8a9704aad28ad8f1c11c947026b0f22dfffb0ca5 /arch/nios2
parentda08d8cb8cfc58a340fc5e163385b5dfd714d762 (diff)
parent4c29e5934f6c35df2601d593ddfa737b7932bde6 (diff)
downloadlinux-389d0a8a7af8ff8bb6301382333c7e8f748d7cd6.tar.bz2
Merge branch 'dt/cpu-type-rework' into dt/next
Diffstat (limited to 'arch/nios2')
-rw-r--r--arch/nios2/kernel/cpuinfo.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/nios2/kernel/cpuinfo.c b/arch/nios2/kernel/cpuinfo.c
index 93207718bb22..ccc1d2a15a0a 100644
--- a/arch/nios2/kernel/cpuinfo.c
+++ b/arch/nios2/kernel/cpuinfo.c
@@ -47,7 +47,7 @@ void __init setup_cpuinfo(void)
const char *str;
int len;
- cpu = of_find_node_by_type(NULL, "cpu");
+ cpu = of_get_cpu_node(0, NULL);
if (!cpu)
panic("%s: No CPU found in devicetree!\n", __func__);
@@ -120,6 +120,8 @@ void __init setup_cpuinfo(void)
cpuinfo.reset_addr = fcpu(cpu, "altr,reset-addr");
cpuinfo.exception_addr = fcpu(cpu, "altr,exception-addr");
cpuinfo.fast_tlb_miss_exc_addr = fcpu(cpu, "altr,fast-tlb-miss-addr");
+
+ of_node_put(cpu);
}
#ifdef CONFIG_PROC_FS