Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d76a6179 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3413): Kill nxt2002 in favor of the nxt200x module 



- Kill nxt2002 module in favor of nxt200x.
- Repair broken nxt2002 support in the nxt200x module.
- Make the flexcop driver use nxt200x instead of the nxt2002 module for the
  Air2PC 2nd generation PCI card.
- Remove the nxt2002 module from cvs and kernel build.

Signed-off-by: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 2af35577

drivers/media/dvb/b2c2/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ config DVB_B2C2_FLEXCOP 
	select DVB_STV0299

	select DVB_MT352

	select DVB_MT312

	select DVB_NXT2002

	select DVB_NXT200X

	select DVB_STV0297

	select DVB_BCM3510

	select DVB_LGDT330X

drivers/media/dvb/b2c2/flexcop-fe-tuner.c

+5 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


#include "stv0299.h"

#include "mt352.h"

#include "nxt2002.h"

#include "nxt200x.h"

#include "bcm3510.h"

#include "stv0297.h"

#include "mt312.h"
@@ -343,9 +343,10 @@ static struct lgdt330x_config air2pc_atsc_hd5000_config = { 
	.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 = {
@@ -505,7 +506,7 @@ int flexcop_frontend_init(struct flexcop_device *fc) 
		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

drivers/media/dvb/frontends/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -166,18 +166,6 @@ config DVB_STV0297 
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.



	  This driver needs external firmware. Please use the command

	  "<kerneldir>/Documentation/dvb/get_dvb_firmware nxt2002" to

	  download/extract it, and then copy it to /usr/lib/hotplug/firmware

	  or /lib/firmware (depending on configuration of firmware hotplug).



config DVB_NXT200X

	tristate "Nextwave NXT2002/NXT2004 based"

	depends on DVB_CORE

drivers/media/dvb/frontends/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ obj-$(CONFIG_DVB_CX22702) += cx22702.o 
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

drivers/media/dvb/frontends/dvb-pll.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ struct dvb_pll_desc dvb_pll_tuv1236d = { 
};

EXPORT_SYMBOL(dvb_pll_tuv1236d);



/* Samsung TBMV30111IN

/* Samsung TBMV30111IN / TBMV30712IN1

 * used in Air2PC ATSC - 2nd generation (nxt2002)

 */

struct dvb_pll_desc dvb_pll_tbmv30111in = {