r2907 - trunk/src/target/kernel/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Tue Sep 4 19:08:28 CEST 2007
Author: laforge
Date: 2007-09-04 19:08:15 +0200 (Tue, 04 Sep 2007)
New Revision: 2907
Removed:
trunk/src/target/kernel/patches/hxd8-tsl256x_fix.patch
trunk/src/target/kernel/patches/pcf50606_fix.patch
trunk/src/target/kernel/patches/pcf50633_fix.patch
trunk/src/target/kernel/patches/tune-touchscreen.patch
Modified:
trunk/src/target/kernel/patches/gta01-core.patch
trunk/src/target/kernel/patches/gta01-pcf50606.patch
trunk/src/target/kernel/patches/hxd8-tsl256x.patch
trunk/src/target/kernel/patches/pcf50633.patch
trunk/src/target/kernel/patches/series
Log:
patchset reorganization, no actual code changes:
* merge pcf50606_fix into pcf50606 main patch
* merge pcf50633_fix into pcf50633 main patch
* merge tsl256x_fix into tsl256x main patch
* merge tune-touchscreen into gta01 main patch
* shuffle patch order around to keep the end of the patchset to patches under flux
Modified: trunk/src/target/kernel/patches/gta01-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-core.patch 2007-09-04 16:48:47 UTC (rev 2906)
+++ trunk/src/target/kernel/patches/gta01-core.patch 2007-09-04 17:08:15 UTC (rev 2907)
@@ -1,10 +1,10 @@
This patch adds support for the FIC GTA01 machine type to the ARM port of
the linux kernel.
-Index: linux-2.6.22.1/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2410/Kconfig
===================================================================
---- linux-2.6.22.1.orig/arch/arm/mach-s3c2410/Kconfig
-+++ linux-2.6.22.1/arch/arm/mach-s3c2410/Kconfig
+--- linux-2.6.22.5-moko.orig/arch/arm/mach-s3c2410/Kconfig
++++ linux-2.6.22.5-moko/arch/arm/mach-s3c2410/Kconfig
@@ -109,5 +109,12 @@
help
Say Y here if you are using the Armzone QT2410
@@ -18,19 +18,19 @@
+
endmenu
-Index: linux-2.6.22.1/arch/arm/mach-s3c2410/Makefile
+Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2410/Makefile
===================================================================
---- linux-2.6.22.1.orig/arch/arm/mach-s3c2410/Makefile
-+++ linux-2.6.22.1/arch/arm/mach-s3c2410/Makefile
+--- linux-2.6.22.5-moko.orig/arch/arm/mach-s3c2410/Makefile
++++ linux-2.6.22.5-moko/arch/arm/mach-s3c2410/Makefile
@@ -29,3 +29,4 @@
obj-$(CONFIG_BAST_PC104_IRQ) += bast-irq.o
obj-$(CONFIG_MACH_VR1000) += mach-vr1000.o usb-simtec.o
obj-$(CONFIG_MACH_QT2410) += mach-qt2410.o
+obj-$(CONFIG_MACH_NEO1973_GTA01)+= mach-gta01.o
-Index: linux-2.6.22.1/arch/arm/mach-s3c2410/mach-gta01.c
+Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2410/mach-gta01.c
===================================================================
--- /dev/null
-+++ linux-2.6.22.1/arch/arm/mach-s3c2410/mach-gta01.c
++++ linux-2.6.22.5-moko/arch/arm/mach-s3c2410/mach-gta01.c
@@ -0,0 +1,755 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
@@ -550,8 +550,8 @@
+
+static struct s3c2410_ts_mach_info gta01_ts_cfg = {
+ .delay = 10000,
-+ .presc = 49,
-+ .oversampling_shift = 2,
++ .presc = 65,
++ .oversampling_shift = 5,
+};
+
+/* SPI */
@@ -787,10 +787,10 @@
+MACHINE_END
+
+
-Index: linux-2.6.22.1/include/asm-arm/arch-s3c2410/gta01.h
+Index: linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/gta01.h
===================================================================
--- /dev/null
-+++ linux-2.6.22.1/include/asm-arm/arch-s3c2410/gta01.h
++++ linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/gta01.h
@@ -0,0 +1,70 @@
+#ifndef _GTA01_H
+#define _GTA01_H
Modified: trunk/src/target/kernel/patches/gta01-pcf50606.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-09-04 16:48:47 UTC (rev 2906)
+++ trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-09-04 17:08:15 UTC (rev 2907)
@@ -1,7 +1,9 @@
This is the PCF50606 power management unit driver for FIC GTA01
+Index: linux-2.6.22.5-moko/drivers/i2c/chips/pcf50606.c
+===================================================================
--- /dev/null
-+++ linux-2.6.22.1/drivers/i2c/chips/pcf50606.c
++++ linux-2.6.22.5-moko/drivers/i2c/chips/pcf50606.c
@@ -0,0 +1,1929 @@
+/* Philips PCF50606 Power Management Unit (PMU) driver
+ *
@@ -1876,12 +1878,12 @@
+static struct i2c_driver pcf50606_driver = {
+ .driver = {
+ .name = "pcf50606",
-+ .suspend= &pcf50606_suspend,
-+ .resume = &pcf50606_resume,
++ .suspend= pcf50606_suspend,
++ .resume = pcf50606_resume,
+ },
+ .id = I2C_DRIVERID_PCF50606,
-+ .attach_adapter = &pcf50606_attach_adapter,
-+ .detach_client = &pcf50606_detach_client,
++ .attach_adapter = pcf50606_attach_adapter,
++ .detach_client = pcf50606_detach_client,
+};
+
+/* platform driver, since i2c devices don't have platform_data */
@@ -1932,8 +1934,10 @@
+
+module_init(pcf50606_init);
+module_exit(pcf50606_exit);
+Index: linux-2.6.22.5-moko/drivers/i2c/chips/pcf50606.h
+===================================================================
--- /dev/null
-+++ linux-2.6.22.1/drivers/i2c/chips/pcf50606.h
++++ linux-2.6.22.5-moko/drivers/i2c/chips/pcf50606.h
@@ -0,0 +1,302 @@
+#ifndef _PCF50606_H
+#define _PCF50606_H
@@ -2237,8 +2241,10 @@
+
+#endif /* _PCF50606_H */
+
---- linux-2.6.22.1.orig/drivers/i2c/chips/Kconfig
-+++ linux-2.6.22.1/drivers/i2c/chips/Kconfig
+Index: linux-2.6.22.5-moko/drivers/i2c/chips/Kconfig
+===================================================================
+--- linux-2.6.22.5-moko.orig/drivers/i2c/chips/Kconfig
++++ linux-2.6.22.5-moko/drivers/i2c/chips/Kconfig
@@ -35,6 +35,17 @@
This driver can also be built as a module. If so, the module
will be called eeprom.
@@ -2257,8 +2263,10 @@
config SENSORS_PCF8574
tristate "Philips PCF8574 and PCF8574A"
depends on EXPERIMENTAL
---- linux-2.6.22.1.orig/drivers/i2c/chips/Makefile
-+++ linux-2.6.22.1/drivers/i2c/chips/Makefile
+Index: linux-2.6.22.5-moko/drivers/i2c/chips/Makefile
+===================================================================
+--- linux-2.6.22.5-moko.orig/drivers/i2c/chips/Makefile
++++ linux-2.6.22.5-moko/drivers/i2c/chips/Makefile
@@ -8,6 +8,7 @@
obj-$(CONFIG_SENSORS_MAX6875) += max6875.o
obj-$(CONFIG_SENSORS_M41T00) += m41t00.o
@@ -2267,9 +2275,11 @@
obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
---- linux-2.6.22.1.orig/include/linux/i2c-id.h
-+++ linux-2.6.22.1/include/linux/i2c-id.h
-@@ -160,6 +160,7 @@
+Index: linux-2.6.22.5-moko/include/linux/i2c-id.h
+===================================================================
+--- linux-2.6.22.5-moko.orig/include/linux/i2c-id.h
++++ linux-2.6.22.5-moko/include/linux/i2c-id.h
+@@ -161,6 +161,7 @@
#define I2C_DRIVERID_FSCHER 1046
#define I2C_DRIVERID_W83L785TS 1047
#define I2C_DRIVERID_OV7670 1048 /* Omnivision 7670 camera */
@@ -2277,8 +2287,10 @@
/*
* ---- Adapter types ----------------------------------------------------
+Index: linux-2.6.22.5-moko/include/linux/pcf50606.h
+===================================================================
--- /dev/null
-+++ linux-2.6.22.1/include/linux/pcf50606.h
++++ linux-2.6.22.5-moko/include/linux/pcf50606.h
@@ -0,0 +1,104 @@
+#ifndef _LINUX_PCF50606_H
+#define _LINUX_PCF50606_H
Modified: trunk/src/target/kernel/patches/hxd8-tsl256x.patch
===================================================================
--- trunk/src/target/kernel/patches/hxd8-tsl256x.patch 2007-09-04 16:48:47 UTC (rev 2906)
+++ trunk/src/target/kernel/patches/hxd8-tsl256x.patch 2007-09-04 17:08:15 UTC (rev 2907)
@@ -1,7 +1,7 @@
-Index: linux-2.6.21-moko/drivers/i2c/chips/tsl256x.c
+Index: linux-2.6.22.5-moko/drivers/i2c/chips/tsl256x.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/i2c/chips/tsl256x.c
++++ linux-2.6.22.5-moko/drivers/i2c/chips/tsl256x.c
@@ -0,0 +1,310 @@
+/*
+ * tsl256x.c -- TSL256x Light Sensor driver
@@ -288,13 +288,13 @@
+ .name = "tsl256x",
+ .owner = THIS_MODULE,
+#ifdef CONFIG_PM
-+ .suspend = &tsl256x_suspend,
-+ .resume = &tsl256x_resume,
++ .suspend = tsl256x_suspend,
++ .resume = tsl256x_resume,
+#endif
+ },
+ .id = I2C_DRIVERID_TSL256X,
-+ .attach_adapter = &tsl256x_attach_adapter,
-+ .detach_client = &tsl256x_detach_client,
++ .attach_adapter = tsl256x_attach_adapter,
++ .detach_client = tsl256x_detach_client,
+};
+
+static int __init tsl256x_init(void)
@@ -313,10 +313,10 @@
+module_init(tsl256x_init);
+module_exit(tsl256x_exit);
+
-Index: linux-2.6.21-moko/drivers/i2c/chips/tsl256x.h
+Index: linux-2.6.22.5-moko/drivers/i2c/chips/tsl256x.h
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/i2c/chips/tsl256x.h
++++ linux-2.6.22.5-moko/drivers/i2c/chips/tsl256x.h
@@ -0,0 +1,154 @@
+/*
+ * tsl256x.h -- TSL256x Light Sensor driver
@@ -472,11 +472,11 @@
+
+#endif /* _TSL256X_H */
+
-Index: linux-2.6.21-moko/drivers/i2c/chips/Kconfig
+Index: linux-2.6.22.5-moko/drivers/i2c/chips/Kconfig
===================================================================
---- linux-2.6.21-moko.orig/drivers/i2c/chips/Kconfig
-+++ linux-2.6.21-moko/drivers/i2c/chips/Kconfig
-@@ -136,4 +136,14 @@
+--- linux-2.6.22.5-moko.orig/drivers/i2c/chips/Kconfig
++++ linux-2.6.22.5-moko/drivers/i2c/chips/Kconfig
+@@ -135,4 +135,14 @@
This driver can also be built as a module. If so, the module
will be called max6875.
@@ -491,10 +491,10 @@
+ will be called tsl256x.
+
endmenu
-Index: linux-2.6.21-moko/drivers/i2c/chips/Makefile
+Index: linux-2.6.22.5-moko/drivers/i2c/chips/Makefile
===================================================================
---- linux-2.6.21-moko.orig/drivers/i2c/chips/Makefile
-+++ linux-2.6.21-moko/drivers/i2c/chips/Makefile
+--- linux-2.6.22.5-moko.orig/drivers/i2c/chips/Makefile
++++ linux-2.6.22.5-moko/drivers/i2c/chips/Makefile
@@ -13,6 +13,7 @@
obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
@@ -503,11 +503,11 @@
ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
EXTRA_CFLAGS += -DDEBUG
-Index: linux-2.6.21-moko/include/linux/i2c-id.h
+Index: linux-2.6.22.5-moko/include/linux/i2c-id.h
===================================================================
---- linux-2.6.21-moko.orig/include/linux/i2c-id.h
-+++ linux-2.6.21-moko/include/linux/i2c-id.h
-@@ -160,6 +160,7 @@
+--- linux-2.6.22.5-moko.orig/include/linux/i2c-id.h
++++ linux-2.6.22.5-moko/include/linux/i2c-id.h
+@@ -162,6 +162,7 @@
#define I2C_DRIVERID_W83L785TS 1047
#define I2C_DRIVERID_OV7670 1048 /* Omnivision 7670 camera */
#define I2C_DRIVERID_PCF50606 1049
Deleted: trunk/src/target/kernel/patches/hxd8-tsl256x_fix.patch
===================================================================
--- trunk/src/target/kernel/patches/hxd8-tsl256x_fix.patch 2007-09-04 16:48:47 UTC (rev 2906)
+++ trunk/src/target/kernel/patches/hxd8-tsl256x_fix.patch 2007-09-04 17:08:15 UTC (rev 2907)
@@ -1,20 +0,0 @@
---- linux-2.6.22.1.orig/drivers/i2c/chips/tsl256x.c
-+++ linux-2.6.22.1/drivers/i2c/chips/tsl256x.c
-@@ -283,13 +283,13 @@
- .name = "tsl256x",
- .owner = THIS_MODULE,
- #ifdef CONFIG_PM
-- .suspend = &tsl256x_suspend,
-- .resume = &tsl256x_resume,
-+ .suspend = tsl256x_suspend,
-+ .resume = tsl256x_resume,
- #endif
- },
- .id = I2C_DRIVERID_TSL256X,
-- .attach_adapter = &tsl256x_attach_adapter,
-- .detach_client = &tsl256x_detach_client,
-+ .attach_adapter = tsl256x_attach_adapter,
-+ .detach_client = tsl256x_detach_client,
- };
-
- static int __init tsl256x_init(void)
Deleted: trunk/src/target/kernel/patches/pcf50606_fix.patch
===================================================================
--- trunk/src/target/kernel/patches/pcf50606_fix.patch 2007-09-04 16:48:47 UTC (rev 2906)
+++ trunk/src/target/kernel/patches/pcf50606_fix.patch 2007-09-04 17:08:15 UTC (rev 2907)
@@ -1,21 +0,0 @@
-Index: linux-2.6.21.5/drivers/i2c/chips/pcf50606.c
-===================================================================
---- linux-2.6.21.5.orig/drivers/i2c/chips/pcf50606.c 2007-07-16 12:21:35.724785054 +0200
-+++ linux-2.6.21.5/drivers/i2c/chips/pcf50606.c 2007-07-16 12:21:57.510026525 +0200
-@@ -1871,12 +1871,12 @@
- static struct i2c_driver pcf50606_driver = {
- .driver = {
- .name = "pcf50606",
-- .suspend= &pcf50606_suspend,
-- .resume = &pcf50606_resume,
-+ .suspend= pcf50606_suspend,
-+ .resume = pcf50606_resume,
- },
- .id = I2C_DRIVERID_PCF50606,
-- .attach_adapter = &pcf50606_attach_adapter,
-- .detach_client = &pcf50606_detach_client,
-+ .attach_adapter = pcf50606_attach_adapter,
-+ .detach_client = pcf50606_detach_client,
- };
-
- /* platform driver, since i2c devices don't have platform_data */
Modified: trunk/src/target/kernel/patches/pcf50633.patch
===================================================================
--- trunk/src/target/kernel/patches/pcf50633.patch 2007-09-04 16:48:47 UTC (rev 2906)
+++ trunk/src/target/kernel/patches/pcf50633.patch 2007-09-04 17:08:15 UTC (rev 2907)
@@ -1671,12 +1671,12 @@
+static struct i2c_driver pcf50633_driver = {
+ .driver = {
+ .name = "pcf50633",
-+ .suspend= &pcf50633_suspend,
-+ .resume = &pcf50633_resume,
++ .suspend= pcf50633_suspend,
++ .resume = pcf50633_resume,
+ },
+ .id = I2C_DRIVERID_PCF50633,
-+ .attach_adapter = &pcf50633_attach_adapter,
-+ .detach_client = &pcf50633_detach_client,
++ .attach_adapter = pcf50633_attach_adapter,
++ .detach_client = pcf50633_detach_client,
+};
+
+/* platform driver, since i2c devices don't have platform_data */
@@ -1839,7 +1839,7 @@
===================================================================
--- linux-2.6.22.5-moko.orig/include/linux/i2c-id.h
+++ linux-2.6.22.5-moko/include/linux/i2c-id.h
-@@ -162,6 +162,7 @@
+@@ -163,6 +163,7 @@
#define I2C_DRIVERID_OV7670 1048 /* Omnivision 7670 camera */
#define I2C_DRIVERID_PCF50606 1049
#define I2C_DRIVERID_TSL256X 1050
Deleted: trunk/src/target/kernel/patches/pcf50633_fix.patch
===================================================================
--- trunk/src/target/kernel/patches/pcf50633_fix.patch 2007-09-04 16:48:47 UTC (rev 2906)
+++ trunk/src/target/kernel/patches/pcf50633_fix.patch 2007-09-04 17:08:15 UTC (rev 2907)
@@ -1,21 +0,0 @@
-Index: linux-2.6.21.5/drivers/i2c/chips/pcf50633.c
-===================================================================
---- linux-2.6.21.5.orig/drivers/i2c/chips/pcf50633.c 2007-07-16 12:22:46.480817213 +0200
-+++ linux-2.6.21.5/drivers/i2c/chips/pcf50633.c 2007-07-16 12:23:02.773745695 +0200
-@@ -1633,12 +1633,12 @@
- static struct i2c_driver pcf50633_driver = {
- .driver = {
- .name = "pcf50633",
-- .suspend= &pcf50633_suspend,
-- .resume = &pcf50633_resume,
-+ .suspend= pcf50633_suspend,
-+ .resume = pcf50633_resume,
- },
- .id = I2C_DRIVERID_PCF50633,
-- .attach_adapter = &pcf50633_attach_adapter,
-- .detach_client = &pcf50633_detach_client,
-+ .attach_adapter = pcf50633_attach_adapter,
-+ .detach_client = pcf50633_detach_client,
- };
-
- /* platform driver, since i2c devices don't have platform_data */
Modified: trunk/src/target/kernel/patches/series
===================================================================
--- trunk/src/target/kernel/patches/series 2007-09-04 16:48:47 UTC (rev 2906)
+++ trunk/src/target/kernel/patches/series 2007-09-04 17:08:15 UTC (rev 2907)
@@ -1,3 +1,8 @@
+alsa-2.6.23-rc1-commit.diff
+asoc-platform-hw_init-pcm_emulation-fix.patch
+asoc-kconfig-fix.patch
+missing_defs.patch
+openmoko-logo.patch
yaffs2-20070304.patch
i2c-permit_invalid_addrs.patch
pm-debug_less_verbose.patch
@@ -12,6 +17,7 @@
s3cmci_dbg.patch
s3cmci-dma-free.patch
s3cmci-stop-fix.patch
+s3cmci-unfinished-write-fix.patch
s3c_mci_platform.patch
qt2410-base.patch
qt2410-cs8900.patch
@@ -37,13 +43,3 @@
s3c24xx-nand-largepage.patch
s3c2442b-cpuid.patch
gta02-core.patch
-alsa-2.6.23-rc1-commit.diff
-asoc-platform-hw_init-pcm_emulation-fix.patch
-asoc-kconfig-fix.patch
-pcf50606_fix.patch
-pcf50633_fix.patch
-hxd8-tsl256x_fix.patch
-missing_defs.patch
-tune-touchscreen.patch
-openmoko-logo.patch
-s3cmci-unfinished-write-fix.patch
Deleted: trunk/src/target/kernel/patches/tune-touchscreen.patch
===================================================================
--- trunk/src/target/kernel/patches/tune-touchscreen.patch 2007-09-04 16:48:47 UTC (rev 2906)
+++ trunk/src/target/kernel/patches/tune-touchscreen.patch 2007-09-04 17:08:15 UTC (rev 2907)
@@ -1,15 +0,0 @@
-Index: linux-2.6.22.1/arch/arm/mach-s3c2410/mach-gta01.c
-===================================================================
---- linux-2.6.22.1.orig/arch/arm/mach-s3c2410/mach-gta01.c
-+++ linux-2.6.22.1/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -486,8 +486,8 @@
-
- static struct s3c2410_ts_mach_info gta01_ts_cfg = {
- .delay = 10000,
-- .presc = 49,
-- .oversampling_shift = 2,
-+ .presc = 65,
-+ .oversampling_shift = 5,
- };
-
- /* SPI */
More information about the commitlog
mailing list
