V4L/DVB (5015): Add support for more Encore TV cards

Signed-off-by: Juan Pablo Sormani <sorman@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

4 files changed, 169 insertions, 3 deletions

diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index 4a54a559d81..8b290204ff6 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -1660,3 +1660,81 @@ IR_KEYTAB_TYPE ir_codes_asus_pc39[IR_KEYTAB_SIZE] = {
 };
 
 EXPORT_SYMBOL_GPL(ir_codes_asus_pc39);
+
+
+/* Encore ENLTV-FM  - black plastic, white front cover with white glowing buttons
+    Juan Pablo Sormani <sorman@gmail.com> */
+IR_KEYTAB_TYPE ir_codes_encore_enltv[IR_KEYTAB_SIZE] = {
+
+        /* Power button does nothing, neither in Windows app,
+         although it sends data (used for BIOS wakeup?) */
+        [ 0x0d ] = KEY_MUTE,
+
+        [ 0x1e ] = KEY_TV,
+        [ 0x00 ] = KEY_VIDEO,
+        [ 0x01 ] = KEY_AUDIO,           /* music */
+        [ 0x02 ] = KEY_MHP,             /* picture */
+
+        [ 0x1f ] = KEY_1,
+        [ 0x03 ] = KEY_2,
+        [ 0x04 ] = KEY_3,
+        [ 0x05 ] = KEY_4,
+        [ 0x1c ] = KEY_5,
+        [ 0x06 ] = KEY_6,
+        [ 0x07 ] = KEY_7,
+        [ 0x08 ] = KEY_8,
+        [ 0x1d ] = KEY_9,
+        [ 0x0a ] = KEY_0,
+
+        [ 0x09 ] = KEY_LIST,        /* -/-- */
+        [ 0x0b ] = KEY_LAST,        /* recall */
+
+        [ 0x14 ] = KEY_HOME,            /* win start menu */
+        [ 0x15 ] = KEY_EXIT,            /* exit */
+        [ 0x16 ] = KEY_UP,
+        [ 0x12 ] = KEY_DOWN,
+        [ 0x0c ] = KEY_RIGHT,
+        [ 0x17 ] = KEY_LEFT,
+
+        [ 0x18 ] = KEY_ENTER,           /* OK */
+
+        [ 0x0e ] = KEY_ESC,
+        [ 0x13 ] = KEY_D,               /* desktop */
+        [ 0x11 ] = KEY_TAB,
+        [ 0x19 ] = KEY_SWITCHVIDEOMODE, /* switch */
+
+        [ 0x1a ] = KEY_MENU,
+        [ 0x1b ] = KEY_ZOOM,            /* fullscreen */
+        [ 0x44 ] = KEY_TIME,            /* time shift */
+        [ 0x40 ] = KEY_MODE,            /* source */
+
+        [ 0x5a ] = KEY_RECORD,
+        [ 0x42 ] = KEY_PLAY,            /* play/pause */
+        [ 0x45 ] = KEY_STOP,
+        [ 0x43 ] = KEY_CAMERA,          /* camera icon */
+
+        [ 0x48 ] = KEY_REWIND,
+        [ 0x4a ] = KEY_FASTFORWARD,
+        [ 0x49 ] = KEY_PREVIOUS,
+        [ 0x4b ] = KEY_NEXT,
+
+        [ 0x4c ] = KEY_FAVORITES,       /* tv wall */
+        [ 0x4d ] = KEY_SOUND,           /* DVD sound */
+        [ 0x4e ] = KEY_LANGUAGE,        /* DVD lang */
+        [ 0x4f ] = KEY_TEXT,            /* DVD text */
+
+        [ 0x50 ] = KEY_SLEEP,           /* shutdown */
+        [ 0x51 ] = KEY_MODE,            /* stereo > main */
+        [ 0x52 ] = KEY_SELECT,          /* stereo > sap */
+        [ 0x53 ] = KEY_PROG1,           /* teletext */
+
+
+        [ 0x59 ] = KEY_RED,             /* AP1 */
+        [ 0x41 ] = KEY_GREEN,           /* AP2 */
+        [ 0x47 ] = KEY_YELLOW,          /* AP3 */
+        [ 0x57 ] = KEY_BLUE,            /* AP4 */
+
+
+};
+
+EXPORT_SYMBOL_GPL(ir_codes_encore_enltv);
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 9d26ab48edd..0403ae9e5b8 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3189,8 +3189,10 @@ struct saa7134_board saa7134_boards[] = {
                 }},
         },
         [SAA7134_BOARD_ENCORE_ENLTV] = {
-                /* Steven Walter <stevenrwalter@gmail.com> */
+        /* Steven Walter <stevenrwalter@gmail.com>
+           Juan Pablo Sormani <sorman@gmail.com> */
                 .name           = "Encore ENLTV",
+                .audio_clock    = 0x00200000,
                 .tuner_type     = TUNER_TNF_5335MF,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -3198,13 +3200,71 @@ struct saa7134_board saa7134_boards[] = {
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
+                        .amux = 3,
+                        .tv   = 1,
+                },{
+                        .name = name_tv_mono,
+                        .vmux = 7,
+                        .amux = 4,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = 2,
+                },{
+                        .name = name_svideo,
+                        .vmux = 0,
+                        .amux = 2,
+                }},
+                .radio = {
+                        .name = name_radio,
                         .amux = LINE2,
+/*                      .gpio = 0x00300001,*/
+                        .gpio = 0x20000,
+
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = 0,
+                },
+        },
+        [SAA7134_BOARD_ENCORE_ENLTV_FM] = {
+  /*    Juan Pablo Sormani <sorman@gmail.com> */
+                .name           = "Encore ENLTV-FM",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_PHILIPS_ATSC,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = 3,
                         .tv   = 1,
                 },{
+                        .name = name_tv_mono,
+                        .vmux = 7,
+                        .amux = 4,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = 2,
+                },{
                         .name = name_svideo,
-                        .vmux = 6,
-                        .amux = LINE1,
+                        .vmux = 0,
+                        .amux = 2,
                 }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = LINE2,
