mbox

[GIT,PULL] : clockevents: new material for 3.20

Message ID 54CA3044.6070501@linaro.org
State New
Headers show

Pull-request

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

Message

Daniel Lezcano Jan. 29, 2015, 1:06 p.m. UTC
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

Comments

Paul Bolle Jan. 29, 2015, 1:37 p.m. UTC | #1
On Thu, 2015-01-29 at 14:08 +0100, Daniel Lezcano wrote:
> From: Baruch Siach <baruch@tkos.co.il>
> 
> 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.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
>  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
> 
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> index a89120b..72a3827 100644
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -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?
 
>  config DW_APB_TIMER
>  	bool
>  


Paul Bolle
Daniel Lezcano Jan. 29, 2015, 1:52 p.m. UTC | #2
On 01/29/2015 02:37 PM, Paul Bolle wrote:
> On Thu, 2015-01-29 at 14:08 +0100, Daniel Lezcano wrote:
>> From: Baruch Siach <baruch@tkos.co.il>
>>
>> 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.
>>
>> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>> ---
>>   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
>>
>> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
>> index a89120b..72a3827 100644
>> --- a/drivers/clocksource/Kconfig
>> +++ b/drivers/clocksource/Kconfig
>> @@ -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?

You are right, that should be done in a separate patch. I believe Baruch 
should have done that.
Baruch Siach Jan. 29, 2015, 2:26 p.m. UTC | #3
Hi Paul,

On Thu, Jan 29, 2015 at 02:37:36PM +0100, Paul Bolle wrote:
> On Thu, 2015-01-29 at 14:08 +0100, Daniel Lezcano wrote:
> > From: Baruch Siach <baruch@tkos.co.il>
> > +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
Paul Bolle Jan. 29, 2015, 2:33 p.m. UTC | #4
On Thu, 2015-01-29 at 16:26 +0200, Baruch Siach wrote:
> > 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.

I see. Thanks!


Paul Bolle
Daniel Lezcano Feb. 2, 2015, 9:38 p.m. UTC | #5
Hi Thomas,

just a gentle reminder ;)

Thanks

   -- Daniel

> On 01/29/2015 02:06 PM, Daniel Lezcano wrote:
> 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
>