diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2014-04-23 07:15:14 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-05-11 06:35:27 -0400 |
commit | 356af68bf483e4564f75a35287a8f5f39d31041f (patch) | |
tree | 1a6fa4191aefd251aafd0dfcd5dbfc40de934db4 /arch/arm/mach-shmobile/setup-r8a7791.c | |
parent | 711ee6c8dee1df265773786cd0ec96f2cae5c189 (diff) |
ARM: shmobile: r8a7791: Switch to new style CMT device
The CMT (Compare Match Timer) driver implements a new style of platform
data that handles the timer as a single device with multiple channel.
Switch from the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas@verge.net.au resolved conflict: use clk_names]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
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 e28404e43860..561653d639d7 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 */ | |||
128 | &scif##index##_platform_data, \ | 128 | &scif##index##_platform_data, \ |
129 | sizeof(scif##index##_platform_data)) | 129 | sizeof(scif##index##_platform_data)) |
130 | 130 | ||
131 | static const struct sh_timer_config cmt00_platform_data __initconst = { | 131 | static struct sh_timer_config cmt0_platform_data = { |
132 | .name = "CMT00", | 132 | .channels_mask = 0x60, |
133 | .timer_bit = 0, | ||
134 | .clockevent_rating = 80, | ||
135 | }; | 133 | }; |
136 | 134 | ||
137 | static const struct resource cmt00_resources[] __initconst = { | 135 | static struct resource cmt0_resources[] = { |
138 | DEFINE_RES_MEM(0xffca0510, 0x0c), | 136 | DEFINE_RES_MEM(0xffca0000, 0x1004), |
139 | DEFINE_RES_MEM(0xffca0500, 0x04), | 137 | DEFINE_RES_IRQ(gic_spi(142)), |
140 | DEFINE_RES_IRQ(gic_spi(142)), /* CMT0_0 */ | ||
141 | }; | 138 | }; |
142 | 139 | ||
143 | #define r8a7791_register_cmt(idx) \ | 140 | #define r8a7791_register_cmt(idx) \ |
144 | platform_device_register_resndata(&platform_bus, "sh_cmt", \ | 141 | platform_device_register_resndata(&platform_bus, "sh-cmt-48-gen2", \ |
145 | idx, cmt##idx##_resources, \ | 142 | idx, cmt##idx##_resources, \ |
146 | ARRAY_SIZE(cmt##idx##_resources), \ | 143 | ARRAY_SIZE(cmt##idx##_resources), \ |
147 | &cmt##idx##_platform_data, \ | 144 | &cmt##idx##_platform_data, \ |
@@ -200,7 +197,7 @@ void __init r8a7791_add_dt_devices(void) | |||
200 | r8a7791_register_scif(12); | 197 | r8a7791_register_scif(12); |
201 | r8a7791_register_scif(13); | 198 | r8a7791_register_scif(13); |
202 | r8a7791_register_scif(14); | 199 | r8a7791_register_scif(14); |
203 | r8a7791_register_cmt(00); | 200 | r8a7791_register_cmt(0); |
204 | } | 201 | } |
205 | 202 | ||
206 | void __init r8a7791_add_standard_devices(void) | 203 | void __init r8a7791_add_standard_devices(void) |