[GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window

[GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window

[Olof Johansson]

On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
> The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
> 
>   Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
> 
> for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
> 
>   ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
> 

Thanks, pulled into next/cleanup.


-Olof

[GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window

[Olof Johansson]

On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
> The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
> 
>   Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
> 
> for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
> 
>   ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)

By the way, I had to apply the following fixup on top of this (in next/cleanup)
to fix a compilation failure. Seems to be caused by "ARM: OMAP2+: timer: remove
CONFIG_OMAP_32K_TIMER" from Igor.

Also, add __init annotation to remove 12 section mismatches (and take off the
explicit inline since __init + inline doesn't make sense -- the compiler should
do the right thing anyway).

-Olof

>From 73f14f6d007df1596da7cea9113084acfe846b8f Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Thu, 29 Nov 2012 23:05:32 -0800
Subject: [PATCH] ARM: omap: fix typo on timer cleanup

Fix 32 vs 32k typo:

arch/arm/mach-omap2/timer.c: In function 'omap4_local_timer_init':
arch/arm/mach-omap2/timer.c:633:2: error: implicit declaration of function 'omap4_sync32_timer_init' [-Werror=implicit-function-declaration]
arch/arm/mach-omap2/timer.c: At top level:
arch/arm/mach-omap2/timer.c:610:2: warning: 'omap4_sync32k_timer_init' defined but not used [-Wunused-function]

Also, mark the omap4_local_timer_init() stub as __init (and take off
the explicit inline and let the compiler do the work instead).

Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
---
 arch/arm/mach-omap2/timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index b9cff72..7016637 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -628,9 +628,9 @@ static void __init omap4_local_timer_init(void)
 	}
 }
 #else /* CONFIG_LOCAL_TIMERS */
-static inline void omap4_local_timer_init(void)
+static void __init omap4_local_timer_init(void)
 {
-	omap4_sync32_timer_init();
+	omap4_sync32k_timer_init();
 }
 #endif /* CONFIG_LOCAL_TIMERS */
 OMAP_SYS_TIMER(4, local);
-- 
1.7.10.1.488.g05fbf7a

[GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window

[Santosh Shilimkar]

Olof,

On Friday 30 November 2012 12:48 PM, Olof Johansson wrote:
> On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
>> The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
>>
>>    Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
>>
>> are available in the git repository at:
>>
>>
>>    git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
>>
>> for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
>>
>>    ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
>
> By the way, I had to apply the following fixup on top of this (in next/cleanup)
> to fix a compilation failure. Seems to be caused by "ARM: OMAP2+: timer: remove
> CONFIG_OMAP_32K_TIMER" from Igor.
>
There was similar patch [1] like yours from Jon to fix above build
break.

Regards
santosh

[1] http://www.spinics.net/lists/linux-omap/msg83260.html

[GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window

[Tony Lindgren]

* Santosh Shilimkar <santosh.shilimkar@ti.com> [121130 00:06]:
> Olof,
> 
> On Friday 30 November 2012 12:48 PM, Olof Johansson wrote:
> >On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
> >>The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
> >>
> >>   Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
> >>
> >>are available in the git repository at:
> >>
> >>
> >>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
> >>
> >>for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
> >>
> >>   ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
> >
> >By the way, I had to apply the following fixup on top of this (in next/cleanup)
> >to fix a compilation failure. Seems to be caused by "ARM: OMAP2+: timer: remove
> >CONFIG_OMAP_32K_TIMER" from Igor.

Yes thanks.

> There was similar patch [1] like yours from Jon to fix above build
> break.

There's also few more fixes that I'll queue once these pending
branches are merged.

Regards,

Tony
 
> [1] http://www.spinics.net/lists/linux-omap/msg83260.html

[GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window

[Tony Lindgren]

The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:

  Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed

for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:

  ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)

----------------------------------------------------------------
Timer clean-up to get us closer to moving timer code to drivers,
and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board
or devicetree provided timer configuration.

Note that these changes are on top of the recent timer fixes.

----------------------------------------------------------------
Igor Grinberg (2):
      ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
      ARM: OMAP3: cm-t3517: use GPTIMER for system clock

Jon Hunter (8):
      ARM: OMAP: Clean-up dmtimer reset code
      ARM: OMAP: Define omap_dm_timer_prepare function as static
      ARM: OMAP: Don't store timers physical address
      ARM: OMAP2+: Remove unnecessary local variable in timer code
      ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration
      ARM: OMAP: Add platform data header for DMTIMERs
      ARM: OMAP: Remove unnecessary inclusion of dmtimer.h
      ARM: OMAP2+: Fix compiler warning for 32k timer

Tony Lindgren (1):
      Merge branch 'cleanup-timer' of git://github.com/jonhunter/linux into omap-for-v3.8/timer

 arch/arm/mach-omap1/timer.c                |   1 +
 arch/arm/mach-omap1/timer32k.c             |   1 -
 arch/arm/mach-omap2/board-cm-t3517.c       |   2 +-
 arch/arm/mach-omap2/common.h               |   1 +
 arch/arm/mach-omap2/omap_hwmod_2420_data.c |   1 -
 arch/arm/mach-omap2/omap_hwmod_2430_data.c |   1 -
 arch/arm/mach-omap2/pm-debug.c             |   1 -
 arch/arm/mach-omap2/timer.c                | 167 +++++++++++++----------------
 arch/arm/plat-omap/Kconfig                 |   6 ++
 arch/arm/plat-omap/dmtimer.c               |  54 ++++++----
 arch/arm/plat-omap/include/plat/dmtimer.h  |  80 ++++----------
 drivers/staging/tidspbridge/core/ue_deh.c  |   1 -
 include/linux/platform_data/dmtimer-omap.h |  31 ++++++
 13 files changed, 168 insertions(+), 179 deletions(-)
 create mode 100644 include/linux/platform_data/dmtimer-omap.h