Skip to contentSkip to conversation

2.5.25 I2C driver id and Config updates

PATCH In review Albert Cranford 3 participants 3 messages Jul 11, 2002 I2C

lore
Share & tools
lore

Albert Cranford

author
#0 lore raw

PATCH 1/1 2.5.25 I2C driver id and Config updates

Hello Linus,
Could you please apply these 3 patches toward 2.5.26. They include Config.in updates, additions in i2c-id.h for "Video for Linux" and a compatibility fix for i2c-algo-bit.c

Thanks,
Albert

Signature · 2 lines
Albert Cranford Deerfield Beach FL USA
[email protected]

# i2c-algo-bit.c: Added KERNEL_VERSION check around if (current->need_resched) schedule(); and cond_sched();

drivers/i2c/i2c-algo-bit.c renamed from drivers/i2c/i2c-algo-bit.c.orig +5 -0
@@ -119,7 +119,12 @@
 		if (time_after_eq(jiffies, start+adap->timeout)) {
 			return -ETIMEDOUT;
 		}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 		if (current->need_resched)
+ 			schedule();
+#else
 		cond_resched();
+#endif
 	}
 	DEBSTAT(printk(KERN_DEBUG "needed %ld jiffies\n", jiffies-start));
 #ifdef SLO_IO
drivers/i2c/Config.help renamed from drivers/i2c/Config.help.orig +9 -0
@@ -1,3 +1,4 @@
+I2C support
 CONFIG_I2C
   I2C (pronounce: I-square-C) is a slow serial bus protocol used in
   many micro controller applications and developed by Philips.  SMBus,

@@ -21,6 +22,7 @@
   <file:Documentation/modules.txt>.
   The module will be called i2c-core.o.
 
+I2C bit-banging interfaces
 CONFIG_I2C_ALGOBIT
   This allows you to use a range of I2C adapters called bit-banging
   adapters.  Say Y if you own an I2C adapter belonging to this class

@@ -31,6 +33,7 @@
   <file:Documentation/modules.txt>.
   The module will be called i2c-algo-bit.o.
 
+Philips style parallel port adapter
 CONFIG_I2C_PHILIPSPAR
   This supports parallel-port I2C adapters made by Philips.  Say Y if
   you own such an adapter.

@@ -43,6 +46,7 @@
   Note that if you want support for different parallel port devices,
   life will be much easier if you compile them all as modules.
 
+ELV adapter
 CONFIG_I2C_ELV
   This supports parallel-port I2C adapters called ELV.  Say Y if you
   own such an adapter.

@@ -52,6 +56,7 @@
   <file:Documentation/modules.txt>.
   The module will be called i2c-elv.o.
 
+Velleman K9000 adapter
 CONFIG_I2C_VELLEMAN
   This supports the Velleman K9000 parallel-port I2C adapter.  Say Y
   if you own such an adapter.

@@ -61,6 +66,7 @@
   <file:Documentation/modules.txt>.
   The module will be called i2c-velleman.o.
 
+I2C PCF 8584 interfaces
 CONFIG_I2C_ALGOPCF
   This allows you to use a range of I2C adapters called PCF adapters.
   Say Y if you own an I2C adapter belonging to this class and then say

@@ -71,6 +77,7 @@
   <file:Documentation/modules.txt>.
   The module will be called i2c-algo-pcf.o.
 
+Elektor ISA card
 CONFIG_I2C_ELEKTOR
   This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own
   such an adapter.

@@ -80,6 +87,7 @@
   <file:Documentation/modules.txt>.
   The module will be called i2c-elektor.o.
 
+I2C device interface
 CONFIG_I2C_CHARDEV
   Say Y here to use i2c-* device files, usually found in the /dev
   directory on your system.  They make it possible to have user-space

@@ -91,6 +99,7 @@
   <file:Documentation/modules.txt>.
   The module will be called i2c-dev.o.
 
+I2C /proc interface (required for hardware sensors)
 CONFIG_I2C_PROC
   This provides support for i2c device entries in the /proc filesystem.
   The entries will be found in /proc/sys/dev/sensors.
include/linux/i2c-id.h renamed from include/linux/i2c-id.h.orig +5 -1
@@ -90,7 +90,11 @@
 #define I2C_DRIVERID_DRP3510	43     /* ADR decoder (Astra Radio)	*/
 #define I2C_DRIVERID_SP5055	44     /* Satellite tuner		*/
 #define I2C_DRIVERID_STV0030	45     /* Multipurpose switch		*/
-#define I2C_DRIVERID_SAA7108    46     /* video decoder, image scaler   */
+#define I2C_DRIVERID_SAA7108	46     /* video decoder, image scaler   */
+#define I2C_DRIVERID_DS1307	47     /* DS1307 real time clock	*/
+#define I2C_DRIVERID_ADV717x	48     /* ADV 7175/7176 video encoder	*/
+#define I2C_DRIVERID_ZR36067	49     /* Zoran 36067 video encoder	*/
+#define I2C_DRIVERID_ZR36120	50     /* Zoran 36120 video encoder	*/
#1 lore raw

Hi Albert,

<-- snip -->

--- linux/drivers/i2c/Config.help.orig 2002-07-07 16:41:47.000000000 -0400
+++ linux/drivers/i2c/Config.help 2002-07-07 16:45:21.000000000
-0400
@@ -1,3 +1,4 @@
+I2C support
CONFIG_I2C
I2C (pronounce: I-square-C) is a slow serial bus protocol used in many micro controller applications and developed by Philips. SMBus,
...

<-- snip -->

What is the purpose of this patch? I can't see it making any difference (at least ot in menuconfig).

cu
Adrian

Signature · 3 lines
You only think this is a free country. Like the US the UK spends a lot of
time explaining its a free country because its a police state.
								Alan Cox
#2 lore raw
In reply to Albert Cranford

drivers/i2c/i2c-algo-bit.c line 127

Quoted 12 lines

Could you please apply these 3 patches toward 2.5.26. They include Config.in updates, additions in i2c-id.h for "Video for Linux" and a compatibility fix for i2c-algo-bit.c

drivers/i2c/i2c-algo-bit.c renamed from drivers/i2c/i2c-algo-bit.c.orig +5 -0
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 		if (current->need_resched)
+ 			schedule();
+#else
 		cond_resched();
+#endif

Why are you adding non 2.5 code to 2.5 ?