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

Convert OMAP MMC driver to match clocks using the device ID and a
connection ID rather than a clock name.  This allows us to eliminate
the OMAP1/OMAP2 differences for the function clock.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 67d7b7fef08..15eb8834376 100644
--- 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);