diff options
author | Michael Krufky <mkrufky@kernellabs.com> | 2009-06-05 03:28:28 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:40:52 -0500 |
commit | 184e769f93e734ced24c948ea02e3d541c45c766 (patch) | |
tree | 226dc74d995bb90f2ee7b46263e792d4cc4e73fd | |
parent | bc809ab37e4a8f6eeea0afae76bb1bc6cc52fe98 (diff) |
V4L/DVB (13204): saa7134: add support for the Leadtek DTV1000S
Thanks to Terry Wu for finding the GPIOs required for svideo / composite input
Cc: Terry Wu <terrywu2009@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | Documentation/video4linux/CARDLIST.saa7134 | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 6 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 39 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
4 files changed, 47 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index 94e255a76f79..fce1e7eb0474 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 | |||
@@ -173,3 +173,4 @@ | |||
173 | 172 -> RoverMedia TV Link Pro FM [19d1:0138] | 173 | 172 -> RoverMedia TV Link Pro FM [19d1:0138] |
174 | 173 -> Zolid Hybrid TV Tuner PCI [1131:2004] | 174 | 173 -> Zolid Hybrid TV Tuner PCI [1131:2004] |
175 | 174 -> Asus Europa Hybrid OEM [1043:4847] | 175 | 174 -> Asus Europa Hybrid OEM [1043:4847] |
176 | 175 -> Leadtek Winfast DTV1000S [107d:6655] | ||
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index bdb613851362..9481379edec9 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -6449,6 +6449,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
6449 | .subdevice = 0x4847, | 6449 | .subdevice = 0x4847, |
6450 | .driver_data = SAA7134_BOARD_ASUS_EUROPA_HYBRID, | 6450 | .driver_data = SAA7134_BOARD_ASUS_EUROPA_HYBRID, |
6451 | }, { | 6451 | }, { |
6452 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
6453 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | ||
6454 | .subvendor = 0x107d, | ||
6455 | .subdevice = 0x6655, | ||
6456 | .driver_data = SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S, | ||
6457 | }, { | ||
6452 | /* --- boards without eeprom + subsystem ID --- */ | 6458 | /* --- boards without eeprom + subsystem ID --- */ |
6453 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6459 | .vendor = PCI_VENDOR_ID_PHILIPS, |
6454 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 6460 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index cd31284faf7c..73739d2a63dd 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -1045,6 +1045,32 @@ static struct tda18271_config zolid_tda18271_config = { | |||
1045 | .gate = TDA18271_GATE_ANALOG, | 1045 | .gate = TDA18271_GATE_ANALOG, |
1046 | }; | 1046 | }; |
1047 | 1047 | ||
1048 | static struct tda10048_config dtv1000s_tda10048_config = { | ||
1049 | .demod_address = 0x10 >> 1, | ||
1050 | .output_mode = TDA10048_PARALLEL_OUTPUT, | ||
1051 | .fwbulkwritelen = TDA10048_BULKWRITE_200, | ||
1052 | .inversion = TDA10048_INVERSION_ON, | ||
1053 | .dtv6_if_freq_khz = TDA10048_IF_3300, | ||
1054 | .dtv7_if_freq_khz = TDA10048_IF_3800, | ||
1055 | .dtv8_if_freq_khz = TDA10048_IF_4300, | ||
1056 | .clk_freq_khz = TDA10048_CLK_16000, | ||
1057 | .disable_gate_access = 1, | ||
1058 | }; | ||
1059 | |||
1060 | static struct tda18271_std_map dtv1000s_tda18271_std_map = { | ||
1061 | .dvbt_6 = { .if_freq = 3300, .agc_mode = 3, .std = 4, | ||
1062 | .if_lvl = 1, .rfagc_top = 0x37, }, | ||
1063 | .dvbt_7 = { .if_freq = 3800, .agc_mode = 3, .std = 5, | ||
1064 | .if_lvl = 1, .rfagc_top = 0x37, }, | ||
1065 | .dvbt_8 = { .if_freq = 4300, .agc_mode = 3, .std = 6, | ||
1066 | .if_lvl = 1, .rfagc_top = 0x37, }, | ||
1067 | }; | ||
1068 | |||
1069 | static struct tda18271_config dtv1000s_tda18271_config = { | ||
1070 | .std_map = &dtv1000s_tda18271_std_map, | ||
1071 | .gate = TDA18271_GATE_ANALOG, | ||
1072 | }; | ||
1073 | |||
1048 | /* ================================================================== | 1074 | /* ================================================================== |
1049 | * Core code | 1075 | * Core code |
1050 | */ | 1076 | */ |
@@ -1543,6 +1569,19 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1543 | &zolid_tda18271_config); | 1569 | &zolid_tda18271_config); |
1544 | } | 1570 | } |
1545 | break; | 1571 | break; |
1572 | case SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S: | ||
1573 | fe0->dvb.frontend = dvb_attach(tda10048_attach, | ||
1574 | &dtv1000s_tda10048_config, | ||
1575 | &dev->i2c_adap); | ||
1576 | if (fe0->dvb.frontend != NULL) { | ||
1577 | dvb_attach(tda829x_attach, fe0->dvb.frontend, | ||
1578 | &dev->i2c_adap, 0x4b, | ||
1579 | &tda829x_no_probe); | ||
1580 | dvb_attach(tda18271_attach, fe0->dvb.frontend, | ||
1581 | 0x60, &dev->i2c_adap, | ||
1582 | &dtv1000s_tda18271_config); | ||
1583 | } | ||
1584 | break; | ||
1546 | default: | 1585 | default: |
1547 | wprintk("Huh? unknown DVB card?\n"); | 1586 | wprintk("Huh? unknown DVB card?\n"); |
1548 | break; | 1587 | break; |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 94e1a3be3317..13a861bedc36 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -298,6 +298,7 @@ struct saa7134_format { | |||
298 | #define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172 | 298 | #define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172 |
299 | #define SAA7134_BOARD_ZOLID_HYBRID_PCI 173 | 299 | #define SAA7134_BOARD_ZOLID_HYBRID_PCI 173 |
300 | #define SAA7134_BOARD_ASUS_EUROPA_HYBRID 174 | 300 | #define SAA7134_BOARD_ASUS_EUROPA_HYBRID 174 |
301 | #define SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S 175 | ||
301 | 302 | ||
302 | #define SAA7134_MAXBOARDS 32 | 303 | #define SAA7134_MAXBOARDS 32 |
303 | #define SAA7134_INPUT_MAX 8 | 304 | #define SAA7134_INPUT_MAX 8 |