diff options
author | Magnus Damm <damm@opensource.se> | 2010-10-13 09:29:31 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-13 11:47:04 +0200 |
commit | 90e09a59110949bda40c13b4e5925f3acd3597b0 (patch) | |
tree | 03164ade2aff711155f8939ce91d776adc38c1ea /arch/arm/mach-shmobile/clock-sh7377.c | |
parent | ARM: shmobile: make AP4EVB MMCIF resource string consistent (diff) | |
download | linux-90e09a59110949bda40c13b4e5925f3acd3597b0.tar.xz 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-sh7377.c')
-rw-r--r-- | arch/arm/mach-shmobile/clock-sh7377.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/clock-sh7377.c b/arch/arm/mach-shmobile/clock-sh7377.c index e007c28cf0a8..f91395aeb9ab 100644 --- a/arch/arm/mach-shmobile/clock-sh7377.c +++ b/arch/arm/mach-shmobile/clock-sh7377.c @@ -333,7 +333,7 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP201]), /* SCIFA3 */ CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP200]), /* SCIFA4 */ CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP331]), /* SCIFA6 */ - CLKDEV_CON_ID("cmt1", &mstp_clks[MSTP329]), /* CMT10 */ + CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]), /* CMT10 */ CLKDEV_DEV_ID("sh_irda", &mstp_clks[MSTP325]), /* IRDA */ CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* IIC1 */ CLKDEV_DEV_ID("r8a66597_hcd.0", &mstp_clks[MSTP322]), /* USBHS */ |