timer clockevents/clocksource driver updates for v3.20
Subsystems (7)
Linus,
Please pull the latest timers-core-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-core-for-linus
# HEAD: f40d149b58f5dea148ceaee5f9249da133e5004c Merge branch 'clockevents/3.20' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
The main change in this tree is the addition of various new SoC clocksource/clockevents drivers: Conexant Digicolor SoCs, rockchip rk3288 board, asm9260 for MIPS and versatile AB/PB boards.
Thanks,
Ingo
------------------>
Barry Song (1):
clocksource: marco: Rename marco to atlas7
Baruch Siach (2):
clocksource: devicetree: Document Conexant Digicolor timer binding
clocksource: Driver for Conexant Digicolor SoC timer
Daniel Lezcano (1):
clockevents: rockchip: Add rockchip timer for rk3288
Oleksij Rempel (1):
ARM: clocksource: Add asm9260_timer driver
Rob Herring (3):
dt/bindings: Add binding for Versatile system registers
clocksource: versatile: Adapt for Versatile AB and PB boards
dts: versatile: Add sysregs node
Thierry Reding (1):
clocksource: sirf: Remove unused variable
.../devicetree/bindings/arm/versatile-sysreg.txt | 10 +
.../devicetree/bindings/timer/digicolor-timer.txt | 18 ++
.../bindings/timer/rockchip,rk3288-timer.txt | 18 ++
MAINTAINERS | 2 +-
arch/arm/boot/dts/versatile-ab.dts | 5 +
arch/arm/mach-rockchip/Kconfig | 1 +
drivers/clocksource/Kconfig | 17 ++
drivers/clocksource/Makefile | 5 +-
drivers/clocksource/asm9260_timer.c | 220 +++++++++++++++++++++
drivers/clocksource/rockchip_timer.c | 180 +++++++++++++++++
.../clocksource/{timer-marco.c => timer-atlas7.c} | 15 +-
drivers/clocksource/timer-digicolor.c | 199 +++++++++++++++++++
drivers/clocksource/versatile.c | 4 +-
13 files changed, 683 insertions(+), 11 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/versatile-sysreg.txt
create mode 100644 Documentation/devicetree/bindings/timer/digicolor-timer.txt
create mode 100644 Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt
create mode 100644 drivers/clocksource/asm9260_timer.c
create mode 100644 drivers/clocksource/rockchip_timer.c
rename drivers/clocksource/{timer-marco.c => timer-atlas7.c} (95%)
create mode 100644 drivers/clocksource/timer-digicolor.cDocumentation/devicetree/bindings/arm/versatile-sysreg.txt new file +10 -0
@@ -0,0 +1,10 @@ +ARM Versatile system registers +-------------------------------------- + +This is a system control registers block, providing multiple low level +platform functions like board detection and identification, software +interrupt generation, MMC and NOR Flash control etc. + +Required node properties: +- compatible value : = "arm,versatile-sysreg", "syscon" +- reg : physical base address and the size of the registers window
Documentation/devicetree/bindings/timer/digicolor-timer.txt new file +18 -0
@@ -0,0 +1,18 @@ +Conexant Digicolor SoCs Timer Controller + +Required properties: + +- compatible : should be "cnxt,cx92755-timer" +- reg : Specifies base physical address and size of the "Agent Communication" + timer registers +- interrupts : Contains 8 interrupts, one for each timer +- clocks: phandle to the main clock + +Example: + + timer@f0000fc0 { + compatible = "cnxt,cx92755-timer"; + reg = <0xf0000fc0 0x40>; + interrupts = <19>, <31>, <34>, <35>, <52>, <53>, <54>, <55>; + clocks = <&main_clk>; + };
Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt new file +18 -0
@@ -0,0 +1,18 @@ +Rockchip rk3288 timer + +Required properties: +- compatible: shall be "rockchip,rk3288-timer" +- reg: base address of the timer register starting with TIMERS CONTROL register +- interrupts: should contain the interrupts for Timer0 +- clocks : must contain an entry for each entry in clock-names +- clock-names : must include the following entries: + "timer", "pclk" + +Example: + timer: timer@ff810000 { + compatible = "rockchip,rk3288-timer"; + reg = <0xff810000 0x20>; + interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&xin24m>, <&cru PCLK_TIMER>; + clock-names = "timer", "pclk"; + };
MAINTAINERS +1 -1
@@ -958,7 +958,7 @@ S: Maintained F: arch/arm/mach-prima2/ F: drivers/clk/sirf/ F: drivers/clocksource/timer-prima2.c -F: drivers/clocksource/timer-marco.c +F: drivers/clocksource/timer-atlas7.c N: [^a-z]sirf ARM/EBSA110 MACHINE SUPPORT
arch/arm/boot/dts/versatile-ab.dts +5 -0
@@ -252,6 +252,11 @@ #size-cells = <1>; ranges = <0 0x10000000 0x10000>; + sysreg@0 { + compatible = "arm,versatile-sysreg", "syscon"; + reg = <0x00000 0x1000>; + }; + aaci@4000 { compatible = "arm,primecell"; reg = <0x4000 0x1000>;
arch/arm/mach-rockchip/Kconfig +1 -0
@@ -11,6 +11,7 @@ config ARCH_ROCKCHIP select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select DW_APB_TIMER_OF + select ROCKCHIP_TIMER select ARM_GLOBAL_TIMER select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK help
drivers/clocksource/Kconfig +17 -0
@@ -18,6 +18,9 @@ config CLKBLD_I8253 config CLKSRC_MMIO bool +config DIGICOLOR_TIMER + bool + config DW_APB_TIMER bool
@@ -26,6 +29,10 @@ config DW_APB_TIMER_OF select DW_APB_TIMER select CLKSRC_OF +config ROCKCHIP_TIMER + bool + select CLKSRC_OF + config ARMADA_370_XP_TIMER bool select CLKSRC_OF
@@ -229,4 +236,14 @@ config CLKSRC_MIPS_GIC depends on MIPS_GIC select CLKSRC_OF +config ASM9260_TIMER + bool "Alphascale ASM9260 timer driver" + depends on GENERIC_CLOCKEVENTS + select CLKSRC_MMIO + select CLKSRC_OF + default y if MACH_ASM9260 + help + This enables build of a clocksource and clockevent driver for + the 32-bit System Timer hardware available on a Alphascale ASM9260. + endmenu
drivers/clocksource/Makefile +4 -1
@@ -10,15 +10,17 @@ obj-$(CONFIG_SH_TIMER_TMU) += sh_tmu.o obj-$(CONFIG_EM_TIMER_STI) += em_sti.o obj-$(CONFIG_CLKBLD_I8253) += i8253.o obj-$(CONFIG_CLKSRC_MMIO) += mmio.o +obj-$(CONFIG_DIGICOLOR_TIMER) += timer-digicolor.o obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o +obj-$(CONFIG_ROCKCHIP_TIMER) += rockchip_timer.o obj-$(CONFIG_CLKSRC_NOMADIK_MTU) += nomadik-mtu.o obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o obj-$(CONFIG_ORION_TIMER) += time-orion.o obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o obj-$(CONFIG_ARCH_CLPS711X) += clps711x-timer.o -obj-$(CONFIG_ARCH_MARCO) += timer-marco.o +obj-$(CONFIG_ARCH_ATLAS7) += timer-atlas7.o obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o obj-$(CONFIG_ARCH_MXS) += mxs_timer.o obj-$(CONFIG_ARCH_PXA) += pxa_timer.o
@@ -48,3 +50,4 @@ obj-$(CONFIG_ARCH_KEYSTONE) += timer-keystone.o obj-$(CONFIG_ARCH_INTEGRATOR_AP) += timer-integrator-ap.o obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o +obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o
drivers/clocksource/asm9260_timer.c new file +220 -0
220 lines not on this page · raw message
drivers/clocksource/rockchip_timer.c new file +180 -0
180 lines not on this page · raw message
drivers/clocksource/timer-atlas7.c renamed from drivers/clocksource/timer-marco.c +7 -8
@@ -38,7 +38,7 @@#define SIRFSOC_TIMER_REG_CNT 6 -static unsigned long marco_timer_rate; +static unsigned long atlas7_timer_rate;static const u32 sirfsoc_timer_reg_list[SIRFSOC_TIMER_REG_CNT ] = {SIRFSOC_TIMER_WATCHDOG_EN ,
@@ -195,7 +195,7 @@ static int sirfsoc_local_timer_setup(struct clock_event_device *ce) ce->rating =200 ; ce->set_mode = sirfsoc_timer_set_mode; ce->set_next_event = sirfsoc_timer_set_next_event; -clockevents_calc_mult_shift (ce, marco_timer_rate,60 ); +clockevents_calc_mult_shift (ce, atlas7_timer_rate,60 ); ce->max_delta_ns =clockevent_delta2ns (-2 , ce); ce->min_delta_ns =clockevent_delta2ns (2 , ce); ce->cpumask =cpumask_of (cpu);
@@ -255,9 +255,8 @@ static void __init sirfsoc_clockevent_init(void) }/* initialize the kernel jiffy timer source */ -static void __init sirfsoc_marco_timer_init (struct device_node *np) +static void __init sirfsoc_atlas7_timer_init (struct device_node *np) { -u32 timer_div;struct clk *clk; clk =of_clk_get (np,0 );
@@ -265,7 +264,7 @@ static void __init sirfsoc_marco_timer_init(struct device_node *np)BUG_ON (clk_prepare_enable (clk)); - marco_timer_rate =clk_get_rate (clk); + atlas7_timer_rate =clk_get_rate (clk);/* timer dividers: 0, not divided */ writel_relaxed (0 , sirfsoc_timer_base +SIRFSOC_TIMER_64COUNTER_CTRL );
@@ -283,7 +282,7 @@ static void __init sirfsoc_marco_timer_init(struct device_node *np)/* Clear all interrupts */ writel_relaxed (0xFFFF , sirfsoc_timer_base +SIRFSOC_TIMER_INTR_STATUS ); -BUG_ON (clocksource_register_hz (&sirfsoc_clocksource, marco_timer_rate)); +BUG_ON (clocksource_register_hz (&sirfsoc_clocksource, atlas7_timer_rate));sirfsoc_clockevent_init (); }
@@ -302,6 +301,6 @@ static void __init sirfsoc_of_timer_init(struct device_node *np)if (!sirfsoc_timer1_irq.irq)panic ("No irq passed for timer1 via DT\n" ); -sirfsoc_marco_timer_init (np); +sirfsoc_atlas7_timer_init (np); } -CLOCKSOURCE_OF_DECLARE (sirfsoc_marco_timer,"sirf,marco-tick" , sirfsoc_of_timer_init ); +CLOCKSOURCE_OF_DECLARE (sirfsoc_atlas7_timer,"sirf,atlas7-tick" , sirfsoc_of_timer_init);
drivers/clocksource/timer-digicolor.c new file +199 -0
199 lines not on this page · raw message
drivers/clocksource/versatile.c +3 -1
@@ -36,5 +36,7 @@ static void __init versatile_sched_clock_init(struct device_node *node)sched_clock_register (versatile_sys_24mhz_read,32 ,24000000 ); } -CLOCKSOURCE_OF_DECLARE (versatile,"arm,vexpress-sysreg" , +CLOCKSOURCE_OF_DECLARE (vexpress,"arm,vexpress-sysreg" , + versatile_sched_clock_init); +CLOCKSOURCE_OF_DECLARE (versatile,"arm,versatile-sysreg" , versatile_sched_clock_init);