r1041 - trunk/src/target/kernel/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Sun Feb 18 17:20:25 CET 2007
Author: laforge
Date: 2007-02-18 17:20:24 +0100 (Sun, 18 Feb 2007)
New Revision: 1041
Modified:
trunk/src/target/kernel/patches/gta01-core.patch
trunk/src/target/kernel/patches/gta01-pcf50606.patch
trunk/src/target/kernel/patches/series
Log:
reorder to make sure PCF50606 driver is present before GTA01 support is added, since the latter requires the former.
Modified: trunk/src/target/kernel/patches/gta01-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-core.patch 2007-02-18 14:06:06 UTC (rev 1040)
+++ trunk/src/target/kernel/patches/gta01-core.patch 2007-02-18 16:20:24 UTC (rev 1041)
@@ -3,15 +3,16 @@
Index: linux-2.6.20/arch/arm/mach-s3c2410/Kconfig
===================================================================
---- linux-2.6.20.orig/arch/arm/mach-s3c2410/Kconfig 2007-02-17 14:59:09.000000000 +0100
-+++ linux-2.6.20/arch/arm/mach-s3c2410/Kconfig 2007-02-17 15:02:25.000000000 +0100
-@@ -86,6 +86,13 @@
+--- linux-2.6.20.orig/arch/arm/mach-s3c2410/Kconfig 2007-02-18 17:18:58.000000000 +0100
++++ linux-2.6.20/arch/arm/mach-s3c2410/Kconfig 2007-02-18 17:19:37.000000000 +0100
+@@ -86,6 +86,14 @@
help
Say Y here if you are using the Armzone QT2410
+config MACH_GTA01
+ bool "FIC Neo1973 GSM Phone"
+ select CPU_S3C2410
++ select SENSORS_PCF50606
+ help
+ Say Y here if you are using the FIC Neo1973 GSM Phone
+
@@ -21,8 +22,8 @@
select CPU_S3C2440
Index: linux-2.6.20/arch/arm/mach-s3c2410/Makefile
===================================================================
---- linux-2.6.20.orig/arch/arm/mach-s3c2410/Makefile 2007-02-17 14:59:09.000000000 +0100
-+++ linux-2.6.20/arch/arm/mach-s3c2410/Makefile 2007-02-17 14:59:20.000000000 +0100
+--- linux-2.6.20.orig/arch/arm/mach-s3c2410/Makefile 2007-02-18 17:18:36.000000000 +0100
++++ linux-2.6.20/arch/arm/mach-s3c2410/Makefile 2007-02-18 17:19:16.000000000 +0100
@@ -89,5 +89,6 @@
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
obj-$(CONFIG_MACH_VSTMS) += mach-vstms.o
@@ -33,7 +34,7 @@
Index: linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c 2007-02-17 15:05:54.000000000 +0100
++++ linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c 2007-02-18 17:19:16.000000000 +0100
@@ -0,0 +1,516 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
@@ -554,7 +555,7 @@
Index: linux-2.6.20/include/asm-arm/arch-s3c2410/gta01.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/include/asm-arm/arch-s3c2410/gta01.h 2007-02-17 14:59:20.000000000 +0100
++++ linux-2.6.20/include/asm-arm/arch-s3c2410/gta01.h 2007-02-18 17:19:16.000000000 +0100
@@ -0,0 +1,60 @@
+#ifndef _GTA01_H
+#define _GTA01_H
Modified: trunk/src/target/kernel/patches/gta01-pcf50606.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-02-18 14:06:06 UTC (rev 1040)
+++ trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-02-18 16:20:24 UTC (rev 1041)
@@ -3,7 +3,7 @@
Index: linux-2.6.20/drivers/i2c/chips/pcf50606.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/drivers/i2c/chips/pcf50606.c 2007-02-17 14:21:49.000000000 +0100
++++ linux-2.6.20/drivers/i2c/chips/pcf50606.c 2007-02-18 17:18:58.000000000 +0100
@@ -0,0 +1,1497 @@
+/* Philips PCF50606 Power Management Unit (PMU) driver
+ *
@@ -1505,7 +1505,7 @@
Index: linux-2.6.20/drivers/i2c/chips/pcf50606.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/drivers/i2c/chips/pcf50606.h 2007-02-17 14:21:49.000000000 +0100
++++ linux-2.6.20/drivers/i2c/chips/pcf50606.h 2007-02-18 17:18:58.000000000 +0100
@@ -0,0 +1,259 @@
+#ifndef _PCF50606_H
+#define _PCF50606_H
@@ -1768,8 +1768,8 @@
+
Index: linux-2.6.20/drivers/i2c/chips/Kconfig
===================================================================
---- linux-2.6.20.orig/drivers/i2c/chips/Kconfig 2007-02-17 13:36:17.000000000 +0100
-+++ linux-2.6.20/drivers/i2c/chips/Kconfig 2007-02-17 14:21:49.000000000 +0100
+--- linux-2.6.20.orig/drivers/i2c/chips/Kconfig 2007-02-18 17:18:34.000000000 +0100
++++ linux-2.6.20/drivers/i2c/chips/Kconfig 2007-02-18 17:18:58.000000000 +0100
@@ -36,6 +36,17 @@
This driver can also be built as a module. If so, the module
will be called eeprom.
@@ -1790,8 +1790,8 @@
depends on I2C && EXPERIMENTAL
Index: linux-2.6.20/drivers/i2c/chips/Makefile
===================================================================
---- linux-2.6.20.orig/drivers/i2c/chips/Makefile 2007-02-17 13:36:17.000000000 +0100
-+++ linux-2.6.20/drivers/i2c/chips/Makefile 2007-02-17 14:21:49.000000000 +0100
+--- linux-2.6.20.orig/drivers/i2c/chips/Makefile 2007-02-18 17:18:34.000000000 +0100
++++ linux-2.6.20/drivers/i2c/chips/Makefile 2007-02-18 17:18:58.000000000 +0100
@@ -8,6 +8,7 @@
obj-$(CONFIG_SENSORS_MAX6875) += max6875.o
obj-$(CONFIG_SENSORS_M41T00) += m41t00.o
@@ -1802,8 +1802,8 @@
obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
Index: linux-2.6.20/include/linux/i2c-id.h
===================================================================
---- linux-2.6.20.orig/include/linux/i2c-id.h 2007-02-17 13:36:17.000000000 +0100
-+++ linux-2.6.20/include/linux/i2c-id.h 2007-02-17 14:21:49.000000000 +0100
+--- linux-2.6.20.orig/include/linux/i2c-id.h 2007-02-18 17:18:34.000000000 +0100
++++ linux-2.6.20/include/linux/i2c-id.h 2007-02-18 17:18:58.000000000 +0100
@@ -159,6 +159,7 @@
#define I2C_DRIVERID_FSCHER 1046
#define I2C_DRIVERID_W83L785TS 1047
@@ -1815,7 +1815,7 @@
Index: linux-2.6.20/include/linux/pcf50606.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/include/linux/pcf50606.h 2007-02-17 14:21:49.000000000 +0100
++++ linux-2.6.20/include/linux/pcf50606.h 2007-02-18 17:18:58.000000000 +0100
@@ -0,0 +1,55 @@
+#ifndef _LINUX_PCF50606_H
+#define _LINUX_PCF50606_H
@@ -1872,15 +1872,3 @@
+};
+
+#endif
-Index: linux-2.6.20/arch/arm/mach-s3c2410/Kconfig
-===================================================================
---- linux-2.6.20.orig/arch/arm/mach-s3c2410/Kconfig 2007-02-17 14:29:26.000000000 +0100
-+++ linux-2.6.20/arch/arm/mach-s3c2410/Kconfig 2007-02-17 14:29:43.000000000 +0100
-@@ -90,6 +90,7 @@
- bool "FIC Neo1973 GSM Phone"
- select CPU_S3C2410
- select SPI_SLAVE_JBT6K74
-+ select SENSORS_PCF50606
- help
- Say Y here if you are using the FIC Neo1973 GSM Phone
-
Modified: trunk/src/target/kernel/patches/series
===================================================================
--- trunk/src/target/kernel/patches/series 2007-02-18 14:06:06 UTC (rev 1040)
+++ trunk/src/target/kernel/patches/series 2007-02-18 16:20:24 UTC (rev 1041)
@@ -21,10 +21,10 @@
qt2410-cs8900.patch
qt2410-biglcd.patch
qt2410-s3c_mci-pdata.patch
+gta01-pcf50606.patch
gta01-core.patch
gta01-jbt6k74.patch
gta01-backlight.patch
-gta01-pcf50606.patch
gta01-vibrator.patch
gta01-inputdevice.patch
gta01-power_control.patch
More information about the commitlog
mailing list
