diff options
| author | Andy Walls <awalls@md.metrocast.net> | 2011-01-16 15:45:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-19 11:46:12 -0200 |
| commit | c69a4af6f06916936c8afd44a175e2bf1fbefaec (patch) | |
| tree | bf0e7cf1c981c8162bb60926579d23f5f397fc45 /drivers | |
| parent | 1f1bfaa0a2e97fbeaf6cc5a07212de0afa3a6232 (diff) | |
| download | kernel_samsung_smdk4412-c69a4af6f06916936c8afd44a175e2bf1fbefaec.zip kernel_samsung_smdk4412-c69a4af6f06916936c8afd44a175e2bf1fbefaec.tar.gz kernel_samsung_smdk4412-c69a4af6f06916936c8afd44a175e2bf1fbefaec.tar.bz2 | |
[media] ir-kbd-i2c: Add back defaults setting for Zilog Z8's at addr 0x71
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index b173e40..d2b20ad 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c @@ -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 */ |