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

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 758abaadaf3779276759533721cdf84a892e8b56..3015e85296580d3cde1eb1e4e3d66a2afa77a692 100644 (file)
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -124,8 +124,8 @@ static struct omap_clk omap_clks[] = {
        CLK(NULL,       "mclk",         &mclk_16xx,     CK_16XX),
        CLK(NULL,       "bclk",         &bclk_1510,     CK_1510 | CK_310),
        CLK(NULL,       "bclk",         &bclk_16xx,     CK_16XX),
-       CLK("mmci-omap.0", "mmc_ck",    &mmc1_ck,       CK_16XX | CK_1510 | CK_310),
-       CLK("mmci-omap.1", "mmc_ck",    &mmc2_ck,       CK_16XX),
+       CLK("mmci-omap.0", "fck",       &mmc1_ck,       CK_16XX | CK_1510 | CK_310),
+       CLK("mmci-omap.1", "fck",       &mmc2_ck,       CK_16XX),
        /* Virtual clocks */
        CLK(NULL,       "mpu",          &virtual_ck_mpu, CK_16XX | CK_1510 | CK_310),
        CLK("i2c_omap.1", "i2c_fck",    &i2c_fck,       CK_16XX | CK_1510 | CK_310),

diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 6a6278e5bbce9d0f9890e773ef575526cb0305f6..aca4ca42bf48cbcbe6b709c8110ed3f87a7ce8b8 100644 (file)
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -178,8 +178,8 @@ static struct omap_clk omap24xx_clks[] = {
        CLK(NULL,       "wdt3_fck",     &wdt3_fck,      CK_242X),
        CLK(NULL,       "mspro_ick",    &mspro_ick,     CK_243X | CK_242X),
        CLK(NULL,       "mspro_fck",    &mspro_fck,     CK_243X | CK_242X),
-       CLK(NULL,       "mmc_ick",      &mmc_ick,       CK_242X),
-       CLK(NULL,       "mmc_fck",      &mmc_fck,       CK_242X),
+       CLK("mmci-omap.0", "ick",       &mmc_ick,       CK_242X),
+       CLK("mmci-omap.0", "fck",       &mmc_fck,       CK_242X),
        CLK(NULL,       "fac_ick",      &fac_ick,       CK_243X | CK_242X),
        CLK(NULL,       "fac_fck",      &fac_fck,       CK_243X | CK_242X),
        CLK(NULL,       "eac_ick",      &eac_ick,       CK_242X),

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);