V4L/DVB (12462): Add TeVii S630 USB DVB-S card support. (d0a1ddad) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/dvb/dvb-usb/Kconfig

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -253,7 +253,7 @@ config DVB_USB_AF9005_REMOTE
	Afatech AF9005 based receiver.		Afatech AF9005 based receiver.

	config DVB_USB_DW2102		config DVB_USB_DW2102
	tristate "DvbWorld DVB-S/S2 USB2.0 support"		tristate "DvbWorld & TeVii DVB-S/S2 USB2.0 support"
	depends on DVB_USB		depends on DVB_USB
	select DVB_PLL if !DVB_FE_CUSTOMISE		select DVB_PLL if !DVB_FE_CUSTOMISE
	select DVB_STV0299 if !DVB_FE_CUSTOMISE		select DVB_STV0299 if !DVB_FE_CUSTOMISE
	@@ -262,9 +262,11 @@ config DVB_USB_DW2102
	select DVB_CX24116 if !DVB_FE_CUSTOMISE		select DVB_CX24116 if !DVB_FE_CUSTOMISE
	select DVB_SI21XX if !DVB_FE_CUSTOMISE		select DVB_SI21XX if !DVB_FE_CUSTOMISE
	select DVB_TDA10021 if !DVB_FE_CUSTOMISE		select DVB_TDA10021 if !DVB_FE_CUSTOMISE
			select DVB_MT312 if !DVB_FE_CUSTOMISE
			select DVB_ZL10039 if !DVB_FE_CUSTOMISE
	help		help
	Say Y here to support the DvbWorld DVB-S/S2 USB2.0 receivers		Say Y here to support the DvbWorld DVB-S/S2 USB2.0 receivers
	and the TeVii S650.		and the TeVii S650, S630.

	config DVB_USB_CINERGY_T2		config DVB_USB_CINERGY_T2
	tristate "Terratec CinergyT2/qanu USB 2.0 DVB-T receiver"		tristate "Terratec CinergyT2/qanu USB 2.0 DVB-T receiver"

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

+178 −3

