]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
[media] ir-kbd-i2c: Add back defaults setting for Zilog Z8's at addr 0x71
authorAndy Walls <awalls@md.metrocast.net>
Sun, 16 Jan 2011 18:45:32 +0000 (15:45 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 19 Jan 2011 13:46:12 +0000 (11:46 -0200)
This reverts a portion of commit

44243fc2ef99948bc9b046901880885616dd5e89

A commit for which I errantly recommended that defaults for I2C address
0x71 not be set by ir-kbd-i2c.c

The pvrusb2 and bttv drivers currently rely on ir-kbd-i2c setting
defaults for that address.  Until I can get those bridge drivers fixed
to properly send IR_i2c_init_data for boards with Zilog Z8 chips,
just add back the default settings for I2C address 0x71.

Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/ir-kbd-i2c.c

index b173e409cd288c4f2cd3c1e4b7668ca386844101..d2b20ad383a3e9e31a35032895143ab2ec59a4ee 100644 (file)
@@ -323,6 +323,12 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                rc_type     = RC_TYPE_OTHER;
                ir_codes    = RC_MAP_AVERMEDIA_CARDBUS;
                break;
+       case 0x71:
+               name        = "Hauppauge/Zilog Z8";
+               ir->get_key = get_key_haup_xvr;
+               rc_type     = RC_TYPE_RC5;
+               ir_codes    = hauppauge ? RC_MAP_HAUPPAUGE_NEW : RC_MAP_RC5_TV;
+               break;
        }
 
        /* Let the caller override settings */