summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/clock-sh7367.c
diff options
context:
space:
mode:
authorMagnus Damm2010-10-13 09:29:31 +0200
committerPaul Mundt2010-10-13 11:47:04 +0200
commit90e09a59110949bda40c13b4e5925f3acd3597b0 (patch)
tree03164ade2aff711155f8939ce91d776adc38c1ea /arch/arm/mach-shmobile/clock-sh7367.c
parentARM: shmobile: make AP4EVB MMCIF resource string consistent (diff)
downloadkernel-qcow2-linux-90e09a59110949bda40c13b4e5925f3acd3597b0.tar.gz
kernel-qcow2-linux-90e09a59110949bda40c13b4e5925f3acd3597b0.tar.xz
kernel-qcow2-linux-90e09a59110949bda40c13b4e5925f3acd3597b0.zip
ARM: shmobile: use device name for timer clocks
Move SH-Mobile ARM systems over from the legacy "clk" member of struct sh_timer_config to using the device name and clkdev for clock matching. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-shmobile/clock-sh7367.c')
-rw-r--r--arch/arm/mach-shmobile/clock-sh7367.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/clock-sh7367.c b/arch/arm/mach-shmobile/clock-sh7367.c
index b6454c9f2abb..9f78729098f2 100644
--- a/arch/arm/mach-shmobile/clock-sh7367.c
+++ b/arch/arm/mach-shmobile/clock-sh7367.c
@@ -321,7 +321,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[SYMSTP001]), /* SCIFA3 */
CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[SYMSTP000]), /* SCIFA4 */
CLKDEV_DEV_ID("sh_siu", &mstp_clks[SYMSTP231]), /* SIU */
- CLKDEV_CON_ID("cmt1", &mstp_clks[SYMSTP229]), /* CMT10 */
+ CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[SYMSTP229]), /* CMT10 */
CLKDEV_DEV_ID("sh_irda", &mstp_clks[SYMSTP225]), /* IRDA */
CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[SYMSTP223]), /* IIC1 */
CLKDEV_DEV_ID("r8a66597_hcd.0", &mstp_clks[SYMSTP222]), /* USBHS */