[ARM] omap: MMC: convert clocks to match by devid and conid

[linux-2.6-omap-h63xx.git] / drivers / mmc / host / omap.c

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 67d7b7fef084f1a064d4f7834a37af0059c96f99..15eb8834376055645f29c14a10993e2cd683a4af 100644 (file)
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1461,16 +1461,13 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
                goto err_ioremap;
 
        if (cpu_is_omap24xx()) {
-               host->iclk = clk_get(&pdev->dev, "mmc_ick");
+               host->iclk = clk_get(&pdev->dev, "ick");
                if (IS_ERR(host->iclk))
                        goto err_free_mmc_host;
                clk_enable(host->iclk);
        }
 
-       if (!cpu_is_omap24xx())
-               host->fclk = clk_get(&pdev->dev, "mmc_ck");
-       else
-               host->fclk = clk_get(&pdev->dev, "mmc_fck");
+       host->fclk = clk_get(&pdev->dev, "fck");
 
        if (IS_ERR(host->fclk)) {
                ret = PTR_ERR(host->fclk);