commit 5c9e02b1abcb227f47529ad72cc4a3234cddae49
author Russell King <rmk@dyn-67.arm.linux.org.uk> Mon Jan 19 20:53:30 2009 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun Feb 08 17:50:17 2009 +0000
tree ac8323c3b31f77b008d42b1dd26980a47f32a09c
parent 4c5e1946b5f89c33e3bc8ed73fa7ba8f31e37cc5

[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>

drivers/mmc/host/omap.c

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 67d7b7f..15eb883 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1461,16 +1461,13 @@
 		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);