Commit 028165a3 authored by Hermann Pitton's avatar Hermann Pitton Committed by Mauro Carvalho Chehab

V4L/DVB (9113): saa7134: fixes for the Asus Tiger Revision 1.00

In opposite to the P7131 Dual this early OEM card has a male
radio antenna connector and also no remote.

We currently switch the DVB-T RF feed to the radio input, like
on the P7131 with female radio connector used also for DVB-T
and should improve this.
Signed-off-by: default avatarHermann Pitton <hermann-pitton@arcor.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1e758265
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044]
76 -> SKNet MonsterTV Mobile [1131:4ee9] 76 -> SKNet MonsterTV Mobile [1131:4ee9]
77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e] 77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e]
78 -> ASUSTeK P7131 Dual [1043:4862,1043:4857] 78 -> ASUSTeK P7131 Dual [1043:4862]
79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B) 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)
80 -> ASUS Digimatrix TV [1043:0210] 80 -> ASUS Digimatrix TV [1043:0210]
81 -> Philips Tiger reference design [1131:2018] 81 -> Philips Tiger reference design [1131:2018]
...@@ -150,3 +150,4 @@ ...@@ -150,3 +150,4 @@
149 -> Avermedia PCI pure analog (M135A) [1461:f11d] 149 -> Avermedia PCI pure analog (M135A) [1461:f11d]
150 -> Zogis Real Angel 220 150 -> Zogis Real Angel 220
151 -> ADS Tech Instant HDTV [1421:0380] 151 -> ADS Tech Instant HDTV [1421:0380]
152 -> Asus Tiger Rev:1.00 [1043:4857]
...@@ -4527,7 +4527,7 @@ struct saa7134_board saa7134_boards[] = { ...@@ -4527,7 +4527,7 @@ struct saa7134_board saa7134_boards[] = {
.amux = LINE2, .amux = LINE2,
.tv = 1, .tv = 1,
.gpio = 0x624000, .gpio = 0x624000,
}, { }, {
.name = name_comp1, .name = name_comp1,
.vmux = 1, .vmux = 1,
.amux = LINE1, .amux = LINE1,
...@@ -4564,14 +4564,48 @@ struct saa7134_board saa7134_boards[] = { ...@@ -4564,14 +4564,48 @@ struct saa7134_board saa7134_boards[] = {
.tv = 1, .tv = 1,
}, { }, {
.name = name_comp, .name = name_comp,
.vmux = 4, .vmux = 4,
.amux = LINE1, .amux = LINE1,
}, { }, {
.name = name_svideo, .name = name_svideo,
.vmux = 8, .vmux = 8,
.amux = LINE1, .amux = LINE1,
} }, } },
}, },
[SAA7134_BOARD_ASUSTeK_TIGER] = {
.name = "Asus Tiger Rev:1.00",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_TDA8290,
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 0,
.mpeg = SAA7134_MPEG_DVB,
.gpiomask = 0x0200000,
.inputs = { {
.name = name_tv,
.vmux = 1,
.amux = TV,
.tv = 1,
}, {
.name = name_comp1,
.vmux = 3,
.amux = LINE2,
}, {
.name = name_comp2,
.vmux = 0,
.amux = LINE2,
}, {
.name = name_svideo,
.vmux = 8,
.amux = LINE2,
} },
.radio = {
.name = name_radio,
.amux = TV,
.gpio = 0x0200000,
},
},
}; };
const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
...@@ -5358,8 +5392,8 @@ struct pci_device_id saa7134_pci_tbl[] = { ...@@ -5358,8 +5392,8 @@ struct pci_device_id saa7134_pci_tbl[] = {
.vendor = PCI_VENDOR_ID_PHILIPS, .vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133, .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x1043, .subvendor = 0x1043,
.subdevice = 0x4857, .subdevice = 0x4857, /* REV:1.00 */
.driver_data = SAA7134_BOARD_ASUSTeK_P7131_DUAL, .driver_data = SAA7134_BOARD_ASUSTeK_TIGER,
},{ },{
.vendor = PCI_VENDOR_ID_PHILIPS, .vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134, .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
...@@ -6177,6 +6211,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) ...@@ -6177,6 +6211,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
case SAA7134_BOARD_PINNACLE_PCTV_310i: case SAA7134_BOARD_PINNACLE_PCTV_310i:
case SAA7134_BOARD_KWORLD_DVBT_210: case SAA7134_BOARD_KWORLD_DVBT_210:
case SAA7134_BOARD_TEVION_DVBT_220RF: case SAA7134_BOARD_TEVION_DVBT_220RF:
case SAA7134_BOARD_ASUSTeK_TIGER:
case SAA7134_BOARD_ASUSTeK_P7131_DUAL: case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA: case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
case SAA7134_BOARD_MEDION_MD8800_QUADRO: case SAA7134_BOARD_MEDION_MD8800_QUADRO:
......
...@@ -1335,6 +1335,11 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1335,6 +1335,11 @@ static int dvb_init(struct saa7134_dev *dev)
} }
} }
break; break;
case SAA7134_BOARD_ASUSTeK_TIGER:
if (configure_tda827x_fe(dev, &philips_tiger_config,
&tda827x_cfg_0) < 0)
goto dettach_frontend;
break;
default: default:
wprintk("Huh? unknown DVB card?\n"); wprintk("Huh? unknown DVB card?\n");
break; break;
......
...@@ -274,6 +274,7 @@ struct saa7134_format { ...@@ -274,6 +274,7 @@ struct saa7134_format {
#define SAA7134_BOARD_AVERMEDIA_M135A 149 #define SAA7134_BOARD_AVERMEDIA_M135A 149
#define SAA7134_BOARD_REAL_ANGEL_220 150 #define SAA7134_BOARD_REAL_ANGEL_220 150
#define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI 151 #define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI 151
#define SAA7134_BOARD_ASUSTeK_TIGER 152
#define SAA7134_MAXBOARDS 8 #define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8 #define SAA7134_INPUT_MAX 8
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment