diff options
author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2011-05-20 14:28:24 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 15:31:28 -0400 |
commit | da4b7b2011ecbdc0377b0c0263e85c2d474e3d5a (patch) | |
tree | c5d45721393d57588d01a8098a636c647bde7ff2 /drivers/media/video/saa7134/saa7134-input.c | |
parent | 2154be651b90ab0e6b5e9b9cf127a75429f9e90c (diff) |
[media] saa7134: enable IR support for Hauppauge HVR-1150/1120
Enable the IR support for the Hauppauge HVR-1150 and HVR-1120.
Thanks to Fernando Laudares Camargos for testing the patch.
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Cc: Fernando Laudares Camargos <fernando.laudares.camargos@gmail.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-input.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index be1c2a2de27c..ff6c0e97563e 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c | |||
@@ -756,6 +756,14 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
756 | mask_keycode = 0x0ff00; | 756 | mask_keycode = 0x0ff00; |
757 | mask_keyup = 0x040000; | 757 | mask_keyup = 0x040000; |
758 | break; | 758 | break; |
759 | case SAA7134_BOARD_HAUPPAUGE_HVR1150: | ||
760 | case SAA7134_BOARD_HAUPPAUGE_HVR1120: | ||
761 | ir_codes = RC_MAP_HAUPPAUGE; | ||
762 | mask_keydown = 0x0040000; /* Enable GPIO18 line on both edges */ | ||
763 | mask_keyup = 0x0040000; | ||
764 | mask_keycode = 0xffff; | ||
765 | raw_decode = true; | ||
766 | break; | ||
759 | } | 767 | } |
760 | if (NULL == ir_codes) { | 768 | if (NULL == ir_codes) { |
761 | printk("%s: Oops: IR config error [card=%d]\n", | 769 | printk("%s: Oops: IR config error [card=%d]\n", |