r2401 - branches/src/target/kernel/2.6.22.x/patches

shoragan at sita.openmoko.org shoragan at sita.openmoko.org
Thu Jul 26 20:45:56 CEST 2007


Author: shoragan
Date: 2007-07-26 20:45:55 +0200 (Thu, 26 Jul 2007)
New Revision: 2401

Modified:
   branches/src/target/kernel/2.6.22.x/patches/pcf50633.patch
Log:
Update to 2.6.22.1


Modified: branches/src/target/kernel/2.6.22.x/patches/pcf50633.patch
===================================================================
--- branches/src/target/kernel/2.6.22.x/patches/pcf50633.patch	2007-07-26 18:33:49 UTC (rev 2400)
+++ branches/src/target/kernel/2.6.22.x/patches/pcf50633.patch	2007-07-26 18:45:55 UTC (rev 2401)
@@ -1,8 +1,8 @@
-Index: linux-2.6.21.3-moko/drivers/i2c/chips/Kconfig
+Index: linux-2.6.22.1/drivers/i2c/chips/Kconfig
 ===================================================================
---- linux-2.6.21.3-moko.orig/drivers/i2c/chips/Kconfig
-+++ linux-2.6.21.3-moko/drivers/i2c/chips/Kconfig
-@@ -46,6 +46,15 @@
+--- linux-2.6.22.1.orig/drivers/i2c/chips/Kconfig
++++ linux-2.6.22.1/drivers/i2c/chips/Kconfig
+@@ -45,6 +45,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.21.3-moko/drivers/i2c/chips/Makefile
+Index: linux-2.6.22.1/drivers/i2c/chips/Makefile
 ===================================================================
---- linux-2.6.21.3-moko.orig/drivers/i2c/chips/Makefile
-+++ linux-2.6.21.3-moko/drivers/i2c/chips/Makefile
+--- linux-2.6.22.1.orig/drivers/i2c/chips/Makefile
++++ linux-2.6.22.1/drivers/i2c/chips/Makefile
 @@ -9,6 +9,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.21.3-moko/drivers/i2c/chips/pcf50633.c
+Index: linux-2.6.22.1/drivers/i2c/chips/pcf50633.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21.3-moko/drivers/i2c/chips/pcf50633.c
++++ linux-2.6.22.1/drivers/i2c/chips/pcf50633.c
 @@ -0,0 +1,1691 @@
 +/* Philips PCF50633 Power Management Unit (PMU) driver
 + *
@@ -576,13 +576,13 @@
 +	if (int1 & PCF50633_INT1_ALARM) {
 +		DEBUGPC("ALARM ");
 +		if (pcf->pdata->used_features & PCF50633_FEAT_RTC)
-+			rtc_update_irq(&pcf->rtc->class_dev, 1,
++			rtc_update_irq(pcf->rtc, 1,
 +				       RTC_AF | RTC_IRQF);
 +	}
 +	if (int1 & PCF50633_INT1_SECOND) {
 +		DEBUGPC("SECOND ");
 +		if (pcf->flags & PCF50633_F_RTC_SECOND)
-+			rtc_update_irq(&pcf->rtc->class_dev, 1,
++			rtc_update_irq(pcf->rtc, 1,
 +				       RTC_PF | RTC_IRQF);
 +
 +		if (pcf->onkey_seconds >= 0 &&
@@ -1726,10 +1726,10 @@
 +
 +module_init(pcf50633_init);
 +module_exit(pcf50633_exit);
-Index: linux-2.6.21.3-moko/include/linux/pcf50633.h
+Index: linux-2.6.22.1/include/linux/pcf50633.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21.3-moko/include/linux/pcf50633.h
++++ linux-2.6.22.1/include/linux/pcf50633.h
 @@ -0,0 +1,103 @@
 +#ifndef _LINUX_PCF50633_H
 +#define _LINUX_PCF50633_H
@@ -1834,11 +1834,11 @@
 +};
 +
 +#endif /* _PCF50633_H */
-Index: linux-2.6.21.3-moko/include/linux/i2c-id.h
+Index: linux-2.6.22.1/include/linux/i2c-id.h
 ===================================================================
---- linux-2.6.21.3-moko.orig/include/linux/i2c-id.h
-+++ linux-2.6.21.3-moko/include/linux/i2c-id.h
-@@ -161,6 +161,7 @@
+--- linux-2.6.22.1.orig/include/linux/i2c-id.h
++++ linux-2.6.22.1/include/linux/i2c-id.h
+@@ -162,6 +162,7 @@
  #define I2C_DRIVERID_OV7670 1048	/* Omnivision 7670 camera */
  #define I2C_DRIVERID_PCF50606 1049
  #define I2C_DRIVERID_TSL256X 1050
@@ -1846,10 +1846,10 @@
  
  /*
   * ---- Adapter types ----------------------------------------------------
-Index: linux-2.6.21.3-moko/drivers/i2c/chips/pcf50633.h
+Index: linux-2.6.22.1/drivers/i2c/chips/pcf50633.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21.3-moko/drivers/i2c/chips/pcf50633.h
++++ linux-2.6.22.1/drivers/i2c/chips/pcf50633.h
 @@ -0,0 +1,402 @@
 +#ifndef _PCF50633_H
 +#define _PCF50633_H





More information about the commitlog mailing list