From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 25 Mar 2006 11:10:12 +0000 (-0300)
Subject: V4L/DVB (3605): Add support for I2C_HW_B_CX2341X board adapter
X-Git-Tag: v2.6.17-rc1~12^2~48
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51dab14e66a876ca124ef115fda08121ad9533fc;p=linux-2.6

V4L/DVB (3605): Add support for I2C_HW_B_CX2341X board adapter

- Add missing class check to tveeprom_attach_adapter.
- Add CX2341X specific IR probe address list.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 95bacf4354..fe76379cce 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -400,6 +400,7 @@ static int ir_probe(struct i2c_adapter *adap)
 	*/
 
 	static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
+	static const int probe_cx2341x[] = { 0x18, 0x7a, -1};
 	static const int probe_saa7134[] = { 0x7a, 0x47, -1 };
 	static const int probe_em28XX[] = { 0x30, 0x47, -1 };
 	const int *probe = NULL;
@@ -411,6 +412,9 @@ static int ir_probe(struct i2c_adapter *adap)
 	case I2C_HW_B_BT848:
 		probe = probe_bttv;
 		break;
+	case I2C_HW_B_CX2341X:
+		probe = probe_cx2341x;
+		break;
 	case I2C_HW_SAA7134:
 		probe = probe_saa7134;
 		break;
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index e0d2ff83fc..431c3e2f6c 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -757,9 +757,9 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
 static int
 tveeprom_attach_adapter (struct i2c_adapter *adapter)
 {
-	if (adapter->id != I2C_HW_B_BT848)
-		return 0;
-	return i2c_probe(adapter, &addr_data, tveeprom_detect_client);
+	if (adapter->class & I2C_CLASS_TV_ANALOG)
+		return i2c_probe(adapter, &addr_data, tveeprom_detect_client);
+	return 0;
 }
 
 static int