aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c31
-rw-r--r--drivers/media/video/saa7134/saa7134-dvb.c1
-rw-r--r--drivers/media/video/saa7134/saa7134.h1
3 files changed, 33 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 7de7f1f0adda..bdb613851362 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -5280,6 +5280,30 @@ struct saa7134_board saa7134_boards[] = {
5280 .amux = TV, 5280 .amux = TV,
5281 }, 5281 },
5282 }, 5282 },
5283 [SAA7134_BOARD_ASUS_EUROPA_HYBRID] = {
5284 .name = "Asus Europa Hybrid OEM",
5285 .audio_clock = 0x00187de7,
5286 .tuner_type = TUNER_PHILIPS_TD1316,
5287 .radio_type = UNSET,
5288 .tuner_addr = 0x61,
5289 .radio_addr = ADDR_UNSET,
5290 .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
5291 .mpeg = SAA7134_MPEG_DVB,
5292 .inputs = { {
5293 .name = name_tv,
5294 .vmux = 3,
5295 .amux = TV,
5296 .tv = 1,
5297 }, {
5298 .name = name_comp1,
5299 .vmux = 4,
5300 .amux = LINE2,
5301 }, {
5302 .name = name_svideo,
5303 .vmux = 8,
5304 .amux = LINE2,
5305 } },
5306 },
5283 5307
5284}; 5308};
5285 5309
@@ -6419,6 +6443,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
6419 .subdevice = 0x2004, 6443 .subdevice = 0x2004,
6420 .driver_data = SAA7134_BOARD_ZOLID_HYBRID_PCI, 6444 .driver_data = SAA7134_BOARD_ZOLID_HYBRID_PCI,
6421 }, { 6445 }, {
6446 .vendor = PCI_VENDOR_ID_PHILIPS,
6447 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
6448 .subvendor = 0x1043,
6449 .subdevice = 0x4847,
6450 .driver_data = SAA7134_BOARD_ASUS_EUROPA_HYBRID,
6451 }, {
6422 /* --- boards without eeprom + subsystem ID --- */ 6452 /* --- boards without eeprom + subsystem ID --- */
6423 .vendor = PCI_VENDOR_ID_PHILIPS, 6453 .vendor = PCI_VENDOR_ID_PHILIPS,
6424 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 6454 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -7080,6 +7110,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
7080 /* break intentionally omitted */ 7110 /* break intentionally omitted */
7081 case SAA7134_BOARD_VIDEOMATE_DVBT_300: 7111 case SAA7134_BOARD_VIDEOMATE_DVBT_300:
7082 case SAA7134_BOARD_ASUS_EUROPA2_HYBRID: 7112 case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
7113 case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
7083 { 7114 {
7084 7115
7085 /* The Philips EUROPA based hybrid boards have the tuner 7116 /* The Philips EUROPA based hybrid boards have the tuner
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 96d3668f4691..cd31284faf7c 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1131,6 +1131,7 @@ static int dvb_init(struct saa7134_dev *dev)
1131 break; 1131 break;
1132 case SAA7134_BOARD_PHILIPS_EUROPA: 1132 case SAA7134_BOARD_PHILIPS_EUROPA:
1133 case SAA7134_BOARD_VIDEOMATE_DVBT_300: 1133 case SAA7134_BOARD_VIDEOMATE_DVBT_300:
1134 case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
1134 fe0->dvb.frontend = dvb_attach(tda10046_attach, 1135 fe0->dvb.frontend = dvb_attach(tda10046_attach,
1135 &philips_europa_config, 1136 &philips_europa_config,
1136 &dev->i2c_adap); 1137 &dev->i2c_adap);
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index f8697d46ff5f..94e1a3be3317 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -297,6 +297,7 @@ struct saa7134_format {
297#define SAA7134_BOARD_BEHOLD_X7 171 297#define SAA7134_BOARD_BEHOLD_X7 171
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 301
301#define SAA7134_MAXBOARDS 32 302#define SAA7134_MAXBOARDS 32
302#define SAA7134_INPUT_MAX 8 303#define SAA7134_INPUT_MAX 8