diff options
author | Hermann Pitton <hermann-pitton@arcor.de> | 2008-04-22 13:42:12 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:44 -0400 |
commit | 7b5b3f1765c9773ec9b10c3e5299ac001211a80d (patch) | |
tree | 488b9de08efb2fc046d7bf9f6b69792c7494779d /drivers/media/video/saa7134 | |
parent | 1b1cee35defe792da9aab2757c28338731c46e84 (diff) |
V4L/DVB (7229): saa7134: add support for the Creatix CTX953_V.1.4.3 Hybrid
Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de>
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 31 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 3 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 16cd319dc4e..a827af4546d 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -4010,6 +4010,30 @@ struct saa7134_board saa7134_boards[] = { | |||
4010 | .amux = LINE1, | 4010 | .amux = LINE1, |
4011 | } }, | 4011 | } }, |
4012 | }, | 4012 | }, |
4013 | [SAA7134_BOARD_CREATIX_CTX953] = { | ||
4014 | .name = "Medion/Creatix CTX953 Hybrid", | ||
4015 | .audio_clock = 0x00187de7, | ||
4016 | .tuner_type = TUNER_PHILIPS_TDA8290, | ||
4017 | .radio_type = UNSET, | ||
4018 | .tuner_addr = ADDR_UNSET, | ||
4019 | .radio_addr = ADDR_UNSET, | ||
4020 | .tuner_config = 0, | ||
4021 | .mpeg = SAA7134_MPEG_DVB, | ||
4022 | .inputs = {{ | ||
4023 | .name = name_tv, | ||
4024 | .vmux = 1, | ||
4025 | .amux = TV, | ||
4026 | .tv = 1, | ||
4027 | }, { | ||
4028 | .name = name_comp1, | ||
4029 | .vmux = 0, | ||
4030 | .amux = LINE1, | ||
4031 | }, { | ||
4032 | .name = name_svideo, | ||
4033 | .vmux = 8, | ||
4034 | .amux = LINE1, | ||
4035 | } }, | ||
4036 | }, | ||
4013 | }; | 4037 | }; |
4014 | 4038 | ||
4015 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 4039 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -4960,6 +4984,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
4960 | .subvendor = 0x1822, /*Twinhan Technology Co. Ltd*/ | 4984 | .subvendor = 0x1822, /*Twinhan Technology Co. Ltd*/ |
4961 | .subdevice = 0x0022, | 4985 | .subdevice = 0x0022, |
4962 | .driver_data = SAA7134_BOARD_TWINHAN_DTV_DVB_3056, | 4986 | .driver_data = SAA7134_BOARD_TWINHAN_DTV_DVB_3056, |
4987 | }, { | ||
4988 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
4989 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
4990 | .subvendor = 0x16be, | ||
4991 | .subdevice = 0x0010, /* Medion version CTX953_V.1.4.3 */ | ||
4992 | .driver_data = SAA7134_BOARD_CREATIX_CTX953, | ||
4963 | },{ | 4993 | },{ |
4964 | /* --- boards without eeprom + subsystem ID --- */ | 4994 | /* --- boards without eeprom + subsystem ID --- */ |
4965 | .vendor = PCI_VENDOR_ID_PHILIPS, | 4995 | .vendor = PCI_VENDOR_ID_PHILIPS, |
@@ -5359,6 +5389,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
5359 | case SAA7134_BOARD_MEDION_MD8800_QUADRO: | 5389 | case SAA7134_BOARD_MEDION_MD8800_QUADRO: |
5360 | case SAA7134_BOARD_AVERMEDIA_SUPER_007: | 5390 | case SAA7134_BOARD_AVERMEDIA_SUPER_007: |
5361 | case SAA7134_BOARD_TWINHAN_DTV_DVB_3056: | 5391 | case SAA7134_BOARD_TWINHAN_DTV_DVB_3056: |
5392 | case SAA7134_BOARD_CREATIX_CTX953: | ||
5362 | /* this is a hybrid board, initialize to analog mode | 5393 | /* this is a hybrid board, initialize to analog mode |
5363 | * and configure firmware eeprom address | 5394 | * and configure firmware eeprom address |
5364 | */ | 5395 | */ |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 180d3193c97..683a67561a6 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -1136,6 +1136,9 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1136 | wprintk("%s: No lnbp21 found!\n", __FUNCTION__); | 1136 | wprintk("%s: No lnbp21 found!\n", __FUNCTION__); |
1137 | } | 1137 | } |
1138 | break; | 1138 | break; |
1139 | case SAA7134_BOARD_CREATIX_CTX953: | ||
1140 | configure_tda827x_fe(dev, &md8800_dvbt_config); | ||
1141 | break; | ||
1139 | default: | 1142 | default: |
1140 | wprintk("Huh? unknown DVB card?\n"); | 1143 | wprintk("Huh? unknown DVB card?\n"); |
1141 | break; | 1144 | break; |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 2b7661f58a7..e483209b685 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -255,6 +255,7 @@ struct saa7134_format { | |||
255 | #define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131 | 255 | #define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131 |
256 | #define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132 | 256 | #define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132 |
257 | #define SAA7134_BOARD_PHILIPS_SNAKE 133 | 257 | #define SAA7134_BOARD_PHILIPS_SNAKE 133 |
258 | #define SAA7134_BOARD_CREATIX_CTX953 134 | ||
258 | 259 | ||
259 | #define SAA7134_MAXBOARDS 8 | 260 | #define SAA7134_MAXBOARDS 8 |
260 | #define SAA7134_INPUT_MAX 8 | 261 | #define SAA7134_INPUT_MAX 8 |