summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-01-24 19:27:06 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 20:50:22 +0300
commit6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b (patch)
treec63888f76d8b06749970ab328d088d3887b64c16 /arch/arm/mach-omap2
parenteeec7c8d18465a85c212230bdb715e3f029dbf4e (diff)
downloadlinux-6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b.tar.xz
[ARM] omap: omap24xxcam: use short connection IDs for omap2 clocks
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/clock24xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 1e9ac83dca5e..d190b6a74936 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -169,8 +169,8 @@ static struct omap_clk omap24xx_clks[] = {
CLK(NULL, "wdt1_ick", &wdt1_ick, CK_243X | CK_242X),
CLK(NULL, "omapctrl_ick", &omapctrl_ick, CK_243X | CK_242X),
CLK(NULL, "icr_ick", &icr_ick, CK_243X),
- CLK(NULL, "cam_fck", &cam_fck, CK_243X | CK_242X),
- CLK(NULL, "cam_ick", &cam_ick, CK_243X | CK_242X),
+ CLK("omap24xxcam", "fck", &cam_fck, CK_243X | CK_242X),
+ CLK("omap24xxcam", "ick", &cam_ick, CK_243X | CK_242X),
CLK(NULL, "mailboxes_ick", &mailboxes_ick, CK_243X | CK_242X),
CLK(NULL, "wdt4_ick", &wdt4_ick, CK_243X | CK_242X),
CLK(NULL, "wdt4_fck", &wdt4_fck, CK_243X | CK_242X),