2005-01-25 10:25:21

by Gerd Knorr

Subject: [patch] add i2c adapter id for the cx88 driver.

Hi,

$subject says all. Please apply,

Gerd

Index: linux-2.6.11-rc2/include/linux/i2c-id.h
===================================================================
--- linux-2.6.11-rc2.orig/include/linux/i2c-id.h 2005-01-24 09:11:12.000000000 +0100
+++ linux-2.6.11-rc2/include/linux/i2c-id.h 2005-01-24 15:09:14.000000000 +0100
@@ -239,6 +239,7 @@
#define I2C_HW_B_IXP4XX 0x17 /* GPIO on IXP4XX systems */
#define I2C_HW_B_S3VIA 0x18 /* S3Via ProSavage adapter */
#define I2C_HW_B_ZR36067 0x19 /* Zoran-36057/36067 based boards */
+#define I2C_HW_B_CX2388x 0x1a /* connexant 2388x based tv cards */

/* --- PCF 8584 based algorithms */
#define I2C_HW_P_LP 0x00 /* Parallel port interface */
Index: linux-2.6.11-rc2/drivers/media/video/cx88/cx88-i2c.c
===================================================================
--- linux-2.6.11-rc2.orig/drivers/media/video/cx88/cx88-i2c.c 2005-01-24 14:54:35.000000000 +0100
+++ linux-2.6.11-rc2/drivers/media/video/cx88/cx88-i2c.c 2005-01-24 15:09:41.000000000 +0100
@@ -135,7 +135,7 @@ static struct i2c_algo_bit_data cx8800_i
static struct i2c_adapter cx8800_i2c_adap_template = {
I2C_DEVNAME("cx2388x"),
.owner = THIS_MODULE,
- .id = I2C_HW_B_BT848,
+ .id = I2C_HW_B_CX2388x,
.client_register = attach_inform,
.client_unregister = detach_inform,
};

2005-01-25 10:43:54

by Jean Delvare

Subject: Re: [patch] add i2c adapter id for the cx88 driver.

Hallo Gerd,

> +#define I2C_HW_B_CX2388x 0x1a /* connexant 2388x based tv cards */

0x1a is reserved for TI PCILynx in the i2c project, although I never took
the time to forward the update to the kernel trees. Could you please use
0x1b instead?

Other than that I am fine with the patch ;)

Thanks,
--
Jean Delvare

2005-01-25 11:09:49

by Gerd Knorr

Subject: Re: [patch] add i2c adapter id for the cx88 driver.

> 0x1a is reserved for TI PCILynx in the i2c project, although I never took
> the time to forward the update to the kernel trees. Could you please use
> 0x1b instead?

Ok, here is a new version of the patch, using 0x1b.

Gerd

Index: linux-2005-01-23/include/linux/i2c-id.h
===================================================================
--- linux-2005-01-23.orig/include/linux/i2c-id.h 2005-01-24 16:27:38.000000000 +0100
+++ linux-2005-01-23/include/linux/i2c-id.h 2005-01-25 11:57:45.000000000 +0100
@@ -239,6 +239,7 @@
#define I2C_HW_B_IXP4XX 0x17 /* GPIO on IXP4XX systems */
#define I2C_HW_B_S3VIA 0x18 /* S3Via ProSavage adapter */
#define I2C_HW_B_ZR36067 0x19 /* Zoran-36057/36067 based boards */
+#define I2C_HW_B_CX2388x 0x1b /* connexant 2388x based tv cards */

/* --- PCF 8584 based algorithms */
#define I2C_HW_P_LP 0x00 /* Parallel port interface */
Index: linux-2005-01-23/drivers/media/video/cx88/cx88-i2c.c
===================================================================
--- linux-2005-01-23.orig/drivers/media/video/cx88/cx88-i2c.c 2005-01-24 16:28:43.000000000 +0100
+++ linux-2005-01-23/drivers/media/video/cx88/cx88-i2c.c 2005-01-25 11:57:21.000000000 +0100
@@ -134,7 +134,7 @@ static struct i2c_algo_bit_data cx8800_i
static struct i2c_adapter cx8800_i2c_adap_template = {
I2C_DEVNAME("cx2388x"),
.owner = THIS_MODULE,
- .id = I2C_HW_B_BT848,
+ .id = I2C_HW_B_CX2388x,
.client_register = attach_inform,
.client_unregister = detach_inform,
};