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

laforge at sita.openmoko.org laforge at sita.openmoko.org
Wed Dec 5 17:05:56 CET 2007


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 <laforge at openmoko.org>
@@ -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);
 +





More information about the commitlog mailing list