summaryrefslogtreecommitdiffstats
path: root/arch/arc/kernel/time.c
diff options
context:
space:
mode:
authorVineet Gupta2016-10-31 22:26:41 +0100
committerVineet Gupta2016-11-30 20:54:25 +0100
commit044214200b0b7aa4633d2e93529e55b5ca50a5a5 (patch)
tree31b2dd139ca95900919b0883268e3983b1949bb7 /arch/arc/kernel/time.c
parentARC: timer: gfrc, rtc: Read BCR to detect whether hardware exists ... (diff)
downloadkernel-qcow2-linux-044214200b0b7aa4633d2e93529e55b5ca50a5a5.tar.gz
kernel-qcow2-linux-044214200b0b7aa4633d2e93529e55b5ca50a5a5.tar.xz
kernel-qcow2-linux-044214200b0b7aa4633d2e93529e55b5ca50a5a5.zip
ARC: timer: gfrc, rtc: build under same option (64-bit timers)
The original distinction was done as they were developed at different times and primarily because they are specific to UP (RTC) and SMP (GFRC). But given that driver handles that at runtime, (i.e. not allowing RTC as clocksource in SMP), we can simplify things a bit. Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc/kernel/time.c')
-rw-r--r--arch/arc/kernel/time.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c
index d3f3750a0d2d..4d0c75b86b10 100644
--- a/arch/arc/kernel/time.c
+++ b/arch/arc/kernel/time.c
@@ -81,7 +81,7 @@ static int noinline arc_get_timer_clk(struct device_node *node)
/********** Clock Source Device *********/
-#ifdef CONFIG_ARC_HAS_GFRC
+#ifdef CONFIG_ARC_TIMERS_64BIT
static cycle_t arc_read_gfrc(struct clocksource *cs)
{
@@ -128,10 +128,6 @@ static int __init arc_cs_setup_gfrc(struct device_node *node)
}
CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc);
-#endif
-
-#ifdef CONFIG_ARC_HAS_RTC
-
#define AUX_RTC_CTRL 0x103
#define AUX_RTC_LOW 0x104
#define AUX_RTC_HIGH 0x105