diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:23 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:23 +0000 |
| commit | 9b77ef558c5d2e122fb65bc6e623a731d0cc1166 (patch) | |
| tree | c5d488f80a424edbec9842b84ae40ccfbe69db63 /drivers/mfd | |
| parent | c509d67ae96b95e73920bd322c5368f3c9470ea2 (diff) | |
fix-glamo-gpio-resume.patch
Glamo GPIO are not set correctly after resume / reset action.
This patch forces them to correct state for GTA02.
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 5 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-gpio.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 140cd984778..b7184a38c31 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -887,6 +887,11 @@ static struct glamo_script glamo_init_script[] = { { GLAMO_REG_MEM_DRAM1, 0xe100 }, { GLAMO_REG_MEM_DRAM2, 0x01d6 }, { GLAMO_REG_CLOCK_MEMORY, 0x000b }, + { GLAMO_REG_GPIO_GEN1, 0x000f }, + { GLAMO_REG_GPIO_GEN2, 0x111e }, + { GLAMO_REG_GPIO_GEN3, 0xccc3 }, + { GLAMO_REG_GPIO_GEN4, 0x111e }, + { GLAMO_REG_GPIO_GEN5, 0x000f }, }; #if 0 static struct glamo_script glamo_resume_script[] = { diff --git a/drivers/mfd/glamo/glamo-gpio.c b/drivers/mfd/glamo/glamo-gpio.c index 0a4c5a11ebe..45d0bf91268 100644 --- a/drivers/mfd/glamo/glamo-gpio.c +++ b/drivers/mfd/glamo/glamo-gpio.c @@ -37,8 +37,6 @@ void glamo_gpio_cfgpin(struct glamo_core *glamo, unsigned int pinfunc) unsigned int reg = REG_OF_GPIO(pinfunc); u_int16_t tmp; - printk(KERN_INFO "glamo_gpio_cfgpin 0x%x %p\n", pinfunc, glamo->base + reg); - spin_lock(&glamo->lock); tmp = readw(glamo->base + reg); |