Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 9251c6c0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-boards-lager-for-v3.10' of...

Merge tag 'renesas-boards-lager-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2

From Simon Horman:
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

* tag 'renesas-boards-lager-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: use r8a7790 timer setup code on Lager
  ARM: shmobile: force enable of r8a7790 arch timer
  ARM: shmobile: Add second I/O range for r8a7790 PFC

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents afa3a13d 65be2de1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment