From fca4afe400cb68fe5a7f0a97fb1ba5cfdcb81675 Mon Sep 17 00:00:00 2001 From: Pavel Tatashin Date: Thu, 15 Jun 2017 10:40:58 -0400 Subject: [PATCH] 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: Pavel Tatashin Signed-off-by: David S. Miller --- arch/sparc/kernel/time_64.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c index a612a91cb9cd..a62758ce9e19 100644 --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -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 = { -- 2.20.1