linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] Third Round of Renesas ARM based SoC fixes for v3.12
@ 2013-09-05  6:23 Simon Horman
  2013-09-05  6:23 ` [PATCH] ARM: shmobile: r8a7779: Update early timer initialisation order Simon Horman
  2013-09-10  0:26 ` [GIT PULL] Third Round of Renesas ARM based SoC fixes for v3.12 Olof Johansson
  0 siblings, 2 replies; 3+ messages in thread
From: Simon Horman @ 2013-09-05  6:23 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Kevin, Hi Olof, Hi Arnd,

please consider this third round of Renesas ARM based SoC DT fixes for v3.12.

This pull request is based on renesas-fixes2-for-v3.12 which
you have already pulled.


The following changes since commit ab40900b70dc31a64f23b1b4dbb0917afb039775:

  ARM: shmobile: armadillo800eva-reference: fix compiler warning (2013-07-23 10:35:33 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes3-for-v3.12

for you to fetch changes up to 7658ea2fb57831c6836ffcfb20bcb84f3ff55dfb:

  ARM: shmobile: r8a7779: Update early timer initialisation order (2013-08-30 09:31:39 +0900)

----------------------------------------------------------------
Third Round of Renesas ARM based SoC fixes for v3.12

* Update early timer initialisation order of r8a7779 SoC

  This resolves a regression introduced by
  a894fcc2d01a89e6fe3da0845a4d80a5312e1124 ("ARM: smp_twd: Divorce smp_twd
  from local timer API").
  This problem was introduced in v3.10-rc2.

----------------------------------------------------------------
Simon Horman (1):
      ARM: shmobile: r8a7779: Update early timer initialisation order

 arch/arm/mach-shmobile/setup-r8a7779.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] ARM: shmobile: r8a7779: Update early timer initialisation order
  2013-09-05  6:23 [GIT PULL] Third Round of Renesas ARM based SoC fixes for v3.12 Simon Horman
@ 2013-09-05  6:23 ` Simon Horman
  2013-09-10  0:26 ` [GIT PULL] Third Round of Renesas ARM based SoC fixes for v3.12 Olof Johansson
  1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2013-09-05  6:23 UTC (permalink / raw)
  To: linux-arm-kernel

a894fcc2d01a89e6fe3da0845a4d80a5312e1124 ("ARM: smp_twd: Divorce smp_twd
from local timer API") altered twd_local_timer_common_register() so that it
may make use of late_timer_init.

This is problematic on marzen with Magnus's recent patch "ARM: shmobile:
marzen: Switch to DT_MACHINE_START" which switches marzen around to enable
USE_OF and thus shmobile_timer_init(), which is registered as
late_time_init by shmobile_earlytimer_init() stops being a no-op.

As a work-around I have updated r8a7779_earlytimer_init() so that
shmobile_earlytimer_init() is called after r8a7779_register_twd().
Or in other words, the shmobile_earlytimer_init() setting of
late_time_init overwrites that of twd_local_timer_common_register().

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Magnus Damm <damm@opensource.se>
---
 arch/arm/mach-shmobile/setup-r8a7779.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 3986877..3c5fae5 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -616,8 +616,8 @@ void __init __weak r8a7779_register_twd(void) { }
 void __init r8a7779_earlytimer_init(void)
 {
 	r8a7779_clock_init();
-	shmobile_earlytimer_init();
 	r8a7779_register_twd();
+	shmobile_earlytimer_init();
 }
 
 void __init r8a7779_add_early_devices(void)
-- 
1.8.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [GIT PULL] Third Round of Renesas ARM based SoC fixes for v3.12
  2013-09-05  6:23 [GIT PULL] Third Round of Renesas ARM based SoC fixes for v3.12 Simon Horman
  2013-09-05  6:23 ` [PATCH] ARM: shmobile: r8a7779: Update early timer initialisation order Simon Horman
@ 2013-09-10  0:26 ` Olof Johansson
  1 sibling, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2013-09-10  0:26 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Sep 05, 2013 at 03:23:21PM +0900, Simon Horman wrote:
> Hi Kevin, Hi Olof, Hi Arnd,
> 
> please consider this third round of Renesas ARM based SoC DT fixes for v3.12.
> 
> This pull request is based on renesas-fixes2-for-v3.12 which
> you have already pulled.
> 
> 
> The following changes since commit ab40900b70dc31a64f23b1b4dbb0917afb039775:
> 
>   ARM: shmobile: armadillo800eva-reference: fix compiler warning (2013-07-23 10:35:33 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes3-for-v3.12

Pulled into fixes.


-Olof

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-09-10  0:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-05  6:23 [GIT PULL] Third Round of Renesas ARM based SoC fixes for v3.12 Simon Horman
2013-09-05  6:23 ` [PATCH] ARM: shmobile: r8a7779: Update early timer initialisation order Simon Horman
2013-09-10  0:26 ` [GIT PULL] Third Round of Renesas ARM based SoC fixes for v3.12 Olof Johansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).