diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:57:17 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:57:17 -0400 |
commit | 46a12f7426d71cabc08972cf8d3ffdd441d26a3a (patch) | |
tree | 40689b826cc2b24d62bc5be1e08db27593072873 /arch/sh/kernel/cpu/sh4a/setup-sh7343.c | |
parent | d43a41bf8b504a1d9f0b4ce7e17d803f4ef39d84 (diff) |
sh: Consolidate MTU2/CMT/TMU timer platform data.
All of the SH timers use a roughly identical structure for platform data,
which presently is broken out for each block. Consolidate all of these
definitions, as there is no reason for them to be broken out in the first
place.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7343.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c index cb5b4db1ca25..f327b7eaf47c 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/serial.h> | 12 | #include <linux/serial.h> |
13 | #include <linux/serial_sci.h> | 13 | #include <linux/serial_sci.h> |
14 | #include <linux/uio_driver.h> | 14 | #include <linux/uio_driver.h> |
15 | #include <linux/sh_cmt.h> | 15 | #include <linux/sh_timer.h> |
16 | #include <asm/clock.h> | 16 | #include <asm/clock.h> |
17 | 17 | ||
18 | static struct resource iic0_resources[] = { | 18 | static struct resource iic0_resources[] = { |
@@ -141,7 +141,7 @@ static struct platform_device jpu_device = { | |||
141 | .num_resources = ARRAY_SIZE(jpu_resources), | 141 | .num_resources = ARRAY_SIZE(jpu_resources), |
142 | }; | 142 | }; |
143 | 143 | ||
144 | static struct sh_cmt_config cmt_platform_data = { | 144 | static struct sh_timer_config cmt_platform_data = { |
145 | .name = "CMT", | 145 | .name = "CMT", |
146 | .channel_offset = 0x60, | 146 | .channel_offset = 0x60, |
147 | .timer_bit = 5, | 147 | .timer_bit = 5, |