Skip to contentSkip to conversation

: clockevents: new material for 3.20

GIT PULL In review Daniel Lezcano 3 participants 15 messages Jan 29, 2015 – Feb 2, 2015

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

Hi Thomas,

this pull request contains the following changes:

* Barry Song renamed the marco timer to atlas7

* Baruch Siach provided a new driver for the Conexant Digicolor SoCs

* Daniel Lezcano added a new driver for the rockchip rk3288 board

* Oleksij Rempel added a new driver asm9260 for mips

* Rob Herring added the DT definition for the versatile AB/PB boards
as these ones are compatible with the Versatile clocksource

* Thierry Reding removed an used variable for the sirf driver

The following changes since commit 9bc7491906b4113b4c5ae442157c7dfc4e10cd14:

hrtimer: Prevent stale expiry time in hrtimer_interrupt() (2015-01-23
12:13:20 +0100)

are available in the git repository at:

http://git.linaro.org/people/daniel.lezcano/linux.git clockevents/3.20

for you to fetch changes up to 35a8578e8b83eb13f8d57ab40b98bcfd5199d3d4:

dts: versatile: Add sysregs node (2015-01-29 14:02:16 +0100)

----------------------------------------------------------------
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

Documentation/devicetree/bindings/arm/versatile-sysreg.txt |
10 ++++++++++
Documentation/devicetree/bindings/timer/digicolor-timer.txt |
18 +++++++++++++++++
Documentation/devicetree/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
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/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.c--

<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

#1 lore raw

PATCH 1/9 clocksource: sirf: Remove unused variable

From: Thierry Reding <[email protected]>

Commit ef89af1f4380 ("clocksource: sirf: Remove hard-coded clock rate") removes all uses of the timer_div variable. Since the variable is no longer used it should be removed.

---
 drivers/clocksource/timer-marco.c | 1 -
 1 file changed, 1 deletion(-)
drivers/clocksource/timer-marco.c +0 -1
index 361a789..3ddb81f 100644
@@ -257,7 +257,6 @@ static void __init sirfsoc_clockevent_init(void)
 /* initialize the kernel jiffy timer source */
 static void __init sirfsoc_marco_timer_init(struct device_node *np)
 {
-	u32 timer_div;
 	struct clk *clk;
 
 	clk = of_clk_get(np, 0);
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/9 clocksource: marco: Rename marco to atlas7

From: Barry Song <[email protected]>

marco project is replaced by atlas7 and we should obliterate its all traces.

---
 MAINTAINERS                        |   2 +-
 drivers/clocksource/Makefile       |   2 +-
 drivers/clocksource/timer-atlas7.c | 306 +++++++++++++++++++++++++++++++++++++
 drivers/clocksource/timer-marco.c  | 306 -------------------------------------
 4 files changed, 308 insertions(+), 308 deletions(-)
 create mode 100644 drivers/clocksource/timer-atlas7.c
 delete mode 100644 drivers/clocksource/timer-marco.c
MAINTAINERS +1 -1
index 2fa3853..f6923cf 100644
@@ -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
drivers/clocksource/Makefile +1 -1
index 94d90b2..306bc47 100644
@@ -18,7 +18,7 @@ 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
drivers/clocksource/timer-atlas7.c new file +306 -0

306 lines not on this page · raw message

drivers/clocksource/timer-marco.c deleted +0 -306

306 lines not on this page · raw message

Signature · 1 line
1.9.1
#3 lore raw

PATCH 3/9 ARM: clocksource: Add asm9260_timer driver

In reply to Daniel Lezcano

From: Oleksij Rempel <[email protected]>

In some cases asm9260 looks similar to iMX2x. One of exceptions is timer controller. So this patch introduces new driver for this special case.

---
 drivers/clocksource/Kconfig         |  10 ++
 drivers/clocksource/Makefile        |   1 +
 drivers/clocksource/asm9260_timer.c | 220 ++++++++++++++++++++++++++++++++++++
 3 files changed, 231 insertions(+)
 create mode 100644 drivers/clocksource/asm9260_timer.c
drivers/clocksource/Kconfig +10 -0
index fc01ec2..bfaaae4 100644
@@ -229,4 +229,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 +1 -0
index 306bc47..e5661cc9 100644
@@ -48,3 +48,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

Signature · 1 line
1.9.1
#4 lore raw

PATCH 4/9 clockevents: rockchip: Add rockchip timer for rk3288

In reply to Daniel Lezcano

The rk3288 board uses the architected timers and these ones are shutdown when the cpu is powered down. There is a need of a broadcast timer in this case to ensure proper wakeup when the cpus are in sleep mode and a timer expires.

This driver provides the basic timer functionnality as a backup for the local timers at sleep time.

The timer belongs to the alive subsystem. It includes two programmables 64 bits timer channels but the driver only uses 32bits. It works with two operations
mode: free running and user defined count.

Programing sequence:

1. Timer initialization:
* Disable the timer by writing '0' to the CONTROLREG register
* Program the timer mode by writing the mode to the CONTROLREG register
* Set the interrupt mask

2. Setting the count value:
* Load the count value to the registers COUNT0 and COUNT1 (not used).

3. Enable the timer
* Write '1' to the CONTROLREG register with the mode (free running or user)

---
 .../bindings/timer/rockchip,rk3288-timer.txt       |  18 +++
 arch/arm/mach-rockchip/Kconfig                     |   1 +
 drivers/clocksource/Kconfig                        |   4 +
 drivers/clocksource/Makefile                       |   1 +
 drivers/clocksource/rockchip_timer.c               | 180 +++++++++++++++++++++
 5 files changed, 204 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt
 create mode 100644 drivers/clocksource/rockchip_timer.c
Documentation/devicetree/bindings/timer/rockchip,rk3288-timer.txt new file +18 -0
new file mode 100644
index 0000000..87f0b00
@@ -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 at 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";
+	};
arch/arm/mach-rockchip/Kconfig +1 -0
index ac5803c..5078932 100644
@@ -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 +4 -0
index bfaaae4..a89120b 100644
@@ -26,6 +26,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
drivers/clocksource/Makefile +1 -0
index e5661cc9..21c11e2 100644
@@ -12,6 +12,7 @@ obj-$(CONFIG_CLKBLD_I8253)	+= i8253.o
 obj-$(CONFIG_CLKSRC_MMIO)	+= mmio.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
