[GIT PULL] ux500-timers

[GIT PULL] ux500-timers

[Linus Walleij]

Hi Arnd,

could you please pull the ux500-timers branch into the arm-soc
tree? These patches have circulated for a long time and my repost
from last week has not generated any new comments.

(On popular request I try to keep pull requests per-topic...)

The following changes since commit d93dc5c4478c1fd5de85a3e8aece9aad7bbae044:

  Linux 3.1-rc7 (2011-09-21 16:58:15 -0700)

are available in the git repository at:
  git://git.linaro.org/people/triad/linux-stericsson.git ux500-nomadik-timers

Jonas Aaberg (4):
      ARM: ux500: Move timer code to separate file
      ARM: plat-nomadik: timer: Add support for periodic timers
      ARM: plat-nomadik: timer: Export reset functions
      ARM: ux500: Reprogram timers upon resume

Mattias Wallin (3):
      ARM: plat-nomadik: MTU sched_clock as an option
      clocksource: add DBX500 PRCMU Timer support
      ARM: ux500: add support for clocksource DBX500 PRCMU

 arch/arm/mach-ux500/Makefile                   |    2 +-
 arch/arm/mach-ux500/cpu.c                      |   29 +-----
 arch/arm/mach-ux500/include/mach/db5500-regs.h |    2 +
 arch/arm/mach-ux500/include/mach/db8500-regs.h |    3 +
 arch/arm/mach-ux500/timer.c                    |   65 +++++++++++
 arch/arm/plat-nomadik/Kconfig                  |    8 ++-
 arch/arm/plat-nomadik/include/plat/mtu.h       |   47 +--------
 arch/arm/plat-nomadik/timer.c                  |  138 ++++++++++++++++++------
 drivers/clocksource/Kconfig                    |   15 +++
 drivers/clocksource/Makefile                   |    1 +
 drivers/clocksource/clksrc-dbx500-prcmu.c      |  104 ++++++++++++++++++
 include/linux/clksrc-dbx500-prcmu.h            |   22 ++++
 12 files changed, 330 insertions(+), 106 deletions(-)
 create mode 100644 arch/arm/mach-ux500/timer.c
 create mode 100644 drivers/clocksource/clksrc-dbx500-prcmu.c
 create mode 100644 include/linux/clksrc-dbx500-prcmu.h

Yours,
Linus Walleij

[GIT PULL] ux500-timers

[Arnd Bergmann]

On Tuesday 27 September 2011, Linus Walleij wrote:
> could you please pull the ux500-timers branch into the arm-soc
> tree? These patches have circulated for a long time and my repost
> from last week has not generated any new comments.
> 
> (On popular request I try to keep pull requests per-topic...)

Thanks, I really like it this way!

> The following changes since commit d93dc5c4478c1fd5de85a3e8aece9aad7bbae044:
> 
>   Linux 3.1-rc7 (2011-09-21 16:58:15 -0700)
> 
> are available in the git repository at:
>   git://git.linaro.org/people/triad/linux-stericsson.git ux500-nomadik-timers

pulled into a new top-level next/timer branch.

	Arnd

[GIT PULL] ux500-timers

[Arnd Bergmann]

On Friday 30 September 2011 22:28:46 Arnd Bergmann wrote:
> 
> > The following changes since commit d93dc5c4478c1fd5de85a3e8aece9aad7bbae044:
> > 
> >   Linux 3.1-rc7 (2011-09-21 16:58:15 -0700)
> > 
> > are available in the git repository at:
> >   git://git.linaro.org/people/triad/linux-stericsson.git ux500-nomadik-timers
> 
> pulled into a new top-level next/timer branch.

Hi Linus,

It caused a few build regressions:

- missing include of errno.h
- clksrc_dbx500_prcmu_init stub needs to be static inline, or it causes a
  link failure.
- clksrc_dbx500_timer_base may be initialized when it's not actually linked in

For the last one, I think it would actually be best to make the timer 
a platform_device and pass the address in platform_data or device tree
property, or alternatively make it an argument to clksrc_dbx500_prcmu_init
and make the variable static.

Please send a new pull request with these things fixed, either with
patches on top or replacing the original ones, whichever you prefer.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index 08c55a5..fbbbe0b 100644
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -5,6 +5,7 @@
  * Author: Mattias Wallin <mattias.wallin@stericsson.com> for ST-Ericsson
  */
 #include <linux/io.h>
+#include <linux/errno.h>
 #include <linux/clksrc-dbx500-prcmu.h>
 
 #include <asm/localtimer.h>
@@ -14,6 +15,8 @@
 #include <mach/setup.h>
 #include <mach/hardware.h>
 
