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

Commit ce1fe379 authored by Gianluca Gennari's avatar Gianluca Gennari Committed by Mauro Carvalho Chehab
Browse files

[media] af9035: add support for the tda18218 tuner 



Add basic support for the tda18218 tuner and the AVerMedia A835 devices.

Signed-off-by: default avatarGianluca Gennari <gennarone@gmail.com>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 728827b8

drivers/media/dvb/dvb-usb/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ config DVB_USB_AF9035 
	select MEDIA_TUNER_TUA9001 if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_FC0011 if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_TDA18218 if !MEDIA_TUNER_CUSTOMISE

	help

	  Say Y here to support the Afatech AF9035 based DVB USB receiver.

drivers/media/dvb/dvb-usb/af9035.c

+25 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "tua9001.h"

#include "fc0011.h"

#include "mxl5007t.h"

#include "tda18218.h"



DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);

static DEFINE_MUTEX(af9035_usb_mutex);
@@ -502,6 +503,7 @@ static int af9035_read_mac_address(struct dvb_usb_device *d, u8 mac[6]) 
		case AF9033_TUNER_TUA9001:

		case AF9033_TUNER_FC0011:

		case AF9033_TUNER_MXL5007T:

		case AF9033_TUNER_TDA18218:

			af9035_af9033_config[i].spec_inv = 1;

			break;

		default:
@@ -678,6 +680,11 @@ static struct mxl5007t_config af9035_mxl5007t_config = { 
	.clk_out_amp = MxL_CLKOUT_AMP_0_94V,

};



static struct tda18218_config af9035_tda18218_config = {

	.i2c_address = 0x60,

	.i2c_wr_max = 21,

};



static int af9035_tuner_attach(struct dvb_usb_adapter *adap)

{

	int ret;
@@ -772,6 +779,11 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap) 
		fe = dvb_attach(mxl5007t_attach, adap->fe_adap[0].fe,

				&adap->dev->i2c_adap, 0x60, &af9035_mxl5007t_config);

		break;

	case AF9033_TUNER_TDA18218:

		/* attach tuner */

		fe = dvb_attach(tda18218_attach, adap->fe_adap[0].fe,

				&adap->dev->i2c_adap, &af9035_tda18218_config);

		break;

	default:

		fe = NULL;

	}
@@ -793,6 +805,8 @@ enum af9035_id_entry { 
	AF9035_0CCD_0093,

	AF9035_15A4_9035,

	AF9035_15A4_1001,

	AF9035_07CA_A835,

	AF9035_07CA_B835,

	AF9035_07CA_1867,

	AF9035_07CA_A867,

};
@@ -804,6 +818,10 @@ static struct usb_device_id af9035_id[] = { 
		USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035)},

	[AF9035_15A4_1001] = {

		USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9035_2)},

	[AF9035_07CA_A835] = {

		USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A835)},

	[AF9035_07CA_B835] = {

		USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_B835)},

	[AF9035_07CA_1867] = {

		USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_1867)},

	[AF9035_07CA_A867] = {
@@ -850,7 +868,7 @@ static struct dvb_usb_device_properties af9035_properties[] = { 


		.i2c_algo = &af9035_i2c_algo,



		.num_device_descs = 3,

		.num_device_descs = 4,

		.devices = {

			{

				.name = "TerraTec Cinergy T Stick",
@@ -863,6 +881,12 @@ static struct dvb_usb_device_properties af9035_properties[] = { 
					&af9035_id[AF9035_15A4_9035],

					&af9035_id[AF9035_15A4_1001],

				},

			}, {

				.name = "AVerMedia AVerTV Volar HD/PRO (A835)",

				.cold_ids = {

					&af9035_id[AF9035_07CA_A835],

					&af9035_id[AF9035_07CA_B835],

				},

			}, {

				.name = "AVerMedia HD Volar (A867)",

				.cold_ids = {

drivers/media/dvb/dvb-usb/dvb-usb-ids.h

+2 −0
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ 
#define USB_PID_AVERMEDIA_A850T				0x850b

#define USB_PID_AVERMEDIA_A805				0xa805

#define USB_PID_AVERMEDIA_A815M				0x815a

#define USB_PID_AVERMEDIA_A835				0xa835

#define USB_PID_AVERMEDIA_B835				0xb835

#define USB_PID_AVERMEDIA_1867				0x1867

#define USB_PID_AVERMEDIA_A867				0xa867

#define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006

drivers/media/dvb/frontends/af9033.c

+4 −0
Original line number Diff line number Diff line
@@ -305,6 +305,10 @@ static int af9033_init(struct dvb_frontend *fe) 
		len = ARRAY_SIZE(tuner_init_mxl5007t);

		init = tuner_init_mxl5007t;

		break;

	case AF9033_TUNER_TDA18218:

		len = ARRAY_SIZE(tuner_init_tda18218);

		init = tuner_init_tda18218;

		break;

	default:

		pr_debug("%s: unsupported tuner ID=%d\n", __func__,

				state->cfg.tuner);

drivers/media/dvb/frontends/af9033.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct af9033_config { 
#define AF9033_TUNER_TUA9001     0x27 /* Infineon TUA 9001 */

#define AF9033_TUNER_FC0011      0x28 /* Fitipower FC0011 */

#define AF9033_TUNER_MXL5007T    0xa0 /* MaxLinear MxL5007T */

#define AF9033_TUNER_TDA18218    0xa1 /* NXP TDA 18218HN */

	u8 tuner;



	/*