drivers/clocksource/rockchip_timer.c new file +180 -0

180 lines not on this page · raw message

Signature · 1 line
1.9.1
#5 lore raw

PATCH 5/9 clocksource: devicetree: Document Conexant Digicolor timer binding

In reply to Daniel Lezcano

From: Baruch Siach <[email protected]>

The Conexant CX92755 SoC provides 8 32-bit timers as part of its so called "Agent Communication" block. Timers can be configures either as free running or one shot. Each timer has a dedicated interrupt source in the CX92755 interrupts controller. The first timer (Timer A) can also be configured as watchdog.

This commit adds devicetree binding definition of this hardware module. The binding defined here should be reusable for other SoCs in the Digicolor series.

---
 .../devicetree/bindings/timer/digicolor-timer.txt      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/timer/digicolor-timer.txt
Documentation/devicetree/bindings/timer/digicolor-timer.txt new file +18 -0
new file mode 100644
index 0000000..d1b659b
@@ -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 at f0000fc0 {
+		compatible = "cnxt,cx92755-timer";
+		reg = <0xf0000fc0 0x40>;
+		interrupts = <19>, <31>, <34>, <35>, <52>, <53>, <54>, <55>;
+		clocks = <&main_clk>;
+	};
Signature · 1 line
1.9.1
#6 lore raw

PATCH 6/9 clocksource: Driver for Conexant Digicolor SoC timer

In reply to Daniel Lezcano

From: Baruch Siach <[email protected]>

Add clocksource driver to the Conexant CX92755 SoC, part of the Digicolor SoCs series. Hardware provides 8 timers, A to H. Timer A is dedicated to a future watchdog driver so we don't use it here. Use timer B for sched_clock, and timer C for clock_event.

---
 drivers/clocksource/Kconfig           |   3 +
 drivers/clocksource/Makefile          |   1 +
 drivers/clocksource/timer-digicolor.c | 199 ++++++++++++++++++++++++++++++++++
 3 files changed, 203 insertions(+)
 create mode 100644 drivers/clocksource/timer-digicolor.c
