summaryrefslogtreecommitdiffstats
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 11:22:50 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 18:50:23 +0100
commit6f7607ccd175518a3ee7dccc1620f3a086689668 (patch)
tree362d4f7e78b9c11ef789bc91abf1cebc55415a0b /arch/arm/mach-omap2/devices.c
parent[ARM] omap: omap24xxcam: use short connection IDs for omap2 clocks (diff)
downloadlinux-6f7607ccd175518a3ee7dccc1620f3a086689668.tar.xz
linux-6f7607ccd175518a3ee7dccc1620f3a086689668.zip
[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)
dummy_pdev.id = i;
dev_set_name(&dummy_pdev.dev, "mmci-omap-hs.%d", i);
- iclk = clk_get(dev, "mmchs_ick");
+ iclk = clk_get(dev, "ick");
if (iclk && clk_enable(iclk))
iclk = NULL;
- fclk = clk_get(dev, "mmchs_fck");
+ fclk = clk_get(dev, "fck");
if (fclk && clk_enable(fclk))
fclk = NULL;