? linux/drivers/media/dvb/frontends/nxt200x.c
? linux/drivers/media/dvb/frontends/nxt200x.h
Index: build-2.6/Makefile
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/build-2.6/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- build-2.6/Makefile	10 Sep 2005 12:43:48 -0000	1.74
+++ build-2.6/Makefile	22 Oct 2005 01:38:43 -0000
@@ -127,7 +127,7 @@
 obj-m += tda1004x.o
 obj-m += sp887x.o
 obj-m += nxt6000.o
-obj-m += nxt2002.o
+obj-m += nxt200x.o
 obj-m += cx22702.o
 obj-m += tda80xx.o
 obj-m += dvb_dummy_fe.o
Index: linux/Documentation/dvb/get_dvb_firmware
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/Documentation/dvb/get_dvb_firmware,v
retrieving revision 1.13
diff -u -r1.13 get_dvb_firmware
--- linux/Documentation/dvb/get_dvb_firmware	26 May 2005 19:41:29 -0000	1.13
+++ linux/Documentation/dvb/get_dvb_firmware	21 Oct 2005 04:21:38 -0000
@@ -22,7 +22,7 @@
 use IO::Handle;
 
 @components = ( "sp8870", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t",
-		"dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002",
+		"dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004",
 		"or51211", "or51132_qam", "or51132_vsb");
 
 # Check args
@@ -252,6 +252,23 @@
     $outfile;
 }
 
+sub nxt2004 {
+    my $sourcefile = "AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip";
+    my $url = "http://www.aver.com/support/Drivers/$sourcefile";
+    my $hash = "111cb885b1e009188346d72acfed024c";
+    my $outfile = "dvb-fe-nxt2004.fw";
+    my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
+
+    checkstandard();
+    
+    wgetfile($sourcefile, $url);
+    unzip($sourcefile, $tmpdir);
+    verify("$tmpdir/3xHybrid.sys", $hash);
+    extract("$tmpdir/3xHybrid.sys", 465304, 9584, $outfile);
+
+    $outfile;
+}
+
 sub or51211 {
     my $fwfile = "dvb-fe-or51211.fw";
     my $url = "http://linuxtv.org/downloads/firmware/$fwfile";
Index: linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c,v
retrieving revision 1.12
diff -u -r1.12 flexcop-fe-tuner.c
--- linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c	15 Oct 2005 17:48:57 -0000	1.12
+++ linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c	23 Oct 2005 21:18:51 -0000
@@ -9,7 +9,7 @@
 
 #include "stv0299.h"
 #include "mt352.h"
-#include "nxt2002.h"
+#include "nxt200x.h"
 #include "bcm3510.h"
 #include "stv0297_cs2.h"
 #include "mt312.h"
@@ -343,9 +343,10 @@
 	.clock_polarity_flip = 1,
 };
 
-static struct nxt2002_config samsung_tbmv_config = {
+static struct nxt200x_config samsung_tbmv_config = {
 	.demod_address    = 0x0a,
-	.request_firmware = flexcop_fe_request_firmware,
+	.pll_address      = 0xc2,
+	.pll_desc        = &dvb_pll_tbmv30111in,
 };
 
 static struct bcm3510_config air2pc_atsc_first_gen_config = {
@@ -450,7 +451,7 @@
 		info("found the mt352 at i2c address: 0x%02x",samsung_tdtc9251dh0_config.demod_address);
 	} else
 	/* try the air atsc 2nd generation (nxt2002) */
-	if ((fc->fe = nxt2002_attach(&samsung_tbmv_config, &fc->i2c_adap)) != NULL) {
+	if ((fc->fe = nxt200x_attach(&samsung_tbmv_config, &fc->i2c_adap)) != NULL) {
 		fc->dev_type          = FC_AIR_ATSC2;
 		info("found the nxt2002 at i2c address: 0x%02x",samsung_tbmv_config.demod_address);
 	} else
Index: linux/drivers/media/dvb/frontends/Kconfig
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/frontends/Kconfig,v
retrieving revision 1.43
diff -u -r1.43 Kconfig
--- linux/drivers/media/dvb/frontends/Kconfig	8 Aug 2005 00:41:43 -0000	1.43
+++ linux/drivers/media/dvb/frontends/Kconfig	21 Oct 2005 21:19:59 -0000
@@ -157,12 +157,12 @@
 comment "ATSC (North American/Korean Terresterial DTV) frontends"
 	depends on DVB_CORE
 
-config DVB_NXT2002
-	tristate "Nxt2002 based"
-	depends on DVB_CORE
-	select FW_LOADER
-	help
-	  An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
+config DVB_NXT200X
+        tristate "Nxt200x based"
+        depends on DVB_CORE
+        select FW_LOADER
+        help
+          An ATSC 8VSB/QAM tuner module. Say Y when you want to support this frontend.
 
 config DVB_OR51211
 	tristate "or51211 based (pcHDTV HD2000 card)"
Index: linux/drivers/media/dvb/frontends/Makefile
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/frontends/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- linux/drivers/media/dvb/frontends/Makefile	25 Jul 2005 06:40:20 -0000	1.29
+++ linux/drivers/media/dvb/frontends/Makefile	21 Oct 2005 21:20:32 -0000
@@ -25,7 +25,7 @@
 obj-$(CONFIG_DVB_TDA80XX) += tda80xx.o
 obj-$(CONFIG_DVB_TDA10021) += tda10021.o
 obj-$(CONFIG_DVB_STV0297) += stv0297.o
-obj-$(CONFIG_DVB_NXT2002) += nxt2002.o
+obj-$(CONFIG_DVB_NXT200x) += nxt200x.o
 obj-$(CONFIG_DVB_OR51211) += or51211.o
 obj-$(CONFIG_DVB_OR51132) += or51132.o
 obj-$(CONFIG_DVB_BCM3510) += bcm3510.o
Index: linux/drivers/media/dvb/frontends/dvb-pll.c
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.c,v
retrieving revision 1.12
diff -u -r1.12 dvb-pll.c
--- linux/drivers/media/dvb/frontends/dvb-pll.c	24 Oct 2005 05:02:35 -0000	1.12
+++ linux/drivers/media/dvb/frontends/dvb-pll.c	25 Oct 2005 23:22:56 -0000
@@ -314,7 +314,7 @@
  */
 struct dvb_pll_desc dvb_pll_tuv1236d = {
 	.name  = "Philips TUV1236D",
-	.min   =  57000000,
+	.min   =  54000000,
 	.max   = 864000000,
 	.count = 3,
 	.entries = {