Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20c7dbbd authored by Alexey Brodkin's avatar Alexey Brodkin Committed by Vineet Gupta
Browse files

ARC: Don't try to use value of top level clock-frequency in DT 



We no longer use it and instead a real clk device such as fixed-clk
instance is fed to timers etc.

Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>
[vgupta: broken out of a bigger patch, rewrote changelog]
Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
parent 0e6e9b64

arch/arc/kernel/setup.c

+7 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <asm/page.h>

#include <asm/irq.h>

#include <asm/unwind.h>

#include <asm/clk.h>

#include <asm/mach_desc.h>

#include <asm/smp.h>
@@ -219,10 +218,6 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len) 
	if (tbl->info.id == 0)

		n += scnprintf(buf + n, len - n, "UNKNOWN ARC Processor\n");



	n += scnprintf(buf + n, len - n, "CPU speed\t: %u.%02u Mhz\n",

		       (unsigned int)(arc_get_core_freq() / 1000000),

		       (unsigned int)(arc_get_core_freq() / 10000) % 100);



	n += scnprintf(buf + n, len - n, "Timers\t\t: %s%s%s%s\nISA Extn\t: ",

		       IS_AVAIL1(cpu->extn.timer0, "Timer0 "),

		       IS_AVAIL1(cpu->extn.timer1, "Timer1 "),
@@ -472,6 +467,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
{

	char *str;

	int cpu_id = ptr_to_cpu(v);

	struct device_node *core_clk = of_find_node_by_name(NULL, "core_clk");

	u32 freq = 0;



	if (!cpu_online(cpu_id)) {

		seq_printf(m, "processor [%d]\t: Offline\n", cpu_id);
@@ -484,6 +481,11 @@ static int show_cpuinfo(struct seq_file *m, void *v) 


	seq_printf(m, arc_cpu_mumbojumbo(cpu_id, str, PAGE_SIZE));



	of_property_read_u32(core_clk, "clock-frequency", &freq);

	if (freq)

		seq_printf(m, "CPU speed\t: %u.%02u Mhz\n",

			   freq / 1000000, (freq / 10000) % 100);



	seq_printf(m, "Bogo MIPS\t: %lu.%02lu\n",

		   loops_per_jiffy / (500000 / HZ),

		   (loops_per_jiffy / (5000 / HZ)) % 100);

arch/arc/plat-axs10x/axs10x.c

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/libfdt.h>



#include <asm/asm-offsets.h>

#include <asm/clk.h>

#include <asm/io.h>

#include <asm/mach_desc.h>

#include <asm/mcip.h>
@@ -448,7 +447,6 @@ static void __init axs103_early_init(void) 


	/* Patching .dtb in-place with new core clock value */

	if (freq != orig ) {

		arc_set_core_freq(freq * 1000000);

		freq = cpu_to_be32(freq * 1000000);

		fdt_setprop_inplace(initial_boot_params, offset,

				    "clock-frequency", &freq, sizeof(freq));