Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
51dab14e 683aa401

+7 -3
+4
drivers/media/video/ir-kbd-i2c.c
··· 400 400 */ 401 401 402 402 static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1}; 403 + static const int probe_cx2341x[] = { 0x18, 0x7a, -1}; 403 404 static const int probe_saa7134[] = { 0x7a, 0x47, -1 }; 404 405 static const int probe_em28XX[] = { 0x30, 0x47, -1 }; 405 406 const int *probe = NULL; ··· 411 410 switch (adap->id) { 412 411 case I2C_HW_B_BT848: 413 412 probe = probe_bttv; 413 + break; 414 + case I2C_HW_B_CX2341X: 415 + probe = probe_cx2341x; 414 416 break; 415 417 case I2C_HW_SAA7134: 416 418 probe = probe_saa7134;
+3 -3
drivers/media/video/tveeprom.c
··· 757 757 static int 758 758 tveeprom_attach_adapter (struct i2c_adapter *adapter) 759 759 { 760 - if (adapter->id != I2C_HW_B_BT848) 761 - return 0; 762 - return i2c_probe(adapter, &addr_data, tveeprom_detect_client); 760 + if (adapter->class & I2C_CLASS_TV_ANALOG) 761 + return i2c_probe(adapter, &addr_data, tveeprom_detect_client); 762 + return 0; 763 763 } 764 764 765 765 static int