From fa5a3d8f99b11f145d65da4cedf5f7b425665834 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@m1k.net>
Date: Tue, 8 Nov 2005 21:37:27 -0800
Subject: [PATCH] --- yaml --- r: 13353 b: refs/heads/master c:
 76bc3a3933de50559fdd4081f26867f1d25cd5a6 h: refs/heads/master i:   13351:
 8d5e3e336ed399c496d621ec9c7cf9d4117dbc38 v: v3

---
 [refs]                                        |  2 +-
 .../video4linux/CARDLIST.saa7134              |  1 +
 .../media/video/saa7134/saa7134-cards.c       | 24 +++++++++++++++++++
 trunk/drivers/media/video/saa7134/saa7134.h   |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4b47d62dbbac..964c218201e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67081a46116e6d9a47f4621ccd63b2fdcd1f45f1
+refs/heads/master: 76bc3a3933de50559fdd4081f26867f1d25cd5a6
diff --git a/trunk/Documentation/video4linux/CARDLIST.saa7134 b/trunk/Documentation/video4linux/CARDLIST.saa7134
index 57439d081570..3bcfd88920df 100644
--- a/trunk/Documentation/video4linux/CARDLIST.saa7134
+++ b/trunk/Documentation/video4linux/CARDLIST.saa7134
@@ -73,3 +73,4 @@
  72 -> RTD Embedded Technologies VFG7350        [1435:7350]
  73 -> RTD Embedded Technologies VFG7330        [1435:7330]
  74 -> LifeView FlyTV Platinum Mini2            [14c0:1212]
+ 75 -> AVerMedia AVerTVHD MCE A180              [1461:1044]
diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c
index 3a4c59e7ca07..e6e50c0a80ce 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-cards.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c
@@ -2350,6 +2350,24 @@ struct saa7134_board saa7134_boards[] = {
 			.amux = LINE2,
 		}},
 	},
+	[SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180] = {
+		/* FIXME: uses Alps Electric TDHU2, containing ATI NXT2004 ATSC Decoder */
+		.name           = "AVerMedia AVerTVHD MCE A180",
+		.audio_clock    = 0x00187de7,
+		.tuner_type     = TUNER_ABSENT,
+		.radio_type     = UNSET,
+		.tuner_addr     = ADDR_UNSET,
+		.radio_addr     = ADDR_UNSET,
+		.inputs         = {{
+			.name = name_comp1,
+			.vmux = 3,
+			.amux = LINE2,
+		},{
+			.name = name_svideo,
+			.vmux = 8,
+			.amux = LINE2,
+		}},
+	},
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2755,6 +2773,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
  		.subvendor    = 0x1435,
  		.subdevice    = 0x7330,
  		.driver_data  = SAA7134_BOARD_RTD_VFG7330,
+ 	},{
+ 		.vendor       = PCI_VENDOR_ID_PHILIPS,
+ 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+ 		.subvendor    = 0x1461,
+ 		.subdevice    = 0x1044,
+ 		.driver_data  = SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180,
  	},{
 		/* --- boards without eeprom + subsystem ID --- */
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
diff --git a/trunk/drivers/media/video/saa7134/saa7134.h b/trunk/drivers/media/video/saa7134/saa7134.h
index 93038c32a039..473c5dbb9b5f 100644
--- a/trunk/drivers/media/video/saa7134/saa7134.h
+++ b/trunk/drivers/media/video/saa7134/saa7134.h
@@ -201,6 +201,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_RTD_VFG7350 72
 #define SAA7134_BOARD_RTD_VFG7330 73
 #define SAA7134_BOARD_FLYTVPLATINUM_MINI2 74
+#define SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 75
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8