r3708 - branches/src/target/kernel/2.6.24.x/patches

laforge at sita.openmoko.org laforge at sita.openmoko.org
Thu Dec 20 16:05:55 CET 2007


Author: laforge
Date: 2007-12-20 16:05:52 +0100 (Thu, 20 Dec 2007)
New Revision: 3708

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
Log:
move jbt6k74 driver to drivers/video/display/ directory


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-20 15:05:27 UTC (rev 3707)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch	2007-12-20 15:05:52 UTC (rev 3708)
@@ -6,15 +6,15 @@
 
 Signed-off-by: Harald Welte <laforge at openmoko.org>
 
-Index: linux-2.6/drivers/spi/Kconfig
+Index: linux-2.6/drivers/video/display/Kconfig
 ===================================================================
---- linux-2.6.orig/drivers/spi/Kconfig
-+++ linux-2.6/drivers/spi/Kconfig
-@@ -231,6 +231,17 @@
- 	  sysfs interface, with each line presented as a kind of GPIO
- 	  exposing both switch control and diagnostic feedback.
+--- linux-2.6.orig/drivers/video/display/Kconfig
++++ linux-2.6/drivers/video/display/Kconfig
+@@ -21,4 +21,15 @@
+ comment "Display hardware drivers"
+ 	depends on DISPLAY_SUPPORT
  
-+config SPI_JBT6K74
++config DISPLAY_JBT6K74
 +	tristate "TPO JBT6K74-AS TFT display ASIC control interface"
 +	depends on SPI_MASTER && SYSFS
 +	help
@@ -25,25 +25,21 @@
 +	  The control interface is required for display operation, as it
 +	  controls power management, display timing and gamma calibration.
 +
- #
- # Add new SPI protocol masters in alphabetical order above this line
- #
-Index: linux-2.6/drivers/spi/Makefile
+ endmenu
+Index: linux-2.6/drivers/video/display/Makefile
 ===================================================================
---- linux-2.6.orig/drivers/spi/Makefile
-+++ linux-2.6/drivers/spi/Makefile
-@@ -33,6 +33,7 @@
- obj-$(CONFIG_SPI_AT25)		+= at25.o
- obj-$(CONFIG_SPI_SPIDEV)	+= spidev.o
- obj-$(CONFIG_SPI_TLE62X0)	+= tle62x0.o
-+obj-$(CONFIG_SPI_JBT6K74)	+= jbt6k74.o
- # 	... add above this line ...
+--- linux-2.6.orig/drivers/video/display/Makefile
++++ linux-2.6/drivers/video/display/Makefile
+@@ -3,4 +3,5 @@
+ display-objs				:= display-sysfs.o
  
- # SPI slave controller drivers (upstream link)
-Index: linux-2.6/drivers/spi/jbt6k74.c
+ obj-$(CONFIG_DISPLAY_SUPPORT)		+= display.o
++obj-$(CONFIG_DISPLAY_JBT6K74)		+= jbt6k74.o
+ 
+Index: linux-2.6/drivers/video/display/jbt6k74.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6/drivers/spi/jbt6k74.c
++++ linux-2.6/drivers/video/display/jbt6k74.c
 @@ -0,0 +1,673 @@
 +/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
 + *
@@ -726,7 +722,7 @@
  config MACH_QT2410
  	bool "QT2410"
  	select CPU_S3C2410
-+	select SPI_JBT6K74
++	select DISPLAY_JBT6K74
  	help
  	   Say Y here if you are using the Armzone QT2410
  





More information about the commitlog mailing list