r3596 - branches/src/target/kernel/2.6.24.x/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Thu Dec 6 11:58:44 CET 2007
Author: laforge
Date: 2007-12-06 11:58:31 +0100 (Thu, 06 Dec 2007)
New Revision: 3596
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
Log:
merge commit 3233 from 2.6.22.x series: Make sure the display gets enabled again after coming out of the deep-standby state (Stefan Schmidt)
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch 2007-12-06 10:52:46 UTC (rev 3595)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch 2007-12-06 10:58:31 UTC (rev 3596)
@@ -1,11 +1,11 @@
This driver adds support for LCM initialization of the JBT6K74 LCM
as found on the FIC GTA01 hardware
-Index: linux-2.6.21.3-moko/drivers/spi/Kconfig
+Index: linux-2.6/drivers/spi/Kconfig
===================================================================
---- linux-2.6.21.3-moko.orig/drivers/spi/Kconfig
-+++ linux-2.6.21.3-moko/drivers/spi/Kconfig
-@@ -160,5 +160,9 @@
+--- linux-2.6.orig/drivers/spi/Kconfig
++++ linux-2.6/drivers/spi/Kconfig
+@@ -237,5 +237,9 @@
# (slave support would go here)
@@ -15,21 +15,21 @@
+
endmenu # "SPI support"
-Index: linux-2.6.21.3-moko/drivers/spi/Makefile
+Index: linux-2.6/drivers/spi/Makefile
===================================================================
---- linux-2.6.21.3-moko.orig/drivers/spi/Makefile
-+++ linux-2.6.21.3-moko/drivers/spi/Makefile
-@@ -30,4 +30,5 @@
+--- linux-2.6.orig/drivers/spi/Makefile
++++ linux-2.6/drivers/spi/Makefile
+@@ -39,4 +39,5 @@
# ... add above this line ...
# SPI slave drivers (protocol for that link)
+obj-$(CONFIG_SPI_SLAVE_JBT6K74) += jbt6k74.o
# ... add above this line ...
-Index: linux-2.6.21.3-moko/drivers/spi/jbt6k74.c
+Index: linux-2.6/drivers/spi/jbt6k74.c
===================================================================
--- /dev/null
-+++ linux-2.6.21.3-moko/drivers/spi/jbt6k74.c
-@@ -0,0 +1,544 @@
++++ linux-2.6/drivers/spi/jbt6k74.c
+@@ -0,0 +1,548 @@
+/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
+ *
+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
@@ -397,7 +397,11 @@
+ for (i = 0; i < ARRAY_SIZE(jbt_state_names); i++) {
+ if (!strncmp(buf, jbt_state_names[i],
+ strlen(jbt_state_names[i]))) {
++ DEBUGP("Switch to state: %u\n", i);
+ jbt6k74_enter_state(jbt, i);
++ if (i == JBT_STATE_NORMAL)
++ /* Enable display again after deep-standby */
++ jbt6k74_display_onoff(jbt, 1);
+ return count;
+ }
+ }
@@ -574,11 +578,11 @@
+
+module_init(jbt_init);
+module_exit(jbt_exit);
-Index: linux-2.6.21.3-moko/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6/arch/arm/mach-s3c2410/Kconfig
===================================================================
---- linux-2.6.21.3-moko.orig/arch/arm/mach-s3c2410/Kconfig
-+++ linux-2.6.21.3-moko/arch/arm/mach-s3c2410/Kconfig
-@@ -106,6 +106,7 @@
+--- linux-2.6.orig/arch/arm/mach-s3c2410/Kconfig
++++ linux-2.6/arch/arm/mach-s3c2410/Kconfig
+@@ -113,6 +113,7 @@
config MACH_QT2410
bool "QT2410"
select CPU_S3C2410
More information about the commitlog
mailing list