diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:17 +0000 |
|---|---|---|
| committer | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:17 +0000 |
| commit | 6ecab98a3b8632e127c230611fe4c2c4ecc1d3c7 (patch) | |
| tree | 1ba9e089a6ddaa36a7e07b4ff16ef432d58842c8 /drivers/mfd/glamo | |
| parent | 2c10eff0891ac43dcd9f79f7d136e1c6f621ed59 (diff) | |
meddle-wsod.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/mfd/glamo')
| -rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 5 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-core.h | 1 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-gpio.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 5241dd09d2b..140cd984778 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -888,7 +888,7 @@ static struct glamo_script glamo_init_script[] = { { GLAMO_REG_MEM_DRAM2, 0x01d6 }, { GLAMO_REG_CLOCK_MEMORY, 0x000b }, }; - +#if 0 static struct glamo_script glamo_resume_script[] = { { GLAMO_REG_PLL_GEN1, 0x05db }, /* 48MHz */ @@ -914,7 +914,7 @@ static struct glamo_script glamo_resume_script[] = { { GLAMO_REG_MEM_DRAM2, 0x01d6 }, { GLAMO_REG_CLOCK_MEMORY, 0x000b }, }; - +#endif enum glamo_power { GLAMO_POWER_ON, @@ -925,7 +925,6 @@ static void glamo_power(struct glamo_core *glamo, enum glamo_power new_state) { int n; - int ads; unsigned long flags; spin_lock_irqsave(&glamo->lock, flags); diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h index 4ba909ccb15..0705204c6bb 100644 --- a/drivers/mfd/glamo/glamo-core.h +++ b/drivers/mfd/glamo/glamo-core.h @@ -2,7 +2,6 @@ #define __GLAMO_CORE_H #include <asm/system.h> -#include <linux/resume-dependency.h> /* for the time being, we put the on-screen framebuffer into the lowest * VRAM space. This should make the code easily compatible with the various diff --git a/drivers/mfd/glamo/glamo-gpio.c b/drivers/mfd/glamo/glamo-gpio.c index 45d0bf91268..0a4c5a11ebe 100644 --- a/drivers/mfd/glamo/glamo-gpio.c +++ b/drivers/mfd/glamo/glamo-gpio.c @@ -37,6 +37,8 @@ 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); |