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

Commit fca4afe4 authored by Pavel Tatashin's avatar Pavel Tatashin Committed by David S. Miller
Browse files

sparc64: use prom interface to get %stick frequency 



We initialize time early, we must use prom interface instead of open
firmware driver, which is not yet initialized.

Also, use prom_getintdefault() instead of prom_getint() to be compatible
with the code before early boot timestamps project.

Signed-off-by: default avatarPavel Tatashin <pasha.tatashin@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9300d9c4

arch/sparc/kernel/time_64.c

+2 −5
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/kernel_stat.h>

#include <linux/clockchips.h>

#include <linux/clocksource.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/ftrace.h>
@@ -257,7 +256,7 @@ static int stick_add_compare(unsigned long adj) 


static unsigned long stick_get_frequency(void)

{

	return prom_getint(prom_root_node, "stick-frequency");

	return prom_getintdefault(prom_root_node, "stick-frequency", 0);

}



static struct sparc64_tick_ops stick_operations __read_mostly = {
@@ -391,9 +390,7 @@ static int hbtick_add_compare(unsigned long adj) 


static unsigned long hbtick_get_frequency(void)

{

	struct device_node *dp = of_find_node_by_path("/");



	return of_getintprop_default(dp, "stick-frequency", 0);

	return prom_getintdefault(prom_root_node, "stick-frequency", 0);

}



static struct sparc64_tick_ops hbtick_operations __read_mostly = {