aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/devices.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-01-28 05:22:50 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 12:50:23 -0500
commit6f7607ccd175518a3ee7dccc1620f3a086689668 (patch)
tree362d4f7e78b9c11ef789bc91abf1cebc55415a0b /arch/arm/mach-omap2/devices.c
parent6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b (diff)
[ARM] omap: hsmmc: new short connection id names
... rather than the clock names themselves. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r--arch/arm/mach-omap2/devices.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 973040441529..8075f5868c38 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -349,11 +349,11 @@ static void __init omap_hsmmc_reset(void)
349 349
350 dummy_pdev.id = i; 350 dummy_pdev.id = i;
351 dev_set_name(&dummy_pdev.dev, "mmci-omap-hs.%d", i); 351 dev_set_name(&dummy_pdev.dev, "mmci-omap-hs.%d", i);
352 iclk = clk_get(dev, "mmchs_ick"); 352 iclk = clk_get(dev, "ick");
353 if (iclk && clk_enable(iclk)) 353 if (iclk && clk_enable(iclk))
354 iclk = NULL; 354 iclk = NULL;
355 355
356 fclk = clk_get(dev, "mmchs_fck"); 356 fclk = clk_get(dev, "fck");
357 if (fclk && clk_enable(fclk)) 357 if (fclk && clk_enable(fclk))
358 fclk = NULL; 358 fclk = NULL;
359 359