drivers/clocksource/Kconfig +3 -0
index a89120b..72a3827 100644
@@ -18,6 +18,9 @@ config CLKBLD_I8253
 config CLKSRC_MMIO
 	bool
 
+config DIGICOLOR_TIMER
+	bool
+
 config DW_APB_TIMER
 	bool
 
drivers/clocksource/Makefile +1 -0
index 21c11e2..0f8003d 100644
@@ -10,6 +10,7 @@ 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
drivers/clocksource/timer-digicolor.c new file +199 -0

199 lines not on this page · raw message

Signature · 1 line
1.9.1
#7 lore raw

Re: [PATCH 6/9] clocksource: Driver for Conexant Digicolor SoC timer

Quoted 21 lines · Daniel Lezcano

From: Baruch Siach <[email protected]>

Add clocksource driver to the Conexant CX92755 SoC, part of the Digicolor SoCs series. Hardware provides 8 timers, A to H. Timer A is dedicated to a future watchdog driver so we don't use it here. Use timer B for sched_clock, and timer C for clock_event.

---
 drivers/clocksource/Kconfig           |   3 +
 drivers/clocksource/Makefile          |   1 +
 drivers/clocksource/timer-digicolor.c | 199 ++++++++++++++++++++++++++++++++++
 3 files changed, 203 insertions(+)
 create mode 100644 drivers/clocksource/timer-digicolor.c
drivers/clocksource/Kconfig +0 -0
index a89120b..72a3827 100644

drivers/clocksource/Kconfig config CLKBLD_I8253 · line 23

Quoted 6 lines
drivers/clocksource/Kconfig +3 -0
@@ -18,6 +18,9 @@ config CLKBLD_I8253
 config CLKSRC_MMIO
 	bool
 
+config DIGICOLOR_TIMER
+	bool
+

