diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /drivers/media/video/saa7134/saa7134-input.c | |
| parent | feae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-input.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index 919632b10aae..76e6501d238d 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c | |||
| @@ -323,6 +323,15 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
| 323 | saa_setb(SAA7134_GPIO_GPMODE1, 0x1); | 323 | saa_setb(SAA7134_GPIO_GPMODE1, 0x1); |
| 324 | saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); | 324 | saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); |
| 325 | break; | 325 | break; |
| 326 | case SAA7134_BOARD_AVERMEDIA_A16D: | ||
| 327 | ir_codes = ir_codes_avermedia_a16d; | ||
| 328 | mask_keycode = 0x02F200; | ||
| 329 | mask_keydown = 0x000400; | ||
| 330 | polling = 50; /* ms */ | ||
| 331 | /* Without this we won't receive key up events */ | ||
| 332 | saa_setb(SAA7134_GPIO_GPMODE1, 0x1); | ||
| 333 | saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); | ||
| 334 | break; | ||
| 326 | case SAA7134_BOARD_KWORLD_TERMINATOR: | 335 | case SAA7134_BOARD_KWORLD_TERMINATOR: |
| 327 | ir_codes = ir_codes_pixelview; | 336 | ir_codes = ir_codes_pixelview; |
| 328 | mask_keycode = 0x00001f; | 337 | mask_keycode = 0x00001f; |