[PATCH] v4l: 870: added dvb support for avermedia avertvhd mce a180

- Added DVB support for AVerMedia AVerTVHD MCE A180

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index e8c89b4828ffbb0036614e05069fd41aa645b358..624e8808a517e4d1561a18132b48037a9096ff35 100644 (file)
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -13,7 +13,7 @@ config VIDEO_SAA7134
          module will be called saa7134.
 
 config VIDEO_SAA7134_DVB
-       tristate "DVB Support for saa7134 based TV cards"
+       tristate "DVB/ATSC Support for saa7134 based TV cards"
        depends on VIDEO_SAA7134 && DVB_CORE
        select VIDEO_BUF_DVB
        ---help---
@@ -32,6 +32,7 @@ config VIDEO_SAA7134_DVB_ALL_FRONTENDS
        depends on VIDEO_SAA7134_DVB
        select DVB_MT352
        select DVB_TDA1004X
+       select DVB_NXT200X
        ---help---
          This builds saa7134-dvb with all currently supported frontend
          demodulators.  If you wish to tweak your configuration, and
@@ -56,3 +57,12 @@ config VIDEO_SAA7134_DVB_TDA1004X
        ---help---
          This adds DVB-T support for cards based on the
          Philips saa7134 chip and the TDA10045H/TDA10046H demodulator.
+
+config VIDEO_SAA7134_DVB_NXT200X
+       tristate "NXT2002/NXT2004 ATSC Support"
+       default m
+       depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
+       select DVB_NXT200X
+       ---help---
+         This adds ATSC 8VSB and QAM64/256 support for cards based on the
+         Philips saa7134 chip and the NXT2002/NXT2004 demodulator.

diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index 1418f9f88d26bca1765d7543b129dcf9d6f0bf8f..937dff8d561c3659cfad017f29f34db86d27a478 100644 (file)
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -18,3 +18,6 @@ endif
 ifneq ($(CONFIG_DVB_TDA1004X),n)
  EXTRA_CFLAGS += -DHAVE_TDA1004X=1
 endif
+ifneq ($(CONFIG_DVB_NXT200X),n)
+ EXTRA_CFLAGS += -DHAVE_NXT200X=1
+endif

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 6650efa44ca7de6e8ddc54aaeb884e7ae1d63d1e..2f2015202450cf5aed91c7255b9f171c60ab50e3 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2358,6 +2358,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
+               .mpeg           = SAA7134_MPEG_DVB,
                .inputs         = {{
                        .name = name_comp1,
                        .vmux = 3,

diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 342891d431a8539df78308c809b160eb953878c1..aaac12e8adbf57dde99a52ce2ef53c96ee5e3a29 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -39,6 +39,10 @@
 #ifdef HAVE_TDA1004X
 # include "tda1004x.h"
 #endif
+#ifdef HAVE_NXT200X
+# include "nxt200x.h"
+# include "dvb-pll.h"
+#endif
 
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
@@ -624,6 +628,14 @@ static struct tda1004x_config tda827x_lifeview_config = {
 };
 #endif
 
+#ifdef HAVE_NXT200X
+static struct nxt200x_config avertvhda180 = {
+       .demod_address    = 0x0a,
+       .pll_address      = 0x61,
+       .pll_desc         = &dvb_pll_tdhu2,
+};
+#endif
+
 /* ------------------------------------------------------------------ */
 
 static int dvb_init(struct saa7134_dev *dev)
@@ -676,6 +688,11 @@ static int dvb_init(struct saa7134_dev *dev)
                dev->dvb.frontend = tda10046_attach(&philips_tu1216_61_config,
                                                    &dev->i2c_adap);
                break;
+#endif
+#ifdef HAVE_NXT200X
+       case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
+               dev->dvb.frontend = nxt200x_attach(&avertvhda180, &dev->i2c_adap);
+               break;
 #endif
        default:
                printk("%s: Huh? unknown DVB card?\n",dev->name);