From f39594d4998c1b4e7fb4de3a5d5936f5966499a8 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Wed, 19 Nov 2008 17:11:11 +0000 Subject: fix-remove-resume-dependencies-on-pmu-for-pmu-children.patch All that stuff should be enforced by device tree now, out with it Signed-off-by: Andy Green --- drivers/mfd/glamo/glamo-mci.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'drivers/mfd/glamo/glamo-mci.c') diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index 32ace262cac..13175c4a240 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -716,7 +716,7 @@ static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq) #if 0 static void glamo_mci_reset(struct glamo_mci_host *host) { - dev_dbg(&host->pdev->dev, "******* glamo_mci_reset\n"); + dev_err(&host->pdev->dev, "******* glamo_mci_reset\n"); /* reset MMC controller */ writew(GLAMO_CLOCK_MMC_RESET | GLAMO_CLOCK_MMC_DG_TCLK | GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK | @@ -782,7 +782,7 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) * initialize itself. Doubt any modern cards need it but anyway... */ if (powering) - msleep(1); + mdelay(1); if (!sd_idleclk && !host->force_slow_during_powerup) /* stop the clock to card, because we are idle until transfer */ @@ -929,13 +929,16 @@ static int glamo_mci_probe(struct platform_device *pdev) dev_info(&host->pdev->dev, "probe: mapped mci_base:%p irq:%u.\n", host->base, host->irq); + platform_set_drvdata(pdev, mmc); + + glamo_engine_enable(glamo_mci_def_pdata.pglamo, GLAMO_ENGINE_MMC); + glamo_mci_reset(host); + if ((ret = mmc_add_host(mmc))) { dev_err(&pdev->dev, "failed to add mmc host.\n"); goto probe_free_mem_region_data; } - platform_set_drvdata(pdev, mmc); - dev_info(&pdev->dev,"initialisation done.\n"); return 0; @@ -996,8 +999,6 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state) sd_idleclk = 1; host->suspending++; - if (host->pdata->mci_all_dependencies_resumed) - (host->pdata->mci_suspending)(dev); ret = mmc_suspend_host(mmc, state); @@ -1013,10 +1014,6 @@ int glamo_mci_resume(struct platform_device *dev) struct glamo_mci_host *host = mmc_priv(mmc); int ret; - if (host->pdata->mci_all_dependencies_resumed) - if (!(host->pdata->mci_all_dependencies_resumed)(dev)) - return 0; - host->suspending--; ret = mmc_resume_host(mmc); -- cgit v1.2.3