V4L/DVB (3400): Remove duplicated keymaps and add keymap for KWorld LTV883IR.

- Remove duplicated keymaps and add keymap for KWorld LTV883IR.
Thanks to Jon Ferguson <jon@sd-6.org>.

Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 11 insertions, 4 deletions

diff --git a/drivers/media/video/bttv-input.c b/drivers/media/video/bttv-input.c
index 42760ae867d6..c637677acefd 100644
--- a/drivers/media/video/bttv-input.c
+++ b/drivers/media/video/bttv-input.c
@@ -328,7 +328,7 @@ int bttv_input_init(struct bttv *btv)
                 ir->polling      = 50; // ms
                 break;
         case BTTV_BOARD_CONCEPTRONIC_CTVFMI2:
-                ir_codes         = ir_codes_conceptronic;
+                ir_codes         = ir_codes_pixelview;
                 ir->mask_keycode = 0x001F00;
                 ir->mask_keyup   = 0x006000;
                 ir->polling      = 50; // ms
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index a4fa92c1b0c7..800e2b31ac7b 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -192,6 +192,13 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 ir->mask_keyup = 0x80;
                 ir->polling = 1; /* ms */
                 break;
+        case CX88_BOARD_KWORLD_LTV883:
+                ir_codes = ir_codes_pixelview;
+                ir->gpio_addr = MO_GP1_IO;
+                ir->mask_keycode = 0x1f;
+                ir->mask_keyup = 0x60;
+                ir->polling = 1; /* ms */
+                break;
         case CX88_BOARD_ADSTECH_DVB_T_PCI:
                 ir_codes = ir_codes_adstech_dvb_t_pci;
                 ir->gpio_addr = MO_GP1_IO;
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 342568cf728f..ecfb6e2b3bd3 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -169,7 +169,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 break;
         case SAA7134_BOARD_KWORLD_XPERT:
         case SAA7134_BOARD_AVACSSMARTTV:
-                ir_codes     = ir_codes_avacssmart;
+                ir_codes     = ir_codes_pixelview;
                 mask_keycode = 0x00001F;
                 mask_keyup   = 0x000020;
                 polling      = 50; // ms
@@ -181,7 +181,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_STUDIO_305:
         case SAA7134_BOARD_AVERMEDIA_STUDIO_307:
         case SAA7134_BOARD_AVERMEDIA_GO_007_FM:
-                ir_codes     = ir_codes_md2819;
+                ir_codes     = ir_codes_avermedia;
                 mask_keycode = 0x0007C8;
                 mask_keydown = 0x000010;
                 polling      = 50; // ms
@@ -190,7 +190,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);
                 break;
         case SAA7134_BOARD_KWORLD_TERMINATOR:
-                ir_codes     = ir_codes_avacssmart;
+                ir_codes     = ir_codes_pixelview;
                 mask_keycode = 0x00001f;
                 mask_keyup   = 0x000060;
                 polling      = 50; // ms