Skip to content

Commit

Permalink
powerpc: 8xx: get cpu node with of_get_cpu_node
Browse files Browse the repository at this point in the history
"device_type" use is deprecated for FDT though it has continued to be used
for nodes like cpu nodes. Use of_get_cpu_node() instead which works using
node names by default. This will allow the eventually removal of cpu
device_type properties.

Also, fix a leaked reference and add a missing of_node_put.

Cc: Vitaly Bordug <vitb@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Rob Herring <robh@kernel.org>
  • Loading branch information
Rob Herring committed Sep 28, 2018
1 parent 84dbc69 commit 38959a0
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/powerpc/platforms/8xx/m8xx_setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static int __init get_freq(char *name, unsigned long *val)
int found = 0;

/* The cpu node should have timebase and clock frequency properties */
cpu = of_find_node_by_type(NULL, "cpu");
cpu = of_get_cpu_node(0, NULL);

if (cpu) {
fp = of_get_property(cpu, name, NULL);
Expand Down Expand Up @@ -147,8 +147,9 @@ void __init mpc8xx_calibrate_decr(void)
* we have to enable the timebase). The decrementer interrupt
* is wired into the vector table, nothing to do here for that.
*/
cpu = of_find_node_by_type(NULL, "cpu");
cpu = of_get_cpu_node(0, NULL);
virq= irq_of_parse_and_map(cpu, 0);
of_node_put(cpu);
irq = virq_to_hw(virq);

sys_tmr2 = immr_map(im_sit);
Expand Down

0 comments on commit 38959a0

Please sign in to comment.