diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2014-04-23 07:15:22 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-05-11 06:35:28 -0400 |
commit | c17fcfbcc0f6b4f3cae761149e1a6108dd6750e7 (patch) | |
tree | dd01ac49d7b66b8dcd999ba4f05803266c7bd50f /arch/arm/mach-shmobile/clock-r7s72100.c | |
parent | 5204601c0877b3ffc90e417bf30fccc9bdf47962 (diff) |
ARM: shmobile: r7s72100: Switch to new style MTU2 device
The MTU2 (Multi-Function Timer Pulse Unit 2) 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>
Tested-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/clock-r7s72100.c')
-rw-r--r-- | arch/arm/mach-shmobile/clock-r7s72100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c index bee0073c9b64..644f1c2a96c7 100644 --- a/arch/arm/mach-shmobile/clock-r7s72100.c +++ b/arch/arm/mach-shmobile/clock-r7s72100.c | |||
@@ -204,7 +204,6 @@ static struct clk_lookup lookups[] = { | |||
204 | CLKDEV_DEV_ID("fcfee800.i2c", &mstp_clks[MSTP95]), | 204 | CLKDEV_DEV_ID("fcfee800.i2c", &mstp_clks[MSTP95]), |
205 | CLKDEV_DEV_ID("fcfeec00.i2c", &mstp_clks[MSTP94]), | 205 | CLKDEV_DEV_ID("fcfeec00.i2c", &mstp_clks[MSTP94]), |
206 | CLKDEV_DEV_ID("r7s72100-ether", &mstp_clks[MSTP74]), | 206 | CLKDEV_DEV_ID("r7s72100-ether", &mstp_clks[MSTP74]), |
207 | CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP33]), | ||
208 | 207 | ||
209 | /* ICK */ | 208 | /* ICK */ |
210 | CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP47]), | 209 | CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP47]), |
@@ -215,6 +214,7 @@ static struct clk_lookup lookups[] = { | |||
215 | CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP42]), | 214 | CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP42]), |
216 | CLKDEV_ICK_ID("sci_fck", "sh-sci.6", &mstp_clks[MSTP41]), | 215 | CLKDEV_ICK_ID("sci_fck", "sh-sci.6", &mstp_clks[MSTP41]), |
217 | CLKDEV_ICK_ID("sci_fck", "sh-sci.7", &mstp_clks[MSTP40]), | 216 | CLKDEV_ICK_ID("sci_fck", "sh-sci.7", &mstp_clks[MSTP40]), |
217 | CLKDEV_ICK_ID("fck", "sh-mtu2", &mstp_clks[MSTP33]), | ||
218 | }; | 218 | }; |
219 | 219 | ||
220 | void __init r7s72100_clock_init(void) | 220 | void __init r7s72100_clock_init(void) |