diff options
| author |   Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2014-04-23 13:15:08 +0200 |
|---|---|---|
| committer |   Simon Horman <horms+renesas@verge.net.au> | 2014-05-11 19:35:26 +0900 |
| commit | 9b17e48cd4df4e129976c37660cf9ec644c66059 (patch) | |
| tree | 22f1db2ada8bb0029b7d61fb0d5609b146262055 /arch/sh/kernel/cpu/sh2a/clock-sh7264.c | |
| parent | Merge branch 'clockevents/cmt-mtu2-tmu-cleanups' of git://git.linaro.org/people/daniel.lezcano/linux into cmt-mtu2-tmu-cleanups-for-v3.16 (diff) | |
| download | linux-dev-9b17e48cd4df4e129976c37660cf9ec644c66059.tar.xz linux-dev-9b17e48cd4df4e129976c37660cf9ec644c66059.zip | |
sh: 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>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/sh/kernel/cpu/sh2a/clock-sh7264.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh2a/clock-sh7264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7264.c b/arch/sh/kernel/cpu/sh2a/clock-sh7264.c index fdf585c95289..c7f3c666a0ac 100644 --- a/arch/sh/kernel/cpu/sh2a/clock-sh7264.c +++ b/arch/sh/kernel/cpu/sh2a/clock-sh7264.c @@ -117,7 +117,7 @@ static struct clk_lookup lookups[] = { /* MSTP clocks */ CLKDEV_CON_ID("sci_ick", &mstp_clks[MSTP77]), CLKDEV_CON_ID("vdc3", &mstp_clks[MSTP74]), - CLKDEV_CON_ID("cmt_fck", &mstp_clks[MSTP72]), + CLKDEV_ICK_ID("fck", "sh-cmt-16.0", &mstp_clks[MSTP72]), CLKDEV_CON_ID("usb0", &mstp_clks[MSTP60]), CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP35]), CLKDEV_CON_ID("sdhi0", &mstp_clks[MSTP34]), |