diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-11-26 22:06:58 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-11-26 22:06:58 +0100 |
| commit | 9811283a233b55428a99771f803d2ca0f80d29de (patch) | |
| tree | f41b7c5958f865c1015c3e2f29f0ffdfccdc78e6 /drivers | |
| parent | dd6196f5cc0cd707e7f694f52d7e847e066a1967 (diff) | |
| parent | b90406de472c1aa5371ab593a2bb79136d5de658 (diff) | |
Merge branch 'andy-tracking' into drm-tracking
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/misc/lis302dl.c | 8 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-fb.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-lcm-spi.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-spi-gpio.c | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c index f31e5488440..d345bfb2718 100644 --- a/drivers/input/misc/lis302dl.c +++ b/drivers/input/misc/lis302dl.c @@ -818,7 +818,6 @@ static int __devexit lis302dl_remove(struct spi_device *spi) #ifdef CONFIG_PM static u8 regs_to_save[] = { - LIS302DL_REG_CTRL1, LIS302DL_REG_CTRL2, LIS302DL_REG_CTRL3, LIS302DL_REG_FF_WU_CFG_1, @@ -833,7 +832,7 @@ static u8 regs_to_save[] = { LIS302DL_REG_CLICK_TIME_LIMIT, LIS302DL_REG_CLICK_LATENCY, LIS302DL_REG_CLICK_WINDOW, - + LIS302DL_REG_CTRL1, }; static int lis302dl_suspend(struct spi_device *spi, pm_message_t state) @@ -906,11 +905,6 @@ static int lis302dl_resume(struct spi_device *spi) if (__lis302dl_reset_device(lis)) dev_err(&spi->dev, "device BOOT reload failed\n"); - lis->regs[LIS302DL_REG_CTRL1] |= LIS302DL_CTRL1_PD | - LIS302DL_CTRL1_Xen | - LIS302DL_CTRL1_Yen | - LIS302DL_CTRL1_Zen; - /* restore registers after resume */ for (n = 0; n < ARRAY_SIZE(regs_to_save); n++) __reg_write(lis, regs_to_save[n], lis->regs[regs_to_save[n]]); diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index 06bbe8a505f..f2f92bcfe66 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -128,7 +128,7 @@ static struct glamo_script glamo_regs[] = { * 01 00 0 100 0 000 01 0 0 */ /* The following values assume 640*480@16bpp */ { GLAMO_REG_LCD_A_BASE1, 0x0000 }, /* display A base address 15:0 */ - { GLAMO_REG_LCD_A_BASE2, 0x0000 }, /* display A base address 22:16 */ + { GLAMO_REG_LCD_A_BASE2, 0x4000 }, /* display A base address 22:16 */ { GLAMO_REG_LCD_B_BASE1, 0x6000 }, /* display B base address 15:0 */ { GLAMO_REG_LCD_B_BASE2, 0x0009 }, /* display B base address 22:16 */ { GLAMO_REG_LCD_CURSOR_BASE1, 0xC000 }, /* cursor base address 15:0 */ diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c index a7129fe798c..446f0581e9e 100644 --- a/drivers/mfd/glamo/glamo-lcm-spi.c +++ b/drivers/mfd/glamo/glamo-lcm-spi.c @@ -236,5 +236,5 @@ module_init(glamo_spi_init); module_exit(glamo_spi_exit); MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver"); -MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>") +MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>"); MODULE_LICENSE("GPL"); diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c index b92e48a17b7..6ebf4982d6c 100644 --- a/drivers/mfd/glamo/glamo-spi-gpio.c +++ b/drivers/mfd/glamo/glamo-spi-gpio.c @@ -274,5 +274,5 @@ module_init(glamo_spi_init); module_exit(glamo_spi_exit); MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver"); -MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>") +MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>"); MODULE_LICENSE("GPL"); |