+void __iomem *clksrc_dbx500_timer_base;
+
 static void __init ux500_timer_init(void)
 {
 	if (cpu_is_u5500()) {
diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c
index 0ac5093..d5f7847 100644
--- a/drivers/clocksource/clksrc-dbx500-prcmu.c
+++ b/drivers/clocksource/clksrc-dbx500-prcmu.c
@@ -31,8 +31,6 @@
 
 #define SCHED_CLOCK_MIN_WRAP 131072 /* 2^32 / 32768 */
 
-void __iomem *clksrc_dbx500_timer_base;
-
 static cycle_t clksrc_dbx500_prcmu_read(struct clocksource *cs)
 {
 	u32 count, count2;
diff --git a/include/linux/clksrc-dbx500-prcmu.h b/include/linux/clksrc-dbx500-prcmu.h
index d1e9504..9f733cb 100644
--- a/include/linux/clksrc-dbx500-prcmu.h
+++ b/include/linux/clksrc-dbx500-prcmu.h
@@ -16,7 +16,7 @@ extern void __iomem *clksrc_dbx500_timer_base;
 #ifdef CONFIG_CLKSRC_DBX500_PRCMU
 void __init clksrc_dbx500_prcmu_init(void);
 #else
-void __init clksrc_dbx500_prcmu_init(void) {}
+static inline void __init clksrc_dbx500_prcmu_init(void) {}
 #endif
 
 #endif

[GIT PULL] ux500-timers

[Linus Walleij]

On Sat, Oct 1, 2011 at 6:00 PM, Arnd Bergmann <arnd@arndb.de> wrote:

> It caused a few build regressions:
>
> - missing include of errno.h
> - clksrc_dbx500_prcmu_init stub needs to be static inline, or it causes a
> ?link failure.

Sorry about this crap I'll be looking closer next time :-(

> - clksrc_dbx500_timer_base may be initialized when it's not actually linked in
>
> For the last one, I think it would actually be best to make the timer
> a platform_device and pass the address in platform_data or device tree
> property, or alternatively make it an argument to clksrc_dbx500_prcmu_init
> and make the variable static.

I chose the latter approach.

> Please send a new pull request with these things fixed, either with
> patches on top or replacing the original ones, whichever you prefer.

I have applied a hacked version of your patch like this:

[GIT PULL] ux500-timers

[Linus Walleij]

Hi Arnd,

could you please pull the updated ux500 timer branch into the arm-soc
tree?

The following changes since commit d93dc5c4478c1fd5de85a3e8aece9aad7bbae044:

  Linux 3.1-rc7 (2011-09-21 16:58:15 -0700)

are available in the git repository at:
   git://git.linaro.org/people/triad/linux-stericsson.git ux500-nomadik-timers

Jonas Aaberg (4):
      ARM: ux500: Move timer code to separate file
      ARM: plat-nomadik: timer: Add support for periodic timers
      ARM: plat-nomadik: timer: Export reset functions
      ARM: ux500: Reprogram timers upon resume

Linus Walleij (1):
      clocksource: fixup ux500 build problems

Mattias Wallin (3):
      ARM: plat-nomadik: MTU sched_clock as an option
      clocksource: add DBX500 PRCMU Timer support
      ARM: ux500: add support for clocksource DBX500 PRCMU

 arch/arm/mach-ux500/Makefile                   |    2 +-
 arch/arm/mach-ux500/cpu.c                      |   29 +-----
 arch/arm/mach-ux500/include/mach/db5500-regs.h |    2 +
 arch/arm/mach-ux500/include/mach/db8500-regs.h |    3 +
 arch/arm/mach-ux500/timer.c                    |   68 ++++++++++++
 arch/arm/plat-nomadik/Kconfig                  |    8 ++-
 arch/arm/plat-nomadik/include/plat/mtu.h       |   47 +--------
 arch/arm/plat-nomadik/timer.c                  |  138 ++++++++++++++++++------
 drivers/clocksource/Kconfig                    |   15 +++
 drivers/clocksource/Makefile                   |    1 +
 drivers/clocksource/clksrc-dbx500-prcmu.c      |  106 ++++++++++++++++++
 include/linux/clksrc-dbx500-prcmu.h            |   20 ++++
 12 files changed, 333 insertions(+), 106 deletions(-)
 create mode 100644 arch/arm/mach-ux500/timer.c
 create mode 100644 drivers/clocksource/clksrc-dbx500-prcmu.c
 create mode 100644 include/linux/clksrc-dbx500-prcmu.h

[GIT PULL] ux500-timers

[Linus Walleij]

On Mon, Oct 3, 2011 at 9:41 AM, Linus Walleij <linus.walleij@linaro.org> wrote:

> Hi Arnd,
>
> could you please pull the updated ux500 timer branch into the arm-soc
> tree?
>
> The following changes since commit d93dc5c4478c1fd5de85a3e8aece9aad7bbae044:
>
> ?Linux 3.1-rc7 (2011-09-21 16:58:15 -0700)
>
> are available in the git repository at:
> ? git://git.linaro.org/people/triad/linux-stericsson.git ux500-nomadik-timers

Ping on this, note fixup patch at the end of the series, as requested.

Linus Walleij

[GIT PULL] ux500-timers

[Arnd Bergmann]

On Friday 07 October 2011, Linus Walleij wrote:
> On Mon, Oct 3, 2011 at 9:41 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> 
> > Hi Arnd,
> >
> > could you please pull the updated ux500 timer branch into the arm-soc
> > tree?
> >
> > The following changes since commit d93dc5c4478c1fd5de85a3e8aece9aad7bbae044:
> >
> >  Linux 3.1-rc7 (2011-09-21 16:58:15 -0700)
> >
> > are available in the git repository at:
> >   git://git.linaro.org/people/triad/linux-stericsson.git ux500-nomadik-timers
> 
> Ping on this, note fixup patch at the end of the series, as requested.

Pulled now, sorry for the delay.

	Arnd