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

Commit 57422405 authored by Stefan Brüns's avatar Stefan Brüns Committed by Mauro Carvalho Chehab
Browse files

media: dvbsky: MyGica T230C support 



Mygica T230 DVB-T/T2/C USB stick support. It uses the same FX2/Si2168
bridge/demodulator combo as the other devices supported by the driver,
but uses the Si2141 tuner.
Several DVB-T (MPEG2) and DVB-T2 (H.265) channels were tested, as well as
the included remote control.

Signed-off-by: default avatarStefan Brüns <stefan.bruens@rwth-aachen.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent cd6c56fe

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

+1 −0
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ 
#define USB_PID_SONY_PLAYTV				0x0003

#define USB_PID_MYGICA_D689				0xd811

#define USB_PID_MYGICA_T230				0xc688

#define USB_PID_MYGICA_T230C				0xc689

#define USB_PID_ELGATO_EYETV_DIVERSITY			0x0011

#define USB_PID_ELGATO_EYETV_DTT			0x0021

#define USB_PID_ELGATO_EYETV_DTT_2			0x003f

drivers/media/usb/dvb-usb-v2/dvbsky.c

+88 −0
Original line number Diff line number Diff line
@@ -661,6 +661,65 @@ static int dvbsky_t330_attach(struct dvb_usb_adapter *adap) 
	return ret;

}



static int dvbsky_mygica_t230c_attach(struct dvb_usb_adapter *adap)

{

	struct dvbsky_state *state = adap_to_priv(adap);

	struct dvb_usb_device *d = adap_to_d(adap);

	struct i2c_adapter *i2c_adapter;

	struct i2c_client *client_demod, *client_tuner;

	struct i2c_board_info info;

	struct si2168_config si2168_config;

	struct si2157_config si2157_config;



	/* attach demod */

	memset(&si2168_config, 0, sizeof(si2168_config));

	si2168_config.i2c_adapter = &i2c_adapter;

	si2168_config.fe = &adap->fe[0];

	si2168_config.ts_mode = SI2168_TS_PARALLEL;

	si2168_config.ts_clock_inv = 1;

	memset(&info, 0, sizeof(struct i2c_board_info));

	strlcpy(info.type, "si2168", sizeof(info.type));

	info.addr = 0x64;

	info.platform_data = &si2168_config;



	request_module("si2168");

	client_demod = i2c_new_device(&d->i2c_adap, &info);

	if (!client_demod || !client_demod->dev.driver)

		goto fail_demod_device;

	if (!try_module_get(client_demod->dev.driver->owner))

		goto fail_demod_module;



	/* attach tuner */

	memset(&si2157_config, 0, sizeof(si2157_config));

	si2157_config.fe = adap->fe[0];

	si2157_config.if_port = 0;

	memset(&info, 0, sizeof(struct i2c_board_info));

	strlcpy(info.type, "si2141", sizeof(info.type));

	info.addr = 0x60;

	info.platform_data = &si2157_config;



	request_module("si2157");

	client_tuner = i2c_new_device(i2c_adapter, &info);

	if (!client_tuner || !client_tuner->dev.driver)

		goto fail_tuner_device;

	if (!try_module_get(client_tuner->dev.driver->owner))

		goto fail_tuner_module;



	state->i2c_client_demod = client_demod;

	state->i2c_client_tuner = client_tuner;

	return 0;



fail_tuner_module:

	i2c_unregister_device(client_tuner);

fail_tuner_device:

	module_put(client_demod->dev.driver->owner);

fail_demod_module:

	i2c_unregister_device(client_demod);

fail_demod_device:

	return -ENODEV;

}





static int dvbsky_identify_state(struct dvb_usb_device *d, const char **name)

{

	dvbsky_gpio_ctrl(d, 0x04, 1);
@@ -826,6 +885,32 @@ static struct dvb_usb_device_properties dvbsky_t330_props = { 
	}

};



static struct dvb_usb_device_properties mygica_t230c_props = {

	.driver_name = KBUILD_MODNAME,

	.owner = THIS_MODULE,

	.adapter_nr = adapter_nr,

	.size_of_priv = sizeof(struct dvbsky_state),



	.generic_bulk_ctrl_endpoint = 0x01,

	.generic_bulk_ctrl_endpoint_response = 0x81,

	.generic_bulk_ctrl_delay = DVBSKY_MSG_DELAY,



	.i2c_algo         = &dvbsky_i2c_algo,

	.frontend_attach  = dvbsky_mygica_t230c_attach,

	.init             = dvbsky_init,

	.get_rc_config    = dvbsky_get_rc_config,

	.streaming_ctrl   = dvbsky_streaming_ctrl,

	.identify_state	  = dvbsky_identify_state,

	.exit             = dvbsky_exit,



	.num_adapters = 1,

	.adapter = {

		{

			.stream = DVB_USB_STREAM_BULK(0x82, 8, 4096),

		}

	}

};



static const struct usb_device_id dvbsky_id_table[] = {

	{ DVB_USB_DEVICE(0x0572, 0x6831,

		&dvbsky_s960_props, "DVBSky S960/S860", RC_MAP_DVBSKY) },
@@ -858,6 +943,9 @@ static const struct usb_device_id dvbsky_id_table[] = { 
	{ DVB_USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R4,

		&dvbsky_s960_props, "Terratec Cinergy S2 Rev.4",

		RC_MAP_DVBSKY) },

	{ DVB_USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_T230C,

		&mygica_t230c_props, "MyGica Mini DVB-T2 USB Stick T230C",

		RC_MAP_TOTAL_MEDIA_IN_HAND_02) },

	{ }

};

MODULE_DEVICE_TABLE(usb, dvbsky_id_table);