summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-01-28 10:22:50 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 17:50:23 +0000
commit6f7607ccd175518a3ee7dccc1620f3a086689668 (patch)
tree362d4f7e78b9c11ef789bc91abf1cebc55415a0b /drivers/mmc
parent6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b (diff)
downloadop-kernel-dev-6f7607ccd175518a3ee7dccc1620f3a086689668.zip
op-kernel-dev-6f7607ccd175518a3ee7dccc1620f3a086689668.tar.gz
[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 'drivers/mmc')
-rw-r--r--drivers/mmc/host/omap_hsmmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index db37490..65e0743 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -920,13 +920,13 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
sema_init(&host->sem, 1);
- host->iclk = clk_get(&pdev->dev, "mmchs_ick");
+ host->iclk = clk_get(&pdev->dev, "ick");
if (IS_ERR(host->iclk)) {
ret = PTR_ERR(host->iclk);
host->iclk = NULL;
goto err1;
}
- host->fclk = clk_get(&pdev->dev, "mmchs_fck");
+ host->fclk = clk_get(&pdev->dev, "fck");
if (IS_ERR(host->fclk)) {
ret = PTR_ERR(host->fclk);
host->fclk = NULL;
OpenPOWER on IntegriCloud