+                        .gpio = 0x20000,
+
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = 0,
+                },
         },
 };
 
@@ -3851,6 +3911,24 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0x2342,
                 .driver_data  = SAA7134_BOARD_ENCORE_ENLTV,
         },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = 0x1131,
+                .subdevice    = 0x2341,
+                .driver_data  = SAA7134_BOARD_ENCORE_ENLTV,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = 0x3016,
+                .subdevice    = 0x2344,
+                .driver_data  = SAA7134_BOARD_ENCORE_ENLTV,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = 0x1131,
+                .subdevice    = 0x230f,
+                .driver_data  = SAA7134_BOARD_ENCORE_ENLTV_FM,
+        },{
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3959,6 +4037,8 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_FLYDVBTDUO:
         case SAA7134_BOARD_PROTEUS_2309:
         case SAA7134_BOARD_AVERMEDIA_A16AR:
+        case SAA7134_BOARD_ENCORE_ENLTV:
+        case SAA7134_BOARD_ENCORE_ENLTV_FM:
                 dev->has_remote = SAA7134_REMOTE_GPIO;
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 08848ebc682..1d0dd7e1252 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -325,6 +325,13 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keydown = 0x0040000;
                 rc5_gpio = 1;
                 break;
+        case SAA7134_BOARD_ENCORE_ENLTV:
+        case SAA7134_BOARD_ENCORE_ENLTV_FM:
+                ir_codes     = ir_codes_encore_enltv;
+                mask_keycode = 0x00007f;
+                mask_keyup   = 0x040000;
+                polling      = 50; // ms
+                break;
         }
         if (NULL == ir_codes) {
                 printk("%s: Oops: IR config error [card=%d]\n",
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 6e65fa6f2b3..ec08412b1c6 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -233,6 +233,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_HAUPPAUGE_HVR1110    104
 #define SAA7134_BOARD_CINERGY_HT_PCMCIA    105
 #define SAA7134_BOARD_ENCORE_ENLTV         106
+#define SAA7134_BOARD_ENCORE_ENLTV_FM      107
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8