diff options
| author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2011-05-20 15:28:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 16:31:28 -0300 |
| commit | da4b7b2011ecbdc0377b0c0263e85c2d474e3d5a (patch) | |
| tree | c5d45721393d57588d01a8098a636c647bde7ff2 /drivers/media/video/saa7134 | |
| parent | 2154be651b90ab0e6b5e9b9cf127a75429f9e90c (diff) | |
| download | kernel_goldelico_gta04-da4b7b2011ecbdc0377b0c0263e85c2d474e3d5a.zip kernel_goldelico_gta04-da4b7b2011ecbdc0377b0c0263e85c2d474e3d5a.tar.gz kernel_goldelico_gta04-da4b7b2011ecbdc0377b0c0263e85c2d474e3d5a.tar.bz2 | |
[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')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index a41c72c..71b442c 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c @@ -7313,6 +7313,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) break; case SAA7134_BOARD_HAUPPAUGE_HVR1150: case SAA7134_BOARD_HAUPPAUGE_HVR1120: + dev->has_remote = SAA7134_REMOTE_GPIO; /* GPIO 26 high for digital, low for analog */ saa7134_set_gpio(dev, 26, 0); msleep(1); diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index be1c2a2..ff6c0e9 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) mask_keycode = 0x0ff00; mask_keyup = 0x040000; break; + case SAA7134_BOARD_HAUPPAUGE_HVR1150: + case SAA7134_BOARD_HAUPPAUGE_HVR1120: + ir_codes = RC_MAP_HAUPPAUGE; + mask_keydown = 0x0040000; /* Enable GPIO18 line on both edges */ + mask_keyup = 0x0040000; + mask_keycode = 0xffff; + raw_decode = true; + break; } if (NULL == ir_codes) { printk("%s: Oops: IR config error [card=%d]\n", |