diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:09:47 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:09:47 +0000 |
| commit | daa1e772623f91a59364094f845f51a1fe9f236f (patch) | |
| tree | 5d2c52d3e8ecb0de784a0d62222cb419f1d2a341 /drivers/mfd/glamo/glamo-core.c | |
| parent | 600130555575e59b2ad9891fda11d24b94b0667b (diff) | |
fix-glamo-mci-resume-dependency-on-pcf50633.patch
Glamo MCI has a resume order dependncy on pcf50633, it has to be able to
power the SD slot via it.
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/mfd/glamo/glamo-core.c')
| -rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 445ff242d5b..3edbfa820d2 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -270,6 +270,8 @@ struct glamo_mci_pdata glamo_mci_def_pdata = { .glamo_set_mci_power = NULL, /* filled in from MFD platform data */ .ocr_avail = MMC_VDD_32_33, .glamo_irq_is_wired = NULL, /* filled in from MFD platform data */ + .mci_suspending = NULL, /* filled in from MFD platform data */ + .mci_all_dependencies_resumed = NULL, /* filled in from MFD platform data */ }; EXPORT_SYMBOL_GPL(glamo_mci_def_pdata); @@ -1112,6 +1114,10 @@ static int __init glamo_probe(struct platform_device *pdev) glamo->pdata->glamo_set_mci_power; glamo_mci_def_pdata.glamo_irq_is_wired = glamo->pdata->glamo_irq_is_wired; + glamo_mci_def_pdata.mci_suspending = + glamo->pdata->mci_suspending; + glamo_mci_def_pdata.mci_all_dependencies_resumed = + glamo->pdata->mci_all_dependencies_resumed; glamo_2d_dev.dev.parent = &pdev->dev; mangle_mem_resources(glamo_2d_dev.resource, @@ -1181,6 +1187,8 @@ static int __init glamo_probe(struct platform_device *pdev) glamo_pll_rate(glamo, GLAMO_PLL1), glamo_pll_rate(glamo, GLAMO_PLL2)); + glamo_lcm_reset(1); + for (irq = IRQ_GLAMO(0); irq <= IRQ_GLAMO(8); irq++) { set_irq_chip(irq, &glamo_irq_chip); set_irq_handler(irq, handle_level_irq); |