diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 10:54:34 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 10:54:34 -0800 |
| commit | efcf3d38f128cfbfc7a62c3a5dc3fb42991c12e5 (patch) | |
| tree | e581e1bb663d960f3ef3cae6191a3ec792c52ae4 /arch/arm/Makefile | |
| parent | 6878e0c0a52a0937e98872c9a8ecc374c266d418 (diff) | |
| parent | d5917ef318b850fc72bd10db438580f7d1c406d9 (diff) | |
Merge tag 'renesas-sh-soc-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers
Renesas SH based SoC Updates for v3.14
* Global
- Don't set plat_sci_port scbrr_algo_id field
- Declare SCIF register base and IRQ as resources
* sh772[34] SoCs
- Set serial port sampling rate to 8 for SCIFA ports
(These are merged through arm-soc due to dependencies with the SCI platform data
rework done for shmobile)
* tag 'renesas-sh-soc-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
sh: Don't set plat_sci_port scbrr_algo_id field
sh: sh772[34]: Set serial port sampling rate to 8 for SCIFA ports
sh: Declare SCIF register base and IRQ as resources
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Makefile')
0 files changed, 0 insertions, 0 deletions