drivers: timer: inroduce ARC timer driver
v4 cover drivers: timer: inroduce ARC timer driver
This patch series replaces legacy approach to access ARC timer via specific code in "arch/arc/lib/time.c" and uses timer driver instead.
ARC cores may have up to 2 built-in timers: timer0 and timer1, usually at least one of them exists.
They are controlled through auxiliary registers and so we don't have to remap their control registers as we used to do with MMIO registers of external peripheral devices.
---
Changes v3..v4:
- Remove CONFIG_SYS_TIMER_RATE not only from "axs10x.h" but also
from "nsim.h" and "tb100.h".
Vlad Zakharov (2):
drivers: timer: Introduce ARC timer driver
arc: use timer driver instead of arch/arc/lib/timer.c
arch/arc/dts/skeleton.dtsi | 6 ++ arch/arc/include/asm/arcregs.h | 4 ++ arch/arc/lib/Makefile | 1 - arch/arc/lib/timer.c | 24 ------- configs/axs101_defconfig | 2 + configs/axs103_defconfig | 2 + configs/nsim_700_defconfig | 2 + configs/nsim_700be_defconfig | 2 + configs/nsim_hs38_defconfig | 2 + configs/nsim_hs38be_defconfig | 2 + configs/tb100_defconfig | 2 + doc/device-tree-bindings/timer/arc_timer.txt | 24 +++++++ drivers/timer/Kconfig | 7 ++ drivers/timer/Makefile | 1 + drivers/timer/arc_timer.c | 95 ++++++++++++++++++++++++++++ include/configs/axs10x.h | 2 - 16 files changed, 151 insertions(+), 27 deletions(-) delete mode 100644 arch/arc/lib/timer.c create mode 100644 doc/device-tree-bindings/timer/arc_timer.txt create mode 100644 drivers/timer/arc_timer.c
Signature · 1 line
2.7.4
PATCH v4 1/2 drivers: timer: Introduce ARC timer driver
This commit introduces timer driver for ARC.
ARC timers are configured via ARC AUX registers so we use special functions to access timer control registers.
This driver allows utilization of either timer0 or timer1 depending on which one is available in real hardware. Essentially only existing timers should be mentioned in board's Device Tree description.
---
No changes compared to v3
arch/arc/include/asm/arcregs.h | 4 ++ doc/device-tree-bindings/timer/arc_timer.txt | 24 +++++++ drivers/timer/Kconfig | 10 +++ drivers/timer/Makefile | 1 + drivers/timer/arc_timer.c | 101 +++++++++++++++++++++++++++ 5 files changed, 140 insertions(+) create mode 100644 doc/device-tree-bindings/timer/arc_timer.txt create mode 100644 drivers/timer/arc_timer.c
arch/arc/include/asm/arcregs.h +4 -0
@@ -33,6 +33,10 @@#define ARC_AUX_TIMER0_CTRL 0x22/* Timer 0 control */ #define ARC_AUX_TIMER0_LIMIT 0x23/* Timer 0 limit */ +#define ARC_AUX_TIMER1_CNT 0x100/* Timer 1 count */ +#define ARC_AUX_TIMER1_CTRL 0x101/* Timer 1 control */ +#define ARC_AUX_TIMER1_LIMIT 0x102/* Timer 1 limit */ +#define ARC_AUX_INTR_VEC_BASE 0x25/* Data cache related auxiliary registers */
doc/device-tree-bindings/timer/arc_timer.txt new file +24 -0
@@ -0,0 +1,24 @@ +ARC Timer + +Required properties: + +- compatible : should be "snps,arc-timer" +- reg : Specifies timer ID, could be either 0 or 1. +- clock-frequency : The frequency of the clock that drives the counter, in Hz. + +Examples: + +timer at 0 { + compatible = "snps,arc-timer"; + clock-frequency = <100000000>; + reg = <0>; +}; + +timer at 1 { + compatible = "snps,arc-timer"; + clock-frequency = <100000000>; + reg = <1>; +}; + +NOTE: if you specify both timers, frequencies should always be the same as both timers +are driven by core clock.
drivers/timer/Kconfig +10 -0
@@ -46,4 +46,14 @@ config OMAP_TIMER help Select this to enable an timer for Omap devices. +config ARC_TIMER + bool "ARC timer support" + depends on TIMER + depends on ARC + help + Select this to enable built-in ARC timers. + ARC cores may have up to 2 built-in timers: timer0 and timer1, + usually at least one of them exists. Either of them is supported + in U-Boot. + endmenu
drivers/timer/Makefile +1 -0
@@ -9,3 +9,4 @@ obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o obj-$(CONFIG_SANDBOX_TIMER) += sandbox_timer.o obj-$(CONFIG_X86_TSC_TIMER) += tsc_timer.o obj-$(CONFIG_OMAP_TIMER) += omap-timer.o +obj-$(CONFIG_ARC_TIMER) += arc_timer.o
drivers/timer/arc_timer.c new file +101 -0
101 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 2/2 arc: use timer driver instead of arch/arc/lib/timer.c
In reply to Vlad ZakharovThis commit replaces legacy timer code with usage of arc timer driver.
Also it adds timer0 device tree node with corresponding "clock-frequency" property.
Therefore we remove legacy CONFIG_SYS_TIMER_RATE config symbol that is not longer required.
Furthermore the commit selects CONFIG_TIMER and CONFIG_ARC_TIMER by default when selecting ARC architecture.
---
Changes v3..v4:
- Remove CONFIG_SYS_TIMER_RATE not only from "axs10x.h" but also
from "nsim.h" and "tb100.h".
arch/Kconfig | 2 ++ arch/arc/dts/skeleton.dtsi | 6 ++++++ arch/arc/lib/Makefile | 1 - arch/arc/lib/timer.c | 24 ------------------------ include/configs/axs10x.h | 2 -- include/configs/nsim.h | 5 ----- include/configs/tb100.h | 5 ----- 7 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 arch/arc/lib/timer.c
arch/Kconfig +2 -0
@@ -12,6 +12,8 @@ config ARC bool "ARC architecture" select HAVE_PRIVATE_LIBGCC select SUPPORT_OF_CONTROL + select TIMER + select ARC_TIMER config ARM bool "ARM architecture"
arch/arc/dts/skeleton.dtsi +6 -0
@@ -10,4 +10,10 @@ chosen { }; aliases { }; memory { device_type = "memory"; reg = <0 0>; }; + + timer at 0 { + compatible = "snps,arc-timer"; + clock-frequency = <100000000>; + reg = <0>; + }; };
arch/arc/lib/Makefile +0 -1
@@ -18,7 +18,6 @@ obj-y += memcmp.o obj-y += memcpy-700.o obj-y += memset.o obj-y += reset.o -obj-y += timer.o obj-y += ints_low.o obj-y += init_helpers.o
arch/arc/lib/timer.c deleted +0 -24
@@ -1,24 +0,0 @@ -/* -* Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -*/ - -#include <asm/arcregs.h> - -#define NH_MODE (1 << 1)/* Disable timer if CPU is halted */ - -int timer_init (void ) -{ -write_aux_reg (ARC_AUX_TIMER0_CTRL ,NH_MODE ); -/* Set max value for counter/timer */ -write_aux_reg (ARC_AUX_TIMER0_LIMIT ,0xffffffff ); -/* Set initial count value and restart counter/timer */ -write_aux_reg (ARC_AUX_TIMER0_CNT ,0 ); -return 0 ; -} - -unsigned long timer_read_counter (void ) -{ -return read_aux_reg (ARC_AUX_TIMER0_CNT ); -}
include/configs/axs10x.h +0 -2
@@ -11,8 +11,6 @@/* * CPU configuration */ -#define CONFIG_SYS_TIMER_RATE CONFIG_SYS_CLK_FREQ -#define ARC_FPGA_PERIPHERAL_BASE 0xE0000000#define ARC_APB_PERIPHERAL_BASE 0xF0000000#define ARC_DWMMC_BASE (ARC_FPGA_PERIPHERAL_BASE + 0x15000)
include/configs/nsim.h +0 -5
@@ -10,11 +10,6 @@#include <linux/sizes.h> /* -* CPU configuration -*/ -#define CONFIG_SYS_TIMER_RATE CONFIG_SYS_CLK_FREQ - -/* * Memory configuration */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
include/configs/tb100.h +0 -5
@@ -10,11 +10,6 @@#include <linux/sizes.h> /* -* CPU configuration -*/ -#define CONFIG_SYS_TIMER_RATE CONFIG_SYS_CLK_FREQ - -/* * Memory configuration */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
Signature · 1 line
2.7.4
PATCH v4 2/2 arc: use timer driver instead of arch/arc/lib/timer.c
Hi Vlad,
Quoted 47 lines · Vlad Zakharov
This commit replaces legacy timer code with usage of arc timer driver.
Also it adds timer0 device tree node with corresponding "clock-frequency" property.
Therefore we remove legacy
CONFIG_SYS_TIMER_RATEconfig symbol that is not longer required.Furthermore the commit selects
CONFIG_TIMERandCONFIG_ARC_TIMERby default when selecting ARC architecture.Signed-off-by Vlad Zakharov <[email protected]>Reviewed-by Simon Glass <[email protected]>---
Changes v3..v4:
?- RemoveCONFIG_SYS_TIMER_RATEnot only from "axs10x.h" but also from "nsim.h" and "tb100.h".?arch/Kconfig???????????????|??2 ++ ?arch/arc/dts/skeleton.dtsi |??6 ++++++ ?arch/arc/lib/Makefile??????|??1 - ?arch/arc/lib/timer.c???????| 24 ------------------------ ?include/configs/axs10x.h???|??2 -- ?include/configs/nsim.h?????|??5 ----- ?include/configs/tb100.h????|??5 -----?7 files changed, 8 insertions(+), 37 deletions(-) ?delete mode 100644
arch/arc/lib/timer.carch/Kconfig +0
-0@@ -12,6 +12,8 @@ config ARC? bool "ARC architecture"
? selectHAVE_PRIVATE_LIBGCC
? selectSUPPORT_OF_CONTROLarch/Kconfig +2
-0+ select TIMER + select ARC_TIMER?
?config ARM
? bool "ARM architecture"arch/arc/dts/skeleton.dtsi +0
-0
arch/arc/dts/skeleton.dtsi line 18
Quoted 9 lines
arch/arc/dts/skeleton.dtsi +6
-0@@ -10,4 +10,10 @@ ? chosen { }; ? aliases { }; ? memory { device_type = "memory"; reg = <0 0>; }; + + timer at 0 { + compatible = "snps,arc-timer"; + clock-frequency = <100000000>; + reg = <0>; + };
I've just realized that with timer clock hard-coded for now we need to duplicate timer entry for each and every ARC board because they all are clocked by differently.
For example axs101 runs @700 MHz and so its timer increment with the same speed but axs103 runs @100 MHz and its timer runs at the same 100 MHz speed.
I think with your next change?http://patchwork.ozlabs.org/patch/696870/ we'll be able to move timer node in common skeleton i instead of hardcoded clock value we'll refer to clk phandle and clk phandle will be specified per board.
I.e. this series should be respinned again I thin, sorry for catching that issue a bit too late.
-Alexey