lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
- 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>
This commit is contained in:
Hans Verkuil
2006-03-25 08:10:12 -03:00
committed by Mauro Carvalho Chehab
parent 683aa4012f
commit 51dab14e66
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/ir-kbd-i2c.c
View File

@@ -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_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_saa7134[] = { 0x7a, 0x47, -1 };
static const int probe_em28XX[] = { 0x30, 0x47, -1 }; static const int probe_em28XX[] = { 0x30, 0x47, -1 };
const int *probe = NULL; const int *probe = NULL;
@@ -411,6 +412,9 @@ static int ir_probe(struct i2c_adapter *adap)
case I2C_HW_B_BT848: case I2C_HW_B_BT848:
probe = probe_bttv; probe = probe_bttv;
break; break;
case I2C_HW_B_CX2341X:
probe = probe_cx2341x;
break;
case I2C_HW_SAA7134: case I2C_HW_SAA7134:
probe = probe_saa7134; probe = probe_saa7134;
break; break;

6
drivers/media/video/tveeprom.c
View File

@@ -757,9 +757,9 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
static int static int
tveeprom_attach_adapter (struct i2c_adapter *adapter) tveeprom_attach_adapter (struct i2c_adapter *adapter)
{ {
if (adapter->id != I2C_HW_B_BT848) if (adapter->class & I2C_CLASS_TV_ANALOG)
return 0; return i2c_probe(adapter, &addr_data, tveeprom_detect_client);
return i2c_probe(adapter, &addr_data, tveeprom_detect_client); return 0;
} }
static int static int