115 lines
4.2 KiB
Diff
115 lines
4.2 KiB
Diff
From e3c6e1aaa5db7822524f5b1355960fd732910068 Mon Sep 17 00:00:00 2001
|
|
From: Danny Wood <danwood76@gmail.com>
|
|
Date: Sun, 20 Sep 2009 12:14:21 -0300
|
|
Subject: [PATCH] V4L/DVB (13168): Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847)
|
|
|
|
Adds the device IDs and driver linking to allow the Asus Europa DVB-T
|
|
card to operate with these drivers.
|
|
The device has a SAA7134 chipset with a TD1316 Hybrid Tuner.
|
|
All inputs work on the card including switching between DVB-T and
|
|
Analogue TV, there is also no IR with this card.
|
|
|
|
[mchehab@redhat.com: CodingStyle fixes]
|
|
|
|
Signed-off-by: Danny Wood <danwood76@gmail.com>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
---
|
|
Documentation/video4linux/CARDLIST.saa7134 | 1 +
|
|
drivers/media/video/saa7134/saa7134-cards.c | 31 +++++++++++++++++++++++++++
|
|
drivers/media/video/saa7134/saa7134-dvb.c | 1 +
|
|
drivers/media/video/saa7134/saa7134.h | 1 +
|
|
4 files changed, 34 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
|
|
index 2620d60..94e255a 100644
|
|
--- a/Documentation/video4linux/CARDLIST.saa7134
|
|
+++ b/Documentation/video4linux/CARDLIST.saa7134
|
|
@@ -172,3 +172,4 @@
|
|
171 -> Beholder BeholdTV X7 [5ace:7595]
|
|
172 -> RoverMedia TV Link Pro FM [19d1:0138]
|
|
173 -> Zolid Hybrid TV Tuner PCI [1131:2004]
|
|
+174 -> Asus Europa Hybrid OEM [1043:4847]
|
|
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
|
|
index 7de7f1f..bdb6138 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[] = {
|
|
.amux = TV,
|
|
},
|
|
},
|
|
+ [SAA7134_BOARD_ASUS_EUROPA_HYBRID] = {
|
|
+ .name = "Asus Europa Hybrid OEM",
|
|
+ .audio_clock = 0x00187de7,
|
|
+ .tuner_type = TUNER_PHILIPS_TD1316,
|
|
+ .radio_type = UNSET,
|
|
+ .tuner_addr = 0x61,
|
|
+ .radio_addr = ADDR_UNSET,
|
|
+ .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
|
|
+ .mpeg = SAA7134_MPEG_DVB,
|
|
+ .inputs = { {
|
|
+ .name = name_tv,
|
|
+ .vmux = 3,
|
|
+ .amux = TV,
|
|
+ .tv = 1,
|
|
+ }, {
|
|
+ .name = name_comp1,
|
|
+ .vmux = 4,
|
|
+ .amux = LINE2,
|
|
+ }, {
|
|
+ .name = name_svideo,
|
|
+ .vmux = 8,
|
|
+ .amux = LINE2,
|
|
+ } },
|
|
+ },
|
|
|
|
};
|
|
|
|
@@ -6419,6 +6443,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
|
|
.subdevice = 0x2004,
|
|
.driver_data = SAA7134_BOARD_ZOLID_HYBRID_PCI,
|
|
}, {
|
|
+ .vendor = PCI_VENDOR_ID_PHILIPS,
|
|
+ .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
|
|
+ .subvendor = 0x1043,
|
|
+ .subdevice = 0x4847,
|
|
+ .driver_data = SAA7134_BOARD_ASUS_EUROPA_HYBRID,
|
|
+ }, {
|
|
/* --- boards without eeprom + subsystem ID --- */
|
|
.vendor = PCI_VENDOR_ID_PHILIPS,
|
|
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
|
|
@@ -7080,6 +7110,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
|
|
/* break intentionally omitted */
|
|
case SAA7134_BOARD_VIDEOMATE_DVBT_300:
|
|
case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
|
|
+ case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
|
|
{
|
|
|
|
/* 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 96d3668..cd31284 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)
|
|
break;
|
|
case SAA7134_BOARD_PHILIPS_EUROPA:
|
|
case SAA7134_BOARD_VIDEOMATE_DVBT_300:
|
|
+ case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
|
|
fe0->dvb.frontend = dvb_attach(tda10046_attach,
|
|
&philips_europa_config,
|
|
&dev->i2c_adap);
|
|
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
|
|
index f8697d4..94e1a3b 100644
|
|
--- a/drivers/media/video/saa7134/saa7134.h
|
|
+++ b/drivers/media/video/saa7134/saa7134.h
|
|
@@ -297,6 +297,7 @@ struct saa7134_format {
|
|
#define SAA7134_BOARD_BEHOLD_X7 171
|
|
#define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172
|
|
#define SAA7134_BOARD_ZOLID_HYBRID_PCI 173
|
|
+#define SAA7134_BOARD_ASUS_EUROPA_HYBRID 174
|
|
|
|
#define SAA7134_MAXBOARDS 32
|
|
#define SAA7134_INPUT_MAX 8
|
|
--
|
|
1.6.5.7
|
|
|