Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51dab14e authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 683aa401

drivers/media/video/ir-kbd-i2c.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/tveeprom.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	if (adapter->class & I2C_CLASS_TV_ANALOG)

		return i2c_probe(adapter, &addr_data, tveeprom_detect_client);

	return 0;

}



static int