diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-21 21:05:58 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-21 21:05:58 (GMT) |
| commit | 82711e7b46d80a6fd946166bd012b052d53b8ff4 (patch) | |
| tree | 0dbfdd45542ab318e733a91724620ce9a6f79617 /arch/arm/mach-shmobile/setup-r8a7791.c | |
| parent | 91f0f06ccbd2a0648160aad6783b7da92e2880d7 (diff) | |
| parent | c17fcfbcc0f6b4f3cae761149e1a6108dd6750e7 (diff) | |
| download | linux-82711e7b46d80a6fd946166bd012b052d53b8ff4.tar.xz | |
Merge tag 'renesas-clock-cleanup2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
Merge "Renesas SoC Clock Cleanups for v3.16" from Simon Horman:
Work from Laurent Pinchart to switch all Renesas platforms to the new style
CMT, MTU2 and TMU device platform data. This is in preparation for
initialising these devices using DT on ARM Based Renesas SoCs.
* tag 'renesas-clock-cleanup2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r7s72100: Switch to new style MTU2 device
sh: Switch to new style MTU2 device
ARM: shmobile: r8a7779: Switch to new style TMU device
ARM: shmobile: r8a7778: Switch to new style TMU device
ARM: shmobile: r8a7740: Switch to new style TMU device
ARM: shmobile: sh73a0: Switch to new style TMU device
ARM: shmobile: sh7372: Switch to new style TMU device
sh: Switch to new style TMU device
ARM: shmobile: r8a7791: Switch to new style CMT device
ARM: shmobile: r8a7790: Switch to new style CMT device
ARM: shmobile: r8a7740: Switch to new style CMT device
ARM: shmobile: r8a73a4: Switch to new style CMT device
ARM: shmobile: sh73a0: Switch to new style CMT device
ARM: shmobile: sh7372: Switch to new style CMT device
sh: Switch to new style CMT device
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a7791.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7791.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c index e28404e..561653d 100644 --- a/arch/arm/mach-shmobile/setup-r8a7791.c +++ b/arch/arm/mach-shmobile/setup-r8a7791.c @@ -128,20 +128,17 @@ R8A7791_SCIFA(14, 0xe6c80000, gic_spi(31)); /* SCIFA5 */ &scif##index##_platform_data, \ sizeof(scif##index##_platform_data)) -static const struct sh_timer_config cmt00_platform_data __initconst = { - .name = "CMT00", - .timer_bit = 0, - .clockevent_rating = 80, +static struct sh_timer_config cmt0_platform_data = { + .channels_mask = 0x60, }; -static const struct resource cmt00_resources[] __initconst = { - DEFINE_RES_MEM(0xffca0510, 0x0c), - DEFINE_RES_MEM(0xffca0500, 0x04), - DEFINE_RES_IRQ(gic_spi(142)), /* CMT0_0 */ +static struct resource cmt0_resources[] = { + DEFINE_RES_MEM(0xffca0000, 0x1004), + DEFINE_RES_IRQ(gic_spi(142)), }; #define r8a7791_register_cmt(idx) \ - platform_device_register_resndata(&platform_bus, "sh_cmt", \ + platform_device_register_resndata(&platform_bus, "sh-cmt-48-gen2", \ idx, cmt##idx##_resources, \ ARRAY_SIZE(cmt##idx##_resources), \ &cmt##idx##_platform_data, \ @@ -200,7 +197,7 @@ void __init r8a7791_add_dt_devices(void) r8a7791_register_scif(12); r8a7791_register_scif(13); r8a7791_register_scif(14); - r8a7791_register_cmt(00); + r8a7791_register_cmt(0); } void __init r8a7791_add_standard_devices(void) |