[GIT PULL] Renesas ARM based SoC lager board updates for v3.10

[GIT PULL] Renesas ARM based SoC lager board updates for v3.10

[Simon Horman]

Hi Arnd, Hi Olof,

Please note this is based on a merge with renesas-soc-r8a7790-for-v3.10
which corresponds to the pull request I sent a few minutes ago:
"[GIT PULL] Renesas ARM based r8a7790 SoC update for v3.10".

The following changes since commit ac119ccd80eb914185229c4c4086f3debdd4c764:

  Merge branch 'soc-r8a7790' into boards-lager (2013-04-09 21:40:20 +0900)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-lager-for-v3.10

for you to fetch changes up to 65be2de17aae0fd94e55f7c4a474933cf4607ea2:

  ARM: shmobile: use r8a7790 timer setup code on Lager (2013-04-09 21:40:59 +0900)

----------------------------------------------------------------
Renesas ARM based SoC lager board updates for v3.10

* Use r8a7790 timer setup code to force the
  arch timer to be enabled regardless of the bootloader setting
  - This is necessary for the lager board to boot

This pull request is based on:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards3-for-v3.10
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-r8a7790-for-v3.10

The merge was made to provide the r8a7790 timer setup code

----------------------------------------------------------------
Magnus Damm (1):
      ARM: shmobile: use r8a7790 timer setup code on Lager

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

[PATCH] ARM: shmobile: use r8a7790 timer setup code on Lager

[Simon Horman]

From: Magnus Damm <damm@opensource.se>

Use the r8a7790 timer init function on Lager
to make sure the architected timer is started
regardless of boot loader setting.

Signed-off-by: Magnus Damm <damm@opensource.se>
Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-lager.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index ea6f9e5..f587187 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -40,7 +40,7 @@ static const char *lager_boards_compat_dt[] __initdata = {
 
 DT_MACHINE_START(LAGER_DT, "lager")
 	.init_irq	= irqchip_init,
-	.init_time	= shmobile_timer_init,
+	.init_time	= r8a7790_timer_init,
 	.init_machine	= lager_add_standard_devices,
 	.dt_compat	= lager_boards_compat_dt,
 MACHINE_END
-- 
1.7.10.4

[GIT PULL] Renesas ARM based SoC lager board updates for v3.10

[Olof Johansson]

On Thu, Apr 11, 2013 at 05:18:45PM +0900, Simon Horman wrote:
> Hi Arnd, Hi Olof,
> 
> Please note this is based on a merge with renesas-soc-r8a7790-for-v3.10
> which corresponds to the pull request I sent a few minutes ago:
> "[GIT PULL] Renesas ARM based r8a7790 SoC update for v3.10".
> 
> The following changes since commit ac119ccd80eb914185229c4c4086f3debdd4c764:
> 
>   Merge branch 'soc-r8a7790' into boards-lager (2013-04-09 21:40:20 +0900)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-lager-for-v3.10
> 
> for you to fetch changes up to 65be2de17aae0fd94e55f7c4a474933cf4607ea2:
> 
>   ARM: shmobile: use r8a7790 timer setup code on Lager (2013-04-09 21:40:59 +0900)
> 
> ----------------------------------------------------------------
> Renesas ARM based SoC lager board updates for v3.10
> 
> * Use r8a7790 timer setup code to force the
>   arch timer to be enabled regardless of the bootloader setting
>   - This is necessary for the lager board to boot
> 
> This pull request is based on:
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards3-for-v3.10
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-r8a7790-for-v3.10
> 
> The merge was made to provide the r8a7790 timer setup code

Pulled.

By the way, the dependencies above are probably better described in
the email than in the tag, since there's a good chance your branches
will be gone from kernel.org by the time someone reads the changelog;
i.e. it doesn't really provide useful information for the changelog. It's very
useful for us though so please continue to provide it.


-Olog

[GIT PULL] Renesas ARM based SoC lager board updates for v3.10

[Simon Horman]

On Thu, Apr 11, 2013 at 10:38:19AM -0700, Olof Johansson wrote:
> On Thu, Apr 11, 2013 at 05:18:45PM +0900, Simon Horman wrote:
> > Hi Arnd, Hi Olof,
> > 
> > Please note this is based on a merge with renesas-soc-r8a7790-for-v3.10
> > which corresponds to the pull request I sent a few minutes ago:
> > "[GIT PULL] Renesas ARM based r8a7790 SoC update for v3.10".
> > 
> > The following changes since commit ac119ccd80eb914185229c4c4086f3debdd4c764:
> > 
> >   Merge branch 'soc-r8a7790' into boards-lager (2013-04-09 21:40:20 +0900)
> > 
> > are available in the git repository at:
> > 
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-lager-for-v3.10
> > 
> > for you to fetch changes up to 65be2de17aae0fd94e55f7c4a474933cf4607ea2:
> > 
> >   ARM: shmobile: use r8a7790 timer setup code on Lager (2013-04-09 21:40:59 +0900)
> > 
> > ----------------------------------------------------------------
> > Renesas ARM based SoC lager board updates for v3.10
> > 
> > * Use r8a7790 timer setup code to force the
> >   arch timer to be enabled regardless of the bootloader setting
> >   - This is necessary for the lager board to boot
> > 
> > This pull request is based on:
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards3-for-v3.10
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-r8a7790-for-v3.10
> > 
> > The merge was made to provide the r8a7790 timer setup code
> 
> Pulled.
> 
> By the way, the dependencies above are probably better described in
> the email than in the tag, since there's a good chance your branches
> will be gone from kernel.org by the time someone reads the changelog;
> i.e. it doesn't really provide useful information for the changelog. It's very
> useful for us though so please continue to provide it.

Thanks. In general the merges refer to tags which I intend to keep around.
But I take your point and I will move the merge information out of the
tag and thus the change log and into the email.