[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-144-g52447f8
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-144-g52447f8
|
From: Fabien M <fa...@us...> - 2010-01-27 17:38:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 52447f8b6226cf3feb4ac2bc97d414718aff5437 (commit)
via 3e2d7d6bf57dcc3d76807405595332c1e271b0e1 (commit)
from 1484678ad850fcafcd51f6503401fb2b92fe4eb2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 52447f8b6226cf3feb4ac2bc97d414718aff5437
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jan 27 17:48:41 2010 +0100
[LINUX] suppress power_on function callback in hx5116.h
commit 3e2d7d6bf57dcc3d76807405595332c1e271b0e1
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jan 27 17:22:34 2010 +0100
[LINUX] Suppressing backlight powering capability from hx5116_display driver (this capability must be in imx_fb driver)
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/343-apf27-amoled-hx5116.patch | 5 ++---
target/linux/modules/display/hx5116_display.c | 6 ------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch
index 47ddaae..144e6f2 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch
@@ -1,8 +1,8 @@
Index: linux-2.6.29.6/include/video/hx5116.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/video/hx5116.h 2010-01-14 14:19:29.000000000 +0100
-@@ -0,0 +1,113 @@
++++ linux-2.6.29.6/include/video/hx5116.h 2010-01-27 17:47:15.000000000 +0100
+@@ -0,0 +1,112 @@
+/*
+ *
+ * HX5116 160CH Single Chip Driver for LPTS AMOLED
@@ -110,7 +110,6 @@ Index: linux-2.6.29.6/include/video/hx5116.h
+struct hx5116_display {
+ struct display_device *display_dev;
+ struct spi_device *spi; /* spi bus */
-+ void (*power_on)(int); /* function that power on screen */
+ void (*reset_on)(int); /* function that let hx5116 on reset */
+ int gcontrast_value; /* current contrast value */
+};
diff --git a/target/linux/modules/display/hx5116_display.c b/target/linux/modules/display/hx5116_display.c
index 902b247..fd63d4c 100644
--- a/target/linux/modules/display/hx5116_display.c
+++ b/target/linux/modules/display/hx5116_display.c
@@ -88,13 +88,11 @@ static int hx5116_display_remove(struct display_device *dev)
static void hx5116_display_suspend(struct display_device *dev, pm_message_t state)
{
struct hx5116_display *hx5116_dev = dev->priv_data;
- hx5116_dev->power_on(0); /* switch off AMOLED power */
}
static void hx5116_display_resume(struct display_device *dev)
{
struct hx5116_display *hx5116_dev = dev->priv_data;
- hx5116_dev->power_on(1); /* switch on AMOLED power */
}
#else
#define hx5116_display_suspend NULL
@@ -156,9 +154,6 @@ static void hx5116_init_sequence(struct hx5116_display *hx5116_dev)
hx5116_write (hx5116_dev, 0x2A, 0x07); /*set B_255*/
hx5116_write (hx5116_dev, 0x06, 0x03); /*set display on*/
- msleep(31); /* Wait for 15 Vsync to power on screen */
-
- hx5116_dev->power_on(1); /* switch on AMOLED power */
}
@@ -204,7 +199,6 @@ static int hx5116_spi_remove(struct spi_device *pdev)
{
struct hx5116_display *hx5116_dev = pdev->dev.platform_data;
- hx5116_dev->power_on(0); /* switch off AMOLED power */
hx5116_dev->reset_on(1); /* let hx5116 in reset */
display_device_unregister(hx5116_dev->display_dev);
return 0;
hooks/post-receive
--
armadeus
|