Original line number	Original line	Diff line number	Diff line
	/* DVB USB framework compliant Linux driver for the		/* DVB USB framework compliant Linux driver for the
	* DVBWorld DVB-S 2101, 2102, DVB-S2 2104, DVB-C 3101,		* DVBWorld DVB-S 2101, 2102, DVB-S2 2104, DVB-C 3101,
	* TeVii S600, S650 Cards		* TeVii S600, S630, S650 Cards
	* Copyright (C) 2008,2009 Igor M. Liplianin (liplianin@me.by)		* Copyright (C) 2008,2009 Igor M. Liplianin (liplianin@me.by)
	*		*
	* This program is free software; you can redistribute it and/or modify it		* This program is free software; you can redistribute it and/or modify it
	@@ -18,6 +18,8 @@
	#include "eds1547.h"		#include "eds1547.h"
	#include "cx24116.h"		#include "cx24116.h"
	#include "tda1002x.h"		#include "tda1002x.h"
			#include "mt312.h"
			#include "zl10039.h"

	#ifndef USB_PID_DW2102		#ifndef USB_PID_DW2102
	#define USB_PID_DW2102 0x2102		#define USB_PID_DW2102 0x2102
	@@ -39,6 +41,10 @@
	#define USB_PID_TEVII_S650 0xd650		#define USB_PID_TEVII_S650 0xd650
	#endif		#endif

			#ifndef USB_PID_TEVII_S630
			#define USB_PID_TEVII_S630 0xd630
			#endif

	#define DW210X_READ_MSG 0		#define DW210X_READ_MSG 0
	#define DW210X_WRITE_MSG 1		#define DW210X_WRITE_MSG 1

	@@ -436,6 +442,69 @@ static int dw3101_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
	return num;		return num;
	}		}

			static int s630_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
			int num)
			{
			struct dvb_usb_device *d = i2c_get_adapdata(adap);
			int ret = 0;

			if (!d)
			return -ENODEV;
			if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
			return -EAGAIN;

			switch (num) {
			case 2: { /* read */
			u8 ibuf[msg[1].len], obuf[3];
			obuf[0] = msg[1].len;
			obuf[1] = (msg[0].addr << 1);
			obuf[2] = msg[0].buf[0];

			ret = dw210x_op_rw(d->udev, 0x90, 0, 0,
			obuf, 3, DW210X_WRITE_MSG);
			msleep(5);
			ret = dw210x_op_rw(d->udev, 0x91, 0, 0,
			ibuf, msg[1].len, DW210X_READ_MSG);
			memcpy(msg[1].buf, ibuf, msg[1].len);
			break;
			}
			case 1:
			switch (msg[0].addr) {
			case 0x60:
			case 0x0e: {
			/* write to zl10313, zl10039 register, */
			u8 obuf[msg[0].len + 2];
			obuf[0] = msg[0].len + 1;
			obuf[1] = (msg[0].addr << 1);
			memcpy(obuf + 2, msg[0].buf, msg[0].len);
			ret = dw210x_op_rw(d->udev, 0x80, 0, 0,
			obuf, msg[0].len + 2, DW210X_WRITE_MSG);
			break;
			}
			case (DW2102_RC_QUERY): {
			u8 ibuf[4];
			ret = dw210x_op_rw(d->udev, 0xb8, 0, 0,
			ibuf, 4, DW210X_READ_MSG);
			msg[0].buf[0] = ibuf[3];
			break;
			}
			case (DW2102_VOLTAGE_CTRL): {
			u8 obuf[2];
			obuf[0] = 0x03;
			obuf[1] = msg[0].buf[0];
			ret = dw210x_op_rw(d->udev, 0x8a, 0, 0,
			obuf, 2, DW210X_WRITE_MSG);
			break;
			}
			}

			break;
			}

			mutex_unlock(&d->i2c_mutex);
			return num;
			}

	static u32 dw210x_i2c_func(struct i2c_adapter *adapter)		static u32 dw210x_i2c_func(struct i2c_adapter *adapter)
	{		{
	return I2C_FUNC_I2C;		return I2C_FUNC_I2C;
	@@ -466,6 +535,11 @@ static struct i2c_algorithm dw3101_i2c_algo = {
	.functionality = dw210x_i2c_func,		.functionality = dw210x_i2c_func,
	};		};

			static struct i2c_algorithm s630_i2c_algo = {
			.master_xfer = s630_i2c_transfer,
			.functionality = dw210x_i2c_func,
			};

	static int dw210x_read_mac_address(struct dvb_usb_device *d, u8 mac[6])		static int dw210x_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
	{		{
	int i;		int i;
	@@ -490,6 +564,37 @@ static int dw210x_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
	return 0;		return 0;
	};		};

			static int s630_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
			{
			int i, ret;
			u8 buf[3], eeprom[256], eepromline[16];

			for (i = 0; i < 256; i++) {
			buf[0] = 1;
			buf[1] = 0xa0;
			buf[2] = i;
			ret = dw210x_op_rw(d->udev, 0x90, 0, 0,
			buf, 3, DW210X_WRITE_MSG);
			ret = dw210x_op_rw(d->udev, 0x91, 0, 0,
			buf, 1, DW210X_READ_MSG);
			if (ret < 0) {
			err("read eeprom failed.");
			return -1;
			} else {
			eepromline[i % 16] = buf[0];
			eeprom[i] = buf[0];
			}

			if ((i % 16) == 15) {
			deb_xfer("%02x: ", i - 15);
			debug_dump(eepromline, 16, deb_xfer);
			}
			}

			memcpy(mac, eeprom + 16, 6);
			return 0;
			};

	static int dw210x_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)		static int dw210x_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
	{		{
	static u8 command_13v[1] = {0x00};		static u8 command_13v[1] = {0x00};
	@@ -535,6 +640,10 @@ static struct tda10023_config dw3101_tda10023_config = {
	.invert = 1,		.invert = 1,
	};		};

			static struct mt312_config zl313_config = {
			.demod_address = 0x0e,
			};

	static int dw2104_frontend_attach(struct dvb_usb_adapter *d)		static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
	{		{
	if ((d->fe = dvb_attach(cx24116_attach, &dw2104_config,		if ((d->fe = dvb_attach(cx24116_attach, &dw2104_config,
	@@ -596,6 +705,18 @@ static int dw3101_frontend_attach(struct dvb_usb_adapter *d)
	return -EIO;		return -EIO;
	}		}

			static int s630_frontend_attach(struct dvb_usb_adapter *d)
			{
			d->fe = dvb_attach(mt312_attach, &zl313_config,
			&d->dev->i2c_adap);
			if (d->fe != NULL) {
			d->fe->ops.set_voltage = dw210x_set_voltage;
			info("Attached zl10313!\n");
			return 0;
			}
			return -EIO;
			}

	static int dw2102_tuner_attach(struct dvb_usb_adapter *adap)		static int dw2102_tuner_attach(struct dvb_usb_adapter *adap)
	{		{
	dvb_attach(dvb_pll_attach, adap->fe, 0x60,		dvb_attach(dvb_pll_attach, adap->fe, 0x60,
	@@ -619,6 +740,14 @@ static int dw3101_tuner_attach(struct dvb_usb_adapter *adap)
	return 0;		return 0;
	}		}

			static int s630_zl10039_tuner_attach(struct dvb_usb_adapter *adap)
			{
			dvb_attach(zl10039_attach, adap->fe, 0x60,
			&adap->dev->i2c_adap);

			return 0;
			}

	static struct dvb_usb_rc_key dw210x_rc_keys[] = {		static struct dvb_usb_rc_key dw210x_rc_keys[] = {
	{ 0xf8, 0x0a, KEY_Q }, /power/		{ 0xf8, 0x0a, KEY_Q }, /power/
	{ 0xf8, 0x0c, KEY_M }, /mute/		{ 0xf8, 0x0c, KEY_M }, /mute/
	@@ -763,7 +892,7 @@ static int dw2102_rc_query(struct dvb_usb_device d, u32 event, int *state)
	}		}

	*state = REMOTE_NO_KEY_PRESSED;		*state = REMOTE_NO_KEY_PRESSED;
	if (dw2102_i2c_transfer(&d->i2c_adap, &msg, 1) == 1) {		if (d->props.i2c_algo->master_xfer(&d->i2c_adap, &msg, 1) == 1) {
	for (i = 0; i < keymap_size ; i++) {		for (i = 0; i < keymap_size ; i++) {
	if (keymap[i].data == msg.buf[0]) {		if (keymap[i].data == msg.buf[0]) {
	*state = REMOTE_KEY_PRESSED;		*state = REMOTE_KEY_PRESSED;
	@@ -792,6 +921,7 @@ static struct usb_device_id dw2102_table[] = {
	{USB_DEVICE(0x9022, USB_PID_TEVII_S650)},		{USB_DEVICE(0x9022, USB_PID_TEVII_S650)},
	{USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)},		{USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)},
	{USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW3101)},		{USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW3101)},
			{USB_DEVICE(0x9022, USB_PID_TEVII_S630)},
	{ }		{ }
	};		};

	@@ -806,6 +936,7 @@ static int dw2102_load_firmware(struct usb_device *dev,
	u8 reset16[] = {0, 0, 0, 0, 0, 0, 0};		u8 reset16[] = {0, 0, 0, 0, 0, 0, 0};
	const struct firmware *fw;		const struct firmware *fw;
	const char *filename = "dvb-usb-dw2101.fw";		const char *filename = "dvb-usb-dw2101.fw";

	switch (dev->descriptor.idProduct) {		switch (dev->descriptor.idProduct) {
	case 0x2101:		case 0x2101:
	ret = request_firmware(&fw, filename, &dev->dev);		ret = request_firmware(&fw, filename, &dev->dev);
	@@ -1053,6 +1184,48 @@ static struct dvb_usb_device_properties dw3101_properties = {
	}		}
	};		};

			static struct dvb_usb_device_properties s630_properties = {
			.caps = DVB_USB_IS_AN_I2C_ADAPTER,
			.usb_ctrl = DEVICE_SPECIFIC,
			.firmware = "dvb-usb-s630.fw",
			.no_reconnect = 1,

			.i2c_algo = &s630_i2c_algo,
			.rc_key_map = tevii_rc_keys,
			.rc_key_map_size = ARRAY_SIZE(tevii_rc_keys),
			.rc_interval = 150,
			.rc_query = dw2102_rc_query,

			.generic_bulk_ctrl_endpoint = 0x81,
			.num_adapters = 1,
			.download_firmware = dw2102_load_firmware,
			.read_mac_address = s630_read_mac_address,
			.adapter = {
			{
			.frontend_attach = s630_frontend_attach,
			.streaming_ctrl = NULL,
			.tuner_attach = s630_zl10039_tuner_attach,
			.stream = {
			.type = USB_BULK,
			.count = 8,
			.endpoint = 0x82,
			.u = {
			.bulk = {
			.buffersize = 4096,
			}
			}
			},
			}
			},
			.num_device_descs = 1,
			.devices = {
			{"TeVii S630 USB",
			{&dw2102_table[6], NULL},
			{NULL},
			},
			}
			};

	static int dw2102_probe(struct usb_interface *intf,		static int dw2102_probe(struct usb_interface *intf,
	const struct usb_device_id *id)		const struct usb_device_id *id)
	{		{
	@@ -1061,6 +1234,8 @@ static int dw2102_probe(struct usb_interface *intf,
	0 == dvb_usb_device_init(intf, &dw2104_properties,		0 == dvb_usb_device_init(intf, &dw2104_properties,
	THIS_MODULE, NULL, adapter_nr) \|\|		THIS_MODULE, NULL, adapter_nr) \|\|
	0 == dvb_usb_device_init(intf, &dw3101_properties,		0 == dvb_usb_device_init(intf, &dw3101_properties,
			THIS_MODULE, NULL, adapter_nr) \|\|
			0 == dvb_usb_device_init(intf, &s630_properties,
	THIS_MODULE, NULL, adapter_nr)) {		THIS_MODULE, NULL, adapter_nr)) {
	return 0;		return 0;
	}		}
	@@ -1094,6 +1269,6 @@ module_exit(dw2102_module_exit);
	MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by");		MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by");
	MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104,"		MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104,"
	" DVB-C 3101 USB2.0,"		" DVB-C 3101 USB2.0,"
	" TeVii S600, S650 USB2.0 devices");		" TeVii S600, S630, S650 USB2.0 devices");
	MODULE_VERSION("0.1");		MODULE_VERSION("0.1");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");