Commit 825d51ef authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: MT2060: Code cleanups, adding to new build-mechanism 



Some minor code cleanups and added the MT2060 to new v4l-dvb-build-system, preliminarily under dvb/frontends.

Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent a841e1f6

drivers/media/dvb/dvb-usb/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config DVB_USB_A800 
	tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)"

	depends on DVB_USB

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060

	help

	  Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.
@@ -33,6 +34,7 @@ config DVB_USB_DIBUSB_MB 
	tristate "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)"

	depends on DVB_USB

	select DVB_DIB3000MB

	select DVB_TUNER_MT2060

	help

	  Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by

	  DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator.
@@ -65,6 +67,7 @@ config DVB_USB_DIBUSB_MC 
	tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)"

	depends on DVB_USB

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060

	help

	  Support for 2.0 DVB-T receivers based on reference designs made by

	  DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator.
@@ -80,6 +83,7 @@ config DVB_USB_UMT_010 
	tristate "HanfTek UMT-010 DVB-T USB2.0 support"

	depends on DVB_USB

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060

	help

	  Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.
@@ -145,6 +149,7 @@ config DVB_USB_NOVA_T_USB2 
	tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"

	depends on DVB_USB

	select DVB_DIB3000MC

	select DVB_TUNER_MT2060

	help

	  Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.

drivers/media/dvb/dvb-usb/dibusb-common.c

+7 −7
Original line number Diff line number Diff line
@@ -243,17 +243,17 @@ int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d) 
		// First IF calibration for Liteon Sticks

		if (d->udev->descriptor.idVendor == USB_VID_LITEON &&

		    d->udev->descriptor.idProduct == USB_PID_LITEON_DVB_T_WARM) {



			dibusb_read_eeprom_byte(d,0x7E,&a);

			dibusb_read_eeprom_byte(d,0x7F,&b);

			if (a == 0xFF && b == 0xFF) {



			if (a == 0xFF && b == 0xFF)

				if1 = 1220;

			} else

			if (a == 0x00) {

			else if (a == 0x00)

				if1 = 1220+b;

			} else

			if (a == 0x80) {

			else if (a == 0x80)

				if1 = 1220-b;

			} else {

			else {

				warn("LITE-ON DVB-T Tuner : Strange IF1 calibration :%2X %2X\n",(int)a,(int)b);

				if1 = 1220;

			}

drivers/media/dvb/frontends/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -274,6 +274,11 @@ config DVB_TDA826X 
	help

	  A DVB-S silicon tuner module. Say Y when you want to support this tuner.



config DVB_TUNER_MT2060

	tristate "Microtune MT2060 silicon IF tuner"

	help

	  A driver for the silicon IF tuner MT2060 from Microtune.



comment "Miscellaneous devices"

	depends on DVB_CORE

drivers/media/dvb/frontends/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ obj-$(CONFIG_DVB_BCM3510) += bcm3510.o 
obj-$(CONFIG_DVB_S5H1420) += s5h1420.o

obj-$(CONFIG_DVB_LGDT330X) += lgdt330x.o

obj-$(CONFIG_DVB_CX24123) += cx24123.o

obj-$(CONFIG_DVB_LNBP21) += lnbp21.o

obj-$(CONFIG_DVB_ISL6421) += isl6421.o

obj-$(CONFIG_DVB_TDA10086) += tda10086.o

obj-$(CONFIG_DVB_TDA826X) += tda826x.o

obj-$(CONFIG_DVB_TUNER_MT2060) += mt2060.o

drivers/media/dvb/frontends/mt2060.c

+1 −1

File changed.

Contains only whitespace changes.