And the select for this symbol (see https://lkml.org/lkml/2015/1/26/360)
will be provided in a separate patch? Because this patch, by itself, won't allow DIGICOLOR_TIMER to be set, will it?

drivers/clocksource/Kconfig config CLKBLD_I8253 · line 26

Quoted 3 lines
drivers/clocksource/Kconfig +0 -0
 config DW_APB_TIMER
 	bool
 

Paul Bolle

#8 lore raw

Re: [PATCH 6/9] clocksource: Driver for Conexant Digicolor SoC timer

Quoted 25 lines · Paul Bolle
Quoted 24 lines · Daniel Lezcano

From: Baruch Siach <[email protected]>

Add clocksource driver to the Conexant CX92755 SoC, part of the Digicolor SoCs series. Hardware provides 8 timers, A to H. Timer A is dedicated to a future watchdog driver so we don't use it here. Use timer B for sched_clock, and timer C for clock_event.

---
  drivers/clocksource/Kconfig           |   3 +
  drivers/clocksource/Makefile          |   1 +
  drivers/clocksource/timer-digicolor.c | 199 ++++++++++++++++++++++++++++++++++
  3 files changed, 203 insertions(+)

create mode 100644 drivers/clocksource/timer-digicolor.c

drivers/clocksource/Kconfig +0 -0
index a89120b..72a3827 100644
@@ -18,6 +18,9 @@ config CLKBLD_I8253
  config CLKSRC_MMIO
  	bool
 
Quoted 7 lines

drivers/clocksource/Kconfig config CLKBLD_I8253 · line 23

Quoted 3 lines
drivers/clocksource/Kconfig +3 -0
+config DIGICOLOR_TIMER
+	bool
+

And the select for this symbol (see https://lkml.org/lkml/2015/1/26/360)
will be provided in a separate patch? Because this patch, by itself, won't allow DIGICOLOR_TIMER to be set, will it?

You are right, that should be done in a separate patch. I believe Baruch should have done that.

Signature · 5 lines
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
maintainer
#9 lore raw

Re: [PATCH 6/9] clocksource: Driver for Conexant Digicolor SoC timer

In reply to Paul Bolle

Hi Paul,

Quoted 8 lines · Paul Bolle

drivers/clocksource/Kconfig config CLKBLD_I8253 · line 22

Quoted 3 lines · Daniel Lezcano

From: Baruch Siach <[email protected]>

drivers/clocksource/Kconfig +2 -0
+config DIGICOLOR_TIMER
+	bool

And the select for this symbol (see https://lkml.org/lkml/2015/1/26/360)
will be provided in a separate patch? Because this patch, by itself, won't allow DIGICOLOR_TIMER to be set, will it?

Yes. Posted yesterday. See
http://article.gmane.org/gmane.linux.ports.arm.kernel/390166.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#11 lore raw

PATCH 7/9 dt/bindings: Add binding for Versatile system registers

In reply to Daniel Lezcano

From: Rob Herring <[email protected]>

Add binding for Versatile board system registers found in the FPGA of the Versatile/AB and Versatile/PB boards.

Cc Pawel Moll <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Ian Campbell <[email protected]>
Cc Kumar Gala <[email protected]>
Cc devicetree at vger.kernel.org
---
 Documentation/devicetree/bindings/arm/versatile-sysreg.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/versatile-sysreg.txt
Documentation/devicetree/bindings/arm/versatile-sysreg.txt new file +10 -0
new file mode 100644
index 0000000..a4f1526
@@ -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
Signature · 1 line
1.9.1
#12 lore raw

PATCH 8/9 clocksource: versatile: Adapt for Versatile AB and PB boards

In reply to Daniel Lezcano

From: Rob Herring <[email protected]>

The same 24MHz counter is also present on Versatile AB and PB boards, so add the compatible string for them.

Cc Liviu Dudau <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Thomas Gleixner <[email protected]>
---
 drivers/clocksource/versatile.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clocksource/versatile.c +3 -1
index 2798e74..0a26d3d 100644
@@ -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);
Signature · 1 line
1.9.1
#13 lore raw

PATCH 9/9 dts: versatile: Add sysregs node

In reply to Daniel Lezcano

From: Rob Herring <[email protected]>

The Versatile boards have the same sysregs as other ARM Ltd boards. Add the nodes in order to enable support for 24MHz counter as sched_clock.

This is a minimal node definition as the existing sub node definition used on VExpress has some issues raised by Linus W.

Cc Russell King <[email protected]>
Cc Linus Walleij <[email protected]>
Cc devicetree at vger.kernel.org
---
 arch/arm/boot/dts/versatile-ab.dts | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/versatile-ab.dts +5 -0
index 27d0d9c..01f4019 100644
@@ -252,6 +252,11 @@
 			#size-cells = <1>;
 			ranges = <0 0x10000000 0x10000>;
 
+			sysreg at 0 {
+				compatible = "arm,versatile-sysreg", "syscon";
+				reg = <0x00000 0x1000>;
+			};
+
 			aaci at 4000 {
 				compatible = "arm,primecell";
 				reg = <0x4000 0x1000>;
Signature · 1 line
1.9.1
#14 lore raw
In reply to Daniel Lezcano

Hi Thomas,

just a gentle reminder ;)

Thanks

-- Daniel

Quoted 103 lines · Daniel Lezcano

this pull request contains the following changes:

* Barry Song renamed the marco timer to atlas7

* Baruch Siach provided a new driver for the Conexant Digicolor SoCs

* Daniel Lezcano added a new driver for the rockchip rk3288 board

* Oleksij Rempel added a new driver asm9260 for mips

* Rob Herring added the DT definition for the versatile AB/PB boards
as these ones are compatible with the Versatile clocksource

* Thierry Reding removed an used variable for the sirf driver

The following changes since commit
9bc7491906b4113b4c5ae442157c7dfc4e10cd14:

hrtimer: Prevent stale expiry time in hrtimer_interrupt() (2015-01-23
12:13:20 +0100)

are available in the git repository at:

http://git.linaro.org/people/daniel.lezcano/linux.git clockevents/3.20

for you to fetch changes up to 35a8578e8b83eb13f8d57ab40b98bcfd5199d3d4:

dts: versatile: Add sysregs node (2015-01-29 14:02:16 +0100)

----------------------------------------------------------------
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

  Documentation/devicetree/bindings/arm/versatile-sysreg.txt        | 10
++++++++++
  Documentation/devicetree/bindings/timer/digicolor-timer.txt       | 18
+++++++++++++++++
  Documentation/devicetree/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
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

  drivers/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.c--

<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Signature · 5 lines
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog