aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames R. Webb <jrwebb@qwest.net>2005-11-09 00:37:00 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:13 -0500
commitdc2286cfce214c0de00571f3219a50488c58dd6b (patch)
tree3ffafaa3fac1397b36304ec04cedbccff546dc05
parent7b3c6d659fc392cfd80e57840c10ccd4c6ab62c5 (diff)
[PATCH] v4l: 707: remote for kworld terminator
- Remote for KWorld Terminator. Signed-off-by: James R. Webb <jrwebb@qwest.net> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index c59f4d775521..7278150fb58e 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2848,6 +2848,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
2848 case SAA7134_BOARD_BEHOLD_409FM: 2848 case SAA7134_BOARD_BEHOLD_409FM:
2849 case SAA7134_BOARD_AVACSSMARTTV: 2849 case SAA7134_BOARD_AVACSSMARTTV:
2850 case SAA7134_BOARD_GOTVIEW_7135: 2850 case SAA7134_BOARD_GOTVIEW_7135:
2851 case SAA7134_BOARD_KWORLD_TERMINATOR:
2851 dev->has_remote = 1; 2852 dev->has_remote = 1;
2852 break; 2853 break;
2853 case SAA7134_BOARD_MD5044: 2854 case SAA7134_BOARD_MD5044:
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 8d211ba22316..9dc41c1427a8 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -557,6 +557,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
557 saa_setb(SAA7134_GPIO_GPMODE0, 0x4); 557 saa_setb(SAA7134_GPIO_GPMODE0, 0x4);
558 saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4); 558 saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
559 break; 559 break;
560 case SAA7134_BOARD_KWORLD_TERMINATOR:
561 ir_codes = avacssmart_codes;
562 mask_keycode = 0x00001f;
563 mask_keyup = 0x000060;
564 polling = 50; // ms
565 break;
560 case SAA7134_BOARD_MANLI_MTV001: 566 case SAA7134_BOARD_MANLI_MTV001:
561 case SAA7134_BOARD_MANLI_MTV002: 567 case SAA7134_BOARD_MANLI_MTV002:
562 case SAA7134_BOARD_BEHOLD_409FM: 568 case SAA7134_BOARD_BEHOLD_409FM: