Commit f5d887ae authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab

V4L/DVB (12368): ir-kbd-i2c: Add support for Z8F0811/Hauppage IR transceivers

This patch adds support for Zilog Z8F0811 IR transceiver chips on
CX2341[68] based boards to ir-kbd-i2c for both the old i2c binding model
and the new i2c binding model.
Signed-off-by: default avatarAndy Walls <awalls@radix.net>
Reviewed-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8ca95568
...@@ -357,9 +357,11 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -357,9 +357,11 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
case 0x47: case 0x47:
case 0x71: case 0x71:
case 0x2d: case 0x2d:
if (adap->id == I2C_HW_B_CX2388x) { if (adap->id == I2C_HW_B_CX2388x ||
adap->id == I2C_HW_B_CX2341X) {
/* Handled by cx88-input */ /* Handled by cx88-input */
name = "CX2388x remote"; name = adap->id == I2C_HW_B_CX2341X ? "CX2341x remote"
: "CX2388x remote";
ir_type = IR_TYPE_RC5; ir_type = IR_TYPE_RC5;
ir->get_key = get_key_haup_xvr; ir->get_key = get_key_haup_xvr;
if (hauppauge == 1) { if (hauppauge == 1) {
...@@ -483,7 +485,8 @@ static int ir_remove(struct i2c_client *client) ...@@ -483,7 +485,8 @@ static int ir_remove(struct i2c_client *client)
static const struct i2c_device_id ir_kbd_id[] = { static const struct i2c_device_id ir_kbd_id[] = {
/* Generic entry for any IR receiver */ /* Generic entry for any IR receiver */
{ "ir_video", 0 }, { "ir_video", 0 },
/* IR device specific entries could be added here */ /* IR device specific entries should be added here */
{ "ir_rx_z8f0811_haup", 0 },
{ } { }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment