diff options
Diffstat (limited to 'drivers/mfd/glamo')
-rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 28 | ||||
-rw-r--r-- | drivers/mfd/glamo/glamo-core.h | 3 | ||||
-rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 41 | ||||
-rw-r--r-- | drivers/mfd/glamo/glamo-mci.h | 3 |
4 files changed, 20 insertions, 55 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index b4595a8202d..b7184a38c31 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -288,9 +288,15 @@ static struct resource glamo_mmc_resources[] = { }, }; +static struct platform_device glamo_mmc_dev = { + .name = "glamo-mci", + .resource = glamo_mmc_resources, + .num_resources = ARRAY_SIZE(glamo_mmc_resources), +}; + struct glamo_mci_pdata glamo_mci_def_pdata = { .gpio_detect = 0, - .glamo_can_set_mci_power = NULL, /* filled in from MFD platform data */ + .glamo_set_mci_power = NULL, /* filled in from MFD platform data */ .ocr_avail = MMC_VDD_20_21 | MMC_VDD_21_22 | MMC_VDD_22_23 | @@ -1147,7 +1153,6 @@ static int __init glamo_probe(struct platform_device *pdev) { int rc = 0, irq; struct glamo_core *glamo; - struct platform_device *glamo_mmc_dev; if (glamo_handle) { dev_err(&pdev->dev, @@ -1242,8 +1247,8 @@ static int __init glamo_probe(struct platform_device *pdev) glamo_pll_rate(glamo, GLAMO_PLL2)); /* bring MCI specific stuff over from our MFD platform data */ - glamo_mci_def_pdata.glamo_can_set_mci_power = - glamo->pdata->glamo_can_set_mci_power; + glamo_mci_def_pdata.glamo_set_mci_power = + glamo->pdata->glamo_set_mci_power; glamo_mci_def_pdata.glamo_mci_use_slow = glamo->pdata->glamo_mci_use_slow; glamo_mci_def_pdata.glamo_irq_is_wired = @@ -1283,17 +1288,12 @@ static int __init glamo_probe(struct platform_device *pdev) glamo_spigpio_dev.dev.platform_data = glamo->pdata->spigpio_info; platform_device_register(&glamo_spigpio_dev); - glamo_mmc_dev = glamo->pdata->mmc_dev; - glamo_mmc_dev->name = "glamo-mci"; - glamo_mmc_dev->dev.parent = &pdev->dev; - glamo_mmc_dev->resource = glamo_mmc_resources; - glamo_mmc_dev->num_resources = ARRAY_SIZE(glamo_mmc_resources); - + glamo_mmc_dev.dev.parent = &pdev->dev; /* we need it later to give to the engine enable and disable */ glamo_mci_def_pdata.pglamo = glamo; - mangle_mem_resources(glamo_mmc_dev->resource, - glamo_mmc_dev->num_resources, glamo->mem); - platform_device_register(glamo_mmc_dev); + mangle_mem_resources(glamo_mmc_dev.resource, + glamo_mmc_dev.num_resources, glamo->mem); + platform_device_register(&glamo_mmc_dev); /* only request the generic, hostbus and memory controller MMIO */ glamo->mem = request_mem_region(glamo->mem->start, @@ -1338,7 +1338,7 @@ static int glamo_remove(struct platform_device *pdev) platform_set_drvdata(pdev, NULL); platform_device_unregister(&glamo_fb_dev); - platform_device_unregister(glamo->pdata->mmc_dev); + platform_device_unregister(&glamo_mmc_dev); iounmap(glamo->base); release_mem_region(glamo->mem->start, GLAMO_REGOFS_VIDCAP); glamo_handle = NULL; diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h index 8e09564bc3f..0705204c6bb 100644 --- a/drivers/mfd/glamo/glamo-core.h +++ b/drivers/mfd/glamo/glamo-core.h @@ -68,7 +68,8 @@ struct glamo_mci_pdata { unsigned int gpio_detect; unsigned int gpio_wprotect; unsigned long ocr_avail; - int (*glamo_can_set_mci_power)(void); + void (*glamo_set_mci_power)(unsigned char power_mode, + unsigned short vdd); /* glamo-mci asking if it should use the slow clock to card */ int (*glamo_mci_use_slow)(void); int (*glamo_irq_is_wired)(void); diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index e836913ea23..b762212041b 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -768,24 +768,13 @@ static void glamo_mci_reset(struct glamo_mci_host *host) glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_MMC); } #endif -static inline int glamo_mci_get_mv(int vdd) -{ - int mv = 1650; - - if (vdd > 7) - mv += 350 + 100 * (vdd - 8); - - return mv; -} static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) { struct glamo_mci_host *host = mmc_priv(mmc); - struct regulator *regulator; int n = 0; int div; int powering = 0; - int mv; if (host->suspending) { dev_err(&host->pdev->dev, "IGNORING glamo_mci_set_ios while " @@ -793,18 +782,10 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) return; } - regulator = host->regulator; - /* Set power */ switch(ios->power_mode) { - case MMC_POWER_UP: - if (host->pdata->glamo_can_set_mci_power()) { - mv = glamo_mci_get_mv(ios->vdd); - regulator_set_voltage(regulator, mv * 1000, mv * 1000); - regulator_enable(regulator); - } - break; case MMC_POWER_ON: + case MMC_POWER_UP: /* * we should use very slow clock until first bulk * transfer completes OK @@ -812,11 +793,8 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->force_slow_during_powerup = 1; if (host->vdd_current != ios->vdd) { - if (host->pdata->glamo_can_set_mci_power()) { - mv = glamo_mci_get_mv(ios->vdd); - regulator_set_voltage(regulator, mv * 1000, mv * 1000); - printk(KERN_INFO "SD power -> %dmV\n", mv); - } + host->pdata->glamo_set_mci_power(ios->power_mode, + ios->vdd); host->vdd_current = ios->vdd; } if (host->power_mode_current == MMC_POWER_OFF) { @@ -835,7 +813,7 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) glamo_engine_disable(glamo_mci_def_pdata.pglamo, GLAMO_ENGINE_MMC); - regulator_disable(regulator); + host->pdata->glamo_set_mci_power(MMC_POWER_OFF, 0); host->vdd_current = -1; break; } @@ -940,12 +918,6 @@ static int glamo_mci_probe(struct platform_device *pdev) goto probe_free_mem_region; } - host->regulator = regulator_get(&pdev->dev, "SD_3V3"); - if (!host->regulator) { - dev_err(&pdev->dev, "Cannot proceed without regulator.\n"); - return -ENODEV; - } - /* set the handler for our bit of the shared chip irq register */ set_irq_handler(IRQ_GLAMO(GLAMO_IRQIDX_MMC), glamo_mci_irq); /* stash host as our handler's private data */ @@ -1033,7 +1005,6 @@ static int glamo_mci_remove(struct platform_device *pdev) { struct mmc_host *mmc = platform_get_drvdata(pdev); struct glamo_mci_host *host = mmc_priv(mmc); - struct regulator *regulator; mmc_remove_host(mmc); /* stop using our handler, revert it to default */ @@ -1042,10 +1013,6 @@ static int glamo_mci_remove(struct platform_device *pdev) iounmap(host->base_data); release_mem_region(host->mem->start, RESSIZE(host->mem)); release_mem_region(host->mem_data->start, RESSIZE(host->mem_data)); - - regulator = host->regulator; - regulator_put(regulator); - mmc_free_host(mmc); glamo_engine_disable(glamo_mci_def_pdata.pglamo, GLAMO_ENGINE_MMC); diff --git a/drivers/mfd/glamo/glamo-mci.h b/drivers/mfd/glamo/glamo-mci.h index bd62e9aa3c6..38f6376f438 100644 --- a/drivers/mfd/glamo/glamo-mci.h +++ b/drivers/mfd/glamo/glamo-mci.h @@ -10,7 +10,6 @@ * published by the Free Software Foundation. */ -#include <linux/regulator/consumer.h> enum glamo_mci_waitfor { COMPLETION_NONE, @@ -78,6 +77,4 @@ struct glamo_mci_host { unsigned int ccnt, dcnt; struct tasklet_struct pio_tasklet; - - struct regulator *regulator; }; |