Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r3573 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
2. r3574 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
3. r3575 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-12-05 14:34:37 +0100 (Wed, 05 Dec 2007)
New Revision: 3573
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch
Log:
gta01/gta02/hxd8:
* convert to new s3c2410fb platform data
* remove deprecated SA_INTERRUPT flag from request_irq()
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
2007-12-05 08:14:34 UTC (rev 3572)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
2007-12-05 13:34:37 UTC (rev 3573)
@@ -1,11 +1,11 @@
This patch adds support for the FIC GTA01 machine type to the ARM port of
the linux kernel.
-Index: linux-2.6.22/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6/arch/arm/mach-s3c2410/Kconfig
===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2410/Kconfig
-+++ linux-2.6.22/arch/arm/mach-s3c2410/Kconfig
-@@ -110,5 +110,12 @@
+--- linux-2.6.orig/arch/arm/mach-s3c2410/Kconfig
++++ linux-2.6/arch/arm/mach-s3c2410/Kconfig
+@@ -116,5 +116,12 @@
help
Say Y here if you are using the Armzone QT2410
@@ -18,20 +18,20 @@
+
endmenu
-Index: linux-2.6.22/arch/arm/mach-s3c2410/Makefile
+Index: linux-2.6/arch/arm/mach-s3c2410/Makefile
===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2410/Makefile
-+++ linux-2.6.22/arch/arm/mach-s3c2410/Makefile
-@@ -29,3 +29,4 @@
+--- linux-2.6.orig/arch/arm/mach-s3c2410/Makefile
++++ linux-2.6/arch/arm/mach-s3c2410/Makefile
+@@ -30,3 +30,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/arch/arm/mach-s3c2410/mach-gta01.c
+Index: linux-2.6/arch/arm/mach-s3c2410/mach-gta01.c
===================================================================
--- /dev/null
-+++ linux-2.6.22/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -0,0 +1,755 @@
++++ linux-2.6/arch/arm/mach-s3c2410/mach-gta01.c
+@@ -0,0 +1,760 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
+ *
@@ -309,24 +309,22 @@
+/* LCD driver info */
+
+/* Configuration for 480x640 toppoly TD028TTEC1 */
-+static struct s3c2410fb_mach_info gta01_lcd_cfg __initdata = {
-+ .regs = {
-+ .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
-+ S3C2410_LCDCON1_TFT |
-+ S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
++static struct s3c2410fb_display gta01_displays[] __initdata = {
++ {
++ .type = S3C2410_LCDCON1_TFT,
++ .width = 480,
++ .height = 640,
++ .xres = 480,
++ .yres = 640,
++ .bpp = 16,
+
-+ .lcdcon2 = S3C2410_LCDCON2_VBPD(1) | /* 2 */
-+ S3C2410_LCDCON2_LINEVAL(639) |/* 640 */
-+ S3C2410_LCDCON2_VFPD(15) | /* 16 */
-+ S3C2410_LCDCON2_VSPW(1), /* 2 */
-+
-+ .lcdcon3 = S3C2410_LCDCON3_HBPD(7) | /* 8 */
-+ S3C2410_LCDCON3_HOZVAL(479) | /* 480 */
-+ S3C2410_LCDCON3_HFPD(103), /* 104 */
-+
-+ .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
-+ S3C2410_LCDCON4_HSPW(7), /* 8 */
-+
++ .pixclock = 40000, /* HCLK/4 */
++ .left_margin = 104,
++ .right_margin = 8,
++ .hsync_len = 8,
++ .upper_margin = 16,
++ .lower_margin = 2,
++ .vsync_len = 2,
+ .lcdcon5 = S3C2410_LCDCON5_FRM565 |
+ S3C2410_LCDCON5_INVVCLK |
+ S3C2410_LCDCON5_INVVLINE |
@@ -334,31 +332,38 @@
+ S3C2410_LCDCON5_PWREN |
+ S3C2410_LCDCON5_HWSWP,
+ },
++ {
++ .type = S3C2410_LCDCON1_TFT,
++ .width = 240,
++ .height = 320,
++ .xres = 240,
++ .yres = 320,
++ .bpp = 16,
+
-+ .lpcsel = ((0xCE6) & ~7) | 1<<4,
-+ .type = S3C2410_LCDCON1_TFT,
-+
-+ .width = 480,
-+ .height = 640,
-+
-+ .xres = {
-+ .min = 240,
-+ .max = 480,
-+ .defval = 480,
++ .pixclock = 40000, /* HCLK/4 */
++ .left_margin = 104,
++ .right_margin = 8,
++ .hsync_len = 8,
++ .upper_margin = 16,
++ .lower_margin = 2,
++ .vsync_len = 2,
++ .lcdcon5 = S3C2410_LCDCON5_FRM565 |
++ S3C2410_LCDCON5_INVVCLK |
++ S3C2410_LCDCON5_INVVLINE |
++ S3C2410_LCDCON5_INVVFRAME |
++ S3C2410_LCDCON5_PWREN |
++ S3C2410_LCDCON5_HWSWP,
+ },
++};
+
-+ .yres = {
-+ .min = 320,
-+ .max = 640,
-+ .defval = 640,
-+ },
++static struct s3c2410fb_mach_info gta01_lcd_cfg __initdata = {
++ .displays = gta01_displays,
++ .num_displays = ARRAY_SIZE(gta01_displays),
++ .default_display= 1,
+
-+ .bpp = {
-+ .min = 1,
-+ .max = 16,
-+ .defval = 16,
-+ },
++ .lpcsel = ((0xCE6) & ~7) | 1<<4,
+};
++
+static struct platform_device *gta01_devices[] __initdata = {
+ &s3c_device_usb,
+ &s3c_device_lcd,
@@ -772,7 +777,7 @@
+
+ set_irq_type(GTA01_IRQ_MODEM, IRQT_RISING);
+ request_irq(GTA01_IRQ_MODEM, gta01_modem_irq,
-+ SA_INTERRUPT, "modem", NULL);
++ IRQF_TRIGGER_RISING, "modem", NULL);
+ enable_irq_wake(GTA01_IRQ_MODEM);
+}
+
@@ -787,10 +792,10 @@
+MACHINE_END
+
+
-Index: linux-2.6.22/include/asm-arm/arch-s3c2410/gta01.h
+Index: linux-2.6/include/asm-arm/arch-s3c2410/gta01.h
===================================================================
--- /dev/null
-+++ linux-2.6.22/include/asm-arm/arch-s3c2410/gta01.h
++++ linux-2.6/include/asm-arm/arch-s3c2410/gta01.h
@@ -0,0 +1,70 @@
+#ifndef _GTA01_H
+#define _GTA01_H
Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-05 08:14:34 UTC (rev 3572)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-05 13:34:37 UTC (rev 3573)
@@ -1,7 +1,7 @@
-Index: linux-2.6.22/arch/arm/mach-s3c2440/mach-gta02.c
+Index: linux-2.6/arch/arm/mach-s3c2440/mach-gta02.c
===================================================================
--- /dev/null
-+++ linux-2.6.22/arch/arm/mach-s3c2440/mach-gta02.c
++++ linux-2.6/arch/arm/mach-s3c2440/mach-gta02.c
@@ -0,0 +1,636 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
@@ -626,7 +626,7 @@
+
+ set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
+ request_irq(GTA02_IRQ_MODEM, gta02_modem_irq,
-+ SA_INTERRUPT, "modem", NULL);
++ IRQF_TRIGGER_RISING, "modem", NULL);
+ enable_irq_wake(GTA02_IRQ_MODEM);
+}
+
@@ -639,10 +639,10 @@
+ .init_machine = gta02_machine_init,
+ .timer = &s3c24xx_timer,
+MACHINE_END
-Index: linux-2.6.22/include/asm-arm/arch-s3c2410/gta02.h
+Index: linux-2.6/include/asm-arm/arch-s3c2410/gta02.h
===================================================================
--- /dev/null
-+++ linux-2.6.22/include/asm-arm/arch-s3c2410/gta02.h
++++ linux-2.6/include/asm-arm/arch-s3c2410/gta02.h
@@ -0,0 +1,97 @@
+#ifndef _GTA02_H
+#define _GTA02_H
@@ -741,10 +741,10 @@
+#define GTA02v3_IRQ_nGSM_OC IRQ_EINT19 /* v3 + v4 only */
+
+#endif /* _GTA02_H */
-Index: linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+Index: linux-2.6/arch/arm/mach-s3c2440/Kconfig
===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2440/Kconfig
-+++ linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+--- linux-2.6.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6/arch/arm/mach-s3c2440/Kconfig
@@ -74,5 +74,12 @@
help
Say Y here if you are using the FIC Neo1973 GSM Phone
@@ -758,19 +758,19 @@
+
endmenu
-Index: linux-2.6.22/arch/arm/mach-s3c2440/Makefile
+Index: linux-2.6/arch/arm/mach-s3c2440/Makefile
===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2440/Makefile
-+++ linux-2.6.22/arch/arm/mach-s3c2440/Makefile
+--- linux-2.6.orig/arch/arm/mach-s3c2440/Makefile
++++ linux-2.6/arch/arm/mach-s3c2440/Makefile
@@ -22,3 +22,4 @@
obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
obj-$(CONFIG_MACH_HXD8) += mach-hxd8.o
+obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-Index: linux-2.6.22/arch/arm/common/gta01_pm_bt.c
+Index: linux-2.6/arch/arm/common/gta01_pm_bt.c
===================================================================
---- linux-2.6.22.orig/arch/arm/common/gta01_pm_bt.c
-+++ linux-2.6.22/arch/arm/common/gta01_pm_bt.c
+--- linux-2.6.orig/arch/arm/common/gta01_pm_bt.c
++++ linux-2.6/arch/arm/common/gta01_pm_bt.c
@@ -19,22 +19,40 @@
#include <linux/pcf50606.h>
@@ -889,10 +889,10 @@
/* we pull reset to low to make sure that the chip doesn't
* drain power through the reset line */
s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-Index: linux-2.6.22/arch/arm/common/gta01_pm_gsm.c
+Index: linux-2.6/arch/arm/common/gta01_pm_gsm.c
===================================================================
---- linux-2.6.22.orig/arch/arm/common/gta01_pm_gsm.c
-+++ linux-2.6.22/arch/arm/common/gta01_pm_gsm.c
+--- linux-2.6.orig/arch/arm/common/gta01_pm_gsm.c
++++ linux-2.6/arch/arm/common/gta01_pm_gsm.c
@@ -19,8 +19,14 @@
#include <linux/errno.h>
@@ -1001,23 +1001,23 @@
MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
-MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GSM Management");
+MODULE_DESCRIPTION("FIC Neo1973 GSM Power Management");
-Index: linux-2.6.22/drivers/leds/leds-gta01.c
+Index: linux-2.6/drivers/leds/leds-gta01.c
===================================================================
---- linux-2.6.22.5-moko.orig/drivers/leds/leds-gta01.c
-+++ linux-2.6.22.5-moko/drivers/leds/leds-gta01.c
-@@ -111,7 +110,7 @@
- struct gta01_vib_priv *vp;
+--- linux-2.6.orig/drivers/leds/leds-gta01.c
++++ linux-2.6/drivers/leds/leds-gta01.c
+@@ -110,7 +110,7 @@
struct resource *r;
+ int rc;
- if (!machine_is_neo1973_gta01())
+ if (!machine_is_neo1973_gta01() && !machine_is_neo1973_gta02())
return -EIO;
r = platform_get_resource(pdev, 0, 0);
-Index: linux-2.6.22/sound/soc/s3c24xx/neo1973_wm8753.c
+Index: linux-2.6/sound/soc/s3c24xx/neo1973_wm8753.c
===================================================================
---- linux-2.6.22.orig/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ linux-2.6.22/sound/soc/s3c24xx/neo1973_wm8753.c
+--- linux-2.6.orig/sound/soc/s3c24xx/neo1973_wm8753.c
++++ linux-2.6/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -670,6 +670,12 @@
{
int ret;
Modified: branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch 2007-12-05
08:14:34 UTC (rev 3572)
+++ branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch 2007-12-05
13:34:37 UTC (rev 3573)
@@ -1,8 +1,8 @@
This patch adds another machine, the FIC HXD8
-Index: linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+Index: linux-2.6/arch/arm/mach-s3c2440/Kconfig
===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2440/Kconfig
-+++ linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+--- linux-2.6.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6/arch/arm/mach-s3c2440/Kconfig
@@ -67,6 +67,12 @@
default y if ARCH_S3C2440
select CPU_S3C2440
@@ -16,20 +16,20 @@
endmenu
-Index: linux-2.6.22/arch/arm/mach-s3c2440/Makefile
+Index: linux-2.6/arch/arm/mach-s3c2440/Makefile
===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2440/Makefile
-+++ linux-2.6.22/arch/arm/mach-s3c2440/Makefile
+--- linux-2.6.orig/arch/arm/mach-s3c2440/Makefile
++++ linux-2.6/arch/arm/mach-s3c2440/Makefile
@@ -21,3 +21,4 @@
obj-$(CONFIG_MACH_RX3715) += mach-rx3715.o
obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
+obj-$(CONFIG_MACH_HXD8) += mach-hxd8.o
-Index: linux-2.6.22/arch/arm/mach-s3c2440/mach-hxd8.c
+Index: linux-2.6/arch/arm/mach-s3c2440/mach-hxd8.c
===================================================================
--- /dev/null
-+++ linux-2.6.22/arch/arm/mach-s3c2440/mach-hxd8.c
-@@ -0,0 +1,399 @@
++++ linux-2.6/arch/arm/mach-s3c2440/mach-hxd8.c
+@@ -0,0 +1,380 @@
+/* linux/arch/arm/mach-s3c2440/mach-hxd8.c
+ *
+ * S3C2440 Machine Support for the FIC HXD8
@@ -279,53 +279,34 @@
+
+/* LCD driver info */
+
-+static struct s3c2410fb_mach_info hxd8_lcd_cfg __initdata = {
-+ .regs = {
++static struct s3c2410fb_display hxd8_displays[] __initdata = {
++ {
++ .type = S3C2410_LCDCON1_TFT,
++ .width = 480,
++ .height = 272,
++ .xres = 480,
++ .yres = 272,
++ .bpp = 16,
+
-+ .lcdcon1 = S3C2410_LCDCON1_TFT24BPP |
-+ S3C2410_LCDCON1_TFT |
-+ S3C2410_LCDCON1_CLKVAL(0x05),
-+
-+ .lcdcon2 = S3C2410_LCDCON2_VBPD(1) |
-+ S3C2410_LCDCON2_LINEVAL(271) |
-+ S3C2410_LCDCON2_VFPD(1) |
-+ S3C2410_LCDCON2_VSPW(9),
-+
-+ .lcdcon3 = S3C2410_LCDCON3_HBPD(1) |
-+ S3C2410_LCDCON3_HOZVAL(479) |
-+ S3C2410_LCDCON3_HFPD(1),
-+
-+ .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
-+ S3C2410_LCDCON4_HSPW(40),
-+
++ .pixclock = 40000, /* HCLK/4 */
++ .left_margin = 2,
++ .right_margin = 2,
++ .hsync_len = 41,
++ .upper_margin = 2,
++ .lower_margin = 2,
++ .vsync_len = 10,
+ .lcdcon5 = S3C2410_LCDCON5_FRM565 |
+ S3C2410_LCDCON5_INVVLINE |
+ S3C2410_LCDCON5_INVVFRAME,
+ },
++};
+
-+ .lpcsel = ((0xCE6) & ~7),
-+ .type = S3C2410_LCDCON1_TFT,
++static struct s3c2410fb_mach_info hxd8_lcd_cfg __initdata = {
++ .displays = hxd8_displays,
++ .num_displays = ARRAY_SIZE(hxd8_displays),
++ .default_display = 1,
+
-+ .width = 480,
-+ .height = 272,
-+
-+ .xres = {
-+ .min = 480,
-+ .max = 480,
-+ .defval = 480,
-+ },
-+
-+ .yres = {
-+ .min = 272,
-+ .max = 272,
-+ .defval = 272,
-+ },
-+
-+ .bpp = {
-+ .min = 16,
-+ .max = 32,
-+ .defval = 32,
-+ },
++ .lpcsel = ((0xCE6) & ~7),
+};
+
+static struct platform_device hxd8_pm_gsm_dev = {
@@ -429,10 +410,10 @@
+ .init_machine = hxd8_machine_init,
+ .timer = &s3c24xx_timer,
+MACHINE_END
-Index: linux-2.6.22/include/asm-arm/arch-s3c2440/hxd8.h
+Index: linux-2.6/include/asm-arm/arch-s3c2440/hxd8.h
===================================================================
--- /dev/null
-+++ linux-2.6.22/include/asm-arm/arch-s3c2440/hxd8.h
++++ linux-2.6/include/asm-arm/arch-s3c2440/hxd8.h
@@ -0,0 +1,16 @@
+#ifndef _HXD8_H
+#define _HXD8_H
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-05 17:04:09 +0100 (Wed, 05 Dec 2007)
New Revision: 3574
Modified:
branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch
Log:
cosmetic fix: use tab instead of spaces
Modified: branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch 2007-12-05
13:34:37 UTC (rev 3573)
+++ branches/src/target/kernel/2.6.24.x/patches/hxd8-core.patch 2007-12-05
16:04:09 UTC (rev 3574)
@@ -394,7 +394,7 @@
+
+ platform_device_register(&hxd8_pmu_dev);
+
-+ platform_add_devices(hxd8_devices, ARRAY_SIZE(hxd8_devices));
++ platform_add_devices(hxd8_devices, ARRAY_SIZE(hxd8_devices));
+
+ s3c2410_pm_init();
+}
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-05 17:05:48 +0100 (Wed, 05 Dec 2007)
New Revision: 3575
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch
branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch
branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch
branches/src/target/kernel/2.6.24.x/patches/s3c2410-qt2410-buttons.patch
Log:
kernel api change: s/SA_INTERRUPT/IRQF_DISABLED/g
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
2007-12-05 16:04:09 UTC (rev 3574)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
2007-12-05 16:05:48 UTC (rev 3575)
@@ -776,8 +776,8 @@
+ s3c2410_pm_init();
+
+ set_irq_type(GTA01_IRQ_MODEM, IRQT_RISING);
-+ request_irq(GTA01_IRQ_MODEM, gta01_modem_irq,
-+ IRQF_TRIGGER_RISING, "modem", NULL);
++ request_irq(GTA01_IRQ_MODEM, gta01_modem_irq, IRQF_DISABLED, "modem",
++ NULL);
+ enable_irq_wake(GTA01_IRQ_MODEM);
+}
+
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch
2007-12-05 16:04:09 UTC (rev 3574)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch
2007-12-05 16:05:48 UTC (rev 3575)
@@ -1,12 +1,12 @@
This provides support for the GTA01 keyboard
-Index: linux-2.6.21-moko/drivers/input/keyboard/Kconfig
+Index: linux-2.6/drivers/input/keyboard/Kconfig
===================================================================
---- linux-2.6.21-moko.orig/drivers/input/keyboard/Kconfig
-+++ linux-2.6.21-moko/drivers/input/keyboard/Kconfig
-@@ -229,4 +229,16 @@
+--- linux-2.6.orig/drivers/input/keyboard/Kconfig
++++ linux-2.6/drivers/input/keyboard/Kconfig
+@@ -293,4 +293,16 @@
To compile this driver as a module, choose M here: the
- module will be called gpio-keys.
+ module will be called bf54x-keys.
+config KEYBOARD_GTA01
+ tristate "FIC Neo1973 (GTA01) buttons"
@@ -21,11 +21,11 @@
+
+
endif
-Index: linux-2.6.21-moko/drivers/input/keyboard/Makefile
+Index: linux-2.6/drivers/input/keyboard/Makefile
===================================================================
---- linux-2.6.21-moko.orig/drivers/input/keyboard/Makefile
-+++ linux-2.6.21-moko/drivers/input/keyboard/Makefile
-@@ -13,6 +13,7 @@
+--- linux-2.6.orig/drivers/input/keyboard/Makefile
++++ linux-2.6/drivers/input/keyboard/Makefile
+@@ -14,6 +14,7 @@
obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o
obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o
obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o
@@ -33,11 +33,11 @@
obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o
obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o
-Index: linux-2.6.21-moko/drivers/input/keyboard/gta01kbd.c
+Index: linux-2.6/drivers/input/keyboard/gta01kbd.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/input/keyboard/gta01kbd.c
-@@ -0,0 +1,249 @@
++++ linux-2.6/drivers/input/keyboard/gta01kbd.c
+@@ -0,0 +1,250 @@
+/*
+ * Keyboard driver for FIC GTA01 (Neo1973) GSM phone
+ *
@@ -202,8 +202,9 @@
+ input_register_device(gta01kbd->input);
+
+ if (request_irq(irq_aux, gta01kbd_aux_irq,
-+ SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
-+ "Neo1973 AUX button", gta01kbd)) {
++ IRQF_DISABLED | IRQF_TRIGGER_RISING |
++ IRQF_TRIGGER_FALLING, "Neo1973 AUX button",
++ gta01kbd)) {
+ dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_aux);
+ goto out_aux;
+ }
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch
2007-12-05 16:04:09 UTC (rev 3574)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-pcf50606.patch
2007-12-05 16:05:48 UTC (rev 3575)
@@ -1,9 +1,9 @@
This is the PCF50606 power management unit driver for FIC GTA01
-Index: linux-2.6.22/drivers/i2c/chips/pcf50606.c
+Index: linux-2.6/drivers/i2c/chips/pcf50606.c
===================================================================
--- /dev/null
-+++ linux-2.6.22/drivers/i2c/chips/pcf50606.c
++++ linux-2.6/drivers/i2c/chips/pcf50606.c
@@ -0,0 +1,1929 @@
+/* Philips PCF50606 Power Management Unit (PMU) driver
+ *
@@ -1643,7 +1643,7 @@
+ reg_write(data, PCF50606_REG_INT2M, 0x00);
+ reg_write(data, PCF50606_REG_INT3M, PCF50606_INT3_TSCPRES);
+
-+ err = request_irq(irq, pcf50606_irq, SA_INTERRUPT,
++ err = request_irq(irq, pcf50606_irq, IRQF_DISABLED,
+ "pcf50606", data);
+ if (err < 0)
+ goto exit_input;
@@ -1934,10 +1934,10 @@
+
+module_init(pcf50606_init);
+module_exit(pcf50606_exit);
-Index: linux-2.6.22/drivers/i2c/chips/pcf50606.h
+Index: linux-2.6/drivers/i2c/chips/pcf50606.h
===================================================================
--- /dev/null
-+++ linux-2.6.22/drivers/i2c/chips/pcf50606.h
++++ linux-2.6/drivers/i2c/chips/pcf50606.h
@@ -0,0 +1,302 @@
+#ifndef _PCF50606_H
+#define _PCF50606_H
@@ -2241,10 +2241,10 @@
+
+#endif /* _PCF50606_H */
+
-Index: linux-2.6.22/drivers/i2c/chips/Kconfig
+Index: linux-2.6/drivers/i2c/chips/Kconfig
===================================================================
---- linux-2.6.22.orig/drivers/i2c/chips/Kconfig
-+++ linux-2.6.22/drivers/i2c/chips/Kconfig
+--- linux-2.6.orig/drivers/i2c/chips/Kconfig
++++ linux-2.6/drivers/i2c/chips/Kconfig
@@ -51,6 +51,17 @@
This driver can also be built as a module. If so, the module
will be called eeprom.
@@ -2263,10 +2263,10 @@
config SENSORS_PCF8574
tristate "Philips PCF8574 and PCF8574A"
depends on EXPERIMENTAL
-Index: linux-2.6.22/drivers/i2c/chips/Makefile
+Index: linux-2.6/drivers/i2c/chips/Makefile
===================================================================
---- linux-2.6.22.orig/drivers/i2c/chips/Makefile
-+++ linux-2.6.22/drivers/i2c/chips/Makefile
+--- linux-2.6.orig/drivers/i2c/chips/Makefile
++++ linux-2.6/drivers/i2c/chips/Makefile
@@ -9,6 +9,7 @@
obj-$(CONFIG_SENSORS_MAX6875) += max6875.o
obj-$(CONFIG_SENSORS_M41T00) += m41t00.o
@@ -2275,11 +2275,11 @@
obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
-Index: linux-2.6.22/include/linux/i2c-id.h
+Index: linux-2.6/include/linux/i2c-id.h
===================================================================
---- linux-2.6.22.orig/include/linux/i2c-id.h
-+++ linux-2.6.22/include/linux/i2c-id.h
-@@ -161,6 +161,7 @@
+--- linux-2.6.orig/include/linux/i2c-id.h
++++ linux-2.6/include/linux/i2c-id.h
+@@ -163,6 +163,7 @@
#define I2C_DRIVERID_FSCHER 1046
#define I2C_DRIVERID_W83L785TS 1047
#define I2C_DRIVERID_OV7670 1048 /* Omnivision 7670 camera */
@@ -2287,10 +2287,10 @@
/*
* ---- Adapter types ----------------------------------------------------
-Index: linux-2.6.22/include/linux/pcf50606.h
+Index: linux-2.6/include/linux/pcf50606.h
===================================================================
--- /dev/null
-+++ linux-2.6.22/include/linux/pcf50606.h
++++ linux-2.6/include/linux/pcf50606.h
@@ -0,0 +1,104 @@
+#ifndef _LINUX_PCF50606_H
+#define _LINUX_PCF50606_H
Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-05 16:04:09 UTC (rev 3574)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-05 16:05:48 UTC (rev 3575)
@@ -625,8 +625,8 @@
+ s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
+
+ set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
-+ request_irq(GTA02_IRQ_MODEM, gta02_modem_irq,
-+ IRQF_TRIGGER_RISING, "modem", NULL);
++ request_irq(GTA02_IRQ_MODEM, gta02_modem_irq, IRQF_DISABLED, "modem",
++ NULL);
+ enable_irq_wake(GTA02_IRQ_MODEM);
+}
+
Modified: branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch 2007-12-05
16:04:09 UTC (rev 3574)
+++ branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch 2007-12-05
16:05:48 UTC (rev 3575)
@@ -1,7 +1,7 @@
-Index: linux-2.6.22/drivers/i2c/chips/Kconfig
+Index: linux-2.6/drivers/i2c/chips/Kconfig
===================================================================
---- linux-2.6.22.orig/drivers/i2c/chips/Kconfig
-+++ linux-2.6.22/drivers/i2c/chips/Kconfig
+--- linux-2.6.orig/drivers/i2c/chips/Kconfig
++++ linux-2.6/drivers/i2c/chips/Kconfig
@@ -61,6 +61,15 @@
This driver can also be built as a module. If so, the module
will be called pcf50606.
@@ -18,10 +18,10 @@
config SENSORS_PCF8574
tristate "Philips PCF8574 and PCF8574A"
-Index: linux-2.6.22/drivers/i2c/chips/Makefile
+Index: linux-2.6/drivers/i2c/chips/Makefile
===================================================================
---- linux-2.6.22.orig/drivers/i2c/chips/Makefile
-+++ linux-2.6.22/drivers/i2c/chips/Makefile
+--- linux-2.6.orig/drivers/i2c/chips/Makefile
++++ linux-2.6/drivers/i2c/chips/Makefile
@@ -10,6 +10,7 @@
obj-$(CONFIG_SENSORS_M41T00) += m41t00.o
obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o
@@ -30,10 +30,10 @@
obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
-Index: linux-2.6.22/drivers/i2c/chips/pcf50633.c
+Index: linux-2.6/drivers/i2c/chips/pcf50633.c
===================================================================
--- /dev/null
-+++ linux-2.6.22/drivers/i2c/chips/pcf50633.c
++++ linux-2.6/drivers/i2c/chips/pcf50633.c
@@ -0,0 +1,1736 @@
+/* Philips PCF50633 Power Management Unit (PMU) driver
+ *
@@ -1478,7 +1478,7 @@
+ reg_write(data, PCF50633_REG_INT4M, 0x00);
+ reg_write(data, PCF50633_REG_INT5M, 0x00);
+
-+ err = request_irq(irq, pcf50633_irq, SA_INTERRUPT,
++ err = request_irq(irq, pcf50633_irq, IRQF_DISABLED,
+ "pcf50633", data);
+ if (err < 0)
+ goto exit_input;
@@ -1771,10 +1771,10 @@
+
+module_init(pcf50633_init);
+module_exit(pcf50633_exit);
-Index: linux-2.6.22/include/linux/pcf50633.h
+Index: linux-2.6/include/linux/pcf50633.h
===================================================================
--- /dev/null
-+++ linux-2.6.22/include/linux/pcf50633.h
++++ linux-2.6/include/linux/pcf50633.h
@@ -0,0 +1,113 @@
+#ifndef _LINUX_PCF50633_H
+#define _LINUX_PCF50633_H
@@ -1889,11 +1889,11 @@
+};
+
+#endif /* _PCF50633_H */
-Index: linux-2.6.22/include/linux/i2c-id.h
+Index: linux-2.6/include/linux/i2c-id.h
===================================================================
---- linux-2.6.22.orig/include/linux/i2c-id.h
-+++ linux-2.6.22/include/linux/i2c-id.h
-@@ -163,6 +163,7 @@
+--- linux-2.6.orig/include/linux/i2c-id.h
++++ linux-2.6/include/linux/i2c-id.h
+@@ -165,6 +165,7 @@
#define I2C_DRIVERID_OV7670 1048 /* Omnivision 7670 camera */
#define I2C_DRIVERID_PCF50606 1049
#define I2C_DRIVERID_TSL256X 1050
@@ -1901,10 +1901,10 @@
/*
* ---- Adapter types ----------------------------------------------------
-Index: linux-2.6.22/drivers/i2c/chips/pcf50633.h
+Index: linux-2.6/drivers/i2c/chips/pcf50633.h
===================================================================
--- /dev/null
-+++ linux-2.6.22/drivers/i2c/chips/pcf50633.h
++++ linux-2.6/drivers/i2c/chips/pcf50633.h
@@ -0,0 +1,402 @@
+#ifndef _PCF50633_H
+#define _PCF50633_H
Modified:
branches/src/target/kernel/2.6.24.x/patches/s3c2410-qt2410-buttons.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c2410-qt2410-buttons.patch
2007-12-05 16:04:09 UTC (rev 3574)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c2410-qt2410-buttons.patch
2007-12-05 16:05:48 UTC (rev 3575)
@@ -1,8 +1,8 @@
-Index: linux-2.6.21-moko/arch/arm/mach-s3c2410/mach-qt2410.c
+Index: linux-2.6/arch/arm/mach-s3c2410/mach-qt2410.c
===================================================================
---- linux-2.6.21-moko.orig/arch/arm/mach-s3c2410/mach-qt2410.c
-+++ linux-2.6.21-moko/arch/arm/mach-s3c2410/mach-qt2410.c
-@@ -408,6 +408,24 @@
+--- linux-2.6.orig/arch/arm/mach-s3c2410/mach-qt2410.c
++++ linux-2.6/arch/arm/mach-s3c2410/mach-qt2410.c
+@@ -331,6 +331,24 @@
.ocr_avail = MMC_VDD_32_33,
};
@@ -27,11 +27,11 @@
static void __init qt2410_map_io(void)
{
s3c24xx_init_io(qt2410_iodesc, ARRAY_SIZE(qt2410_iodesc));
-Index: linux-2.6.21-moko/drivers/input/keyboard/Kconfig
+Index: linux-2.6/drivers/input/keyboard/Kconfig
===================================================================
---- linux-2.6.21-moko.orig/drivers/input/keyboard/Kconfig
-+++ linux-2.6.21-moko/drivers/input/keyboard/Kconfig
-@@ -240,5 +240,10 @@
+--- linux-2.6.orig/drivers/input/keyboard/Kconfig
++++ linux-2.6/drivers/input/keyboard/Kconfig
+@@ -304,5 +304,10 @@
To compile this driver as a module, choose M here: the
module will be called gta01kbd.
@@ -42,11 +42,11 @@
+
endif
-Index: linux-2.6.21-moko/drivers/input/keyboard/Makefile
+Index: linux-2.6/drivers/input/keyboard/Makefile
===================================================================
---- linux-2.6.21-moko.orig/drivers/input/keyboard/Makefile
-+++ linux-2.6.21-moko/drivers/input/keyboard/Makefile
-@@ -14,6 +14,7 @@
+--- linux-2.6.orig/drivers/input/keyboard/Makefile
++++ linux-2.6/drivers/input/keyboard/Makefile
+@@ -15,6 +15,7 @@
obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o
obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o
obj-$(CONFIG_KEYBOARD_GTA01) += gta01kbd.o
@@ -54,13 +54,13 @@
obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o
obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o
-Index: linux-2.6.21-moko/drivers/input/keyboard/qt2410kbd.c
+Index: linux-2.6/drivers/input/keyboard/qt2410kbd.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/input/keyboard/qt2410kbd.c
++++ linux-2.6/drivers/input/keyboard/qt2410kbd.c
@@ -0,0 +1,218 @@
+/*
-+ * Keyboard driver for Armzone QT2410
++ * Keyboard driver for Armzone QT2410
+ *
+ * (C) 2006 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -200,8 +200,8 @@
+
+ s3c2410_gpio_cfgpin(S3C2410_GPF0, S3C2410_GPF0_EINT0);
+ if (request_irq(irq_911, gta01kbd_interrupt,
-+ SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
-+ "qt2410kbd_eint0", gta01kbd))
++ IRQF_DISABLED | IRQF_TRIGGER_RISING |
++ IRQF_TRIGGER_FALLING, "qt2410kbd_eint0", gta01kbd))
+ printk(KERN_WARNING "gta01kbd: Can't get IRQ\n");
+ enable_irq_wake(irq_911);
+
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
