diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-11-29 19:57:24 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-11-29 19:57:24 -0500 |
| commit | 8e0d44f9e05b60c1c0c050132cc6af9d09e6206e (patch) | |
| tree | ef1d43390d650d4e695f367660345e8680ddc0c3 /linux/drivers/media/video/saa7134/saa7134-cards.c | |
| parent | ba99ed7094dcba2a9d3a5af35e2a38c11a298e98 (diff) | |
| download | mediapointer-dvb-s2-8e0d44f9e05b60c1c0c050132cc6af9d09e6206e.tar.gz mediapointer-dvb-s2-8e0d44f9e05b60c1c0c050132cc6af9d09e6206e.tar.bz2 | |
saa7134: add support for remote control of Hauppauge HVR1110
From: Thomas Genty <tomlohave@gmail.com>
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>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-cards.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index a5c92428b..6292fcd66 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -3175,17 +3175,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] = { @@ -4053,6 +4059,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: |