From 8c65792a5c83c76d662a617a7c4e1ae8104bb6a5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 4 Nov 2009 20:09:03 +0100 Subject: glamo-spi: missing semicolon after MODULE_AUTHOR() Fix compilation error due to missing semicolon Signed-off-by: Martin Jansa Signed-off-by: Paul Fertser --- drivers/mfd/glamo/glamo-lcm-spi.c | 2 +- drivers/mfd/glamo/glamo-spi-gpio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') 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 ") +MODULE_AUTHOR("Harald Welte "); 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 ") +MODULE_AUTHOR("Harald Welte "); MODULE_LICENSE("GPL"); -- cgit v1.2.3 From bdaf2752eb06b600098f89661baa3e478cd52105 Mon Sep 17 00:00:00 2001 From: Michael Trimarchi Date: Thu, 26 Nov 2009 01:51:19 +0100 Subject: input: lis302dl: fix the resume path This fix the resume path of the accelerometer. If the accelerometer is not power up, restore to initial status. Move the REG_CTRL1 to the last one position avoid writing on the register when the device is in power down mode. Signed-off-by: Michael Trimarchi Signed-off-by: Paul Fertser --- drivers/input/misc/lis302dl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'drivers') 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]]); -- cgit v1.2.3 From b90406de472c1aa5371ab593a2bb79136d5de658 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 26 Nov 2009 11:55:33 +0300 Subject: mfd: glamo: Enable FIFO stage for the LCD engine's memory access By avoiding conflicts of memory access inside Glamo, this doubles the speed of internal memory access. Signed-off-by: Thomas White Signed-off-by: Paul Fertser --- drivers/mfd/glamo/glamo-fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index 44ab9a39787..21165d97fb2 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 */ -- cgit v1.2.3