V4L/DVB (4898): Saa7134: add support for remote control of Hauppauge HVR1110

This patch adds support for the remote control bundled with the
Hauppauge HVR1110

Signed-off-by: Thomas Genty <tomlohave@gmail.com>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index d0ddc65d7eb1..4dead84aff46 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3135,17 +3135,23 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
-                .gpiomask       = 0x000200000,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
                         .amux = TV,
                         .tv   = 1,
+                },{
+                        .name   = name_comp1,
+                        .vmux   = 3,
+                        .amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */
                 }},
                 .radio = {
                         .name = name_radio,
                         .amux   = TV,
-                        .gpio   = 0x0200000,
                 },
         },
         [SAA7134_BOARD_CINERGY_HT_PCMCIA] = {
@@ -3976,6 +3982,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_PINNACLE_PCTV_110i:
         case SAA7134_BOARD_PINNACLE_PCTV_310i:
         case SAA7134_BOARD_UPMOST_PURPLE_TV:
+        case SAA7134_BOARD_HAUPPAUGE_HVR1110:
                 dev->has_remote = SAA7134_REMOTE_I2C;
                 break;
         case SAA7134_BOARD_AVERMEDIA_A169_B: