update sdmmc drivers: set clk_rate error
authorkfx <kfx@rock-chips.com>
Sat, 21 May 2011 07:51:07 +0000 (15:51 +0800)
committerkfx <kfx@rock-chips.com>
Sat, 21 May 2011 07:51:07 +0000 (15:51 +0800)
drivers/mmc/host/rk29_sdmmc.c

index c674f13242e005436319441195b93e8835e8dc5c..a77c056ff40211fbf5b2623189ce4fc27f796f2f 100755 (executable)
@@ -828,7 +828,7 @@ static void rk29_sdmmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
        if(rk29_sdmmc_set_clock(host)) {
                mrq->cmd->error = -EINPROGRESS;
-               dev_info(host->dev, "rk29_sdmmc_set_clock timeout\n");
+               dev_info(host->dev, "rk29_sdmmc_set_clock timeout, ios_clock = %d, clock = %d\n", host->ios_clock, host->clock);
                rk29_sdmmc_request_done(host, mrq);
                rk29_sdmmc_reset_ctrl(host);
                rk29_sdmmc_show_info(host);
@@ -1338,9 +1338,9 @@ static int rk29_sdmmc_probe(struct platform_device *pdev)
        /* clk init */
        host->clk = clk_get(&pdev->dev, "mmc");
        if(host->is_sdio)
-               clk_set_rate(host->clk,RK29_SDIO_CLK);
+               clk_set_rate(host->clk,RK29_SDIO_CLK * 1000000);
        else
-               clk_set_rate(host->clk,RK29_SDCARD_CLK);
+               clk_set_rate(host->clk,RK29_SDCARD_CLK * 1000000);
        clk_enable(host->clk);
        clk_enable(clk_get(&pdev->dev, "hclk_mmc"));
        host->bus_hz = clk_get_rate(host->clk);