[media] af9035: dual mode support (9805992f) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/dvb-frontends/af9033.c

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -335,6 +335,18 @@ static int af9033_init(struct dvb_frontend *fe)
	goto err;		goto err;
	}		}

			if (state->cfg.ts_mode == AF9033_TS_MODE_SERIAL) {
			ret = af9033_wr_reg_mask(state, 0x00d91c, 0x01, 0x01);
			if (ret < 0)
			goto err;
			ret = af9033_wr_reg_mask(state, 0x00d917, 0x00, 0x01);
			if (ret < 0)
			goto err;
			ret = af9033_wr_reg_mask(state, 0x00d916, 0x00, 0x01);
			if (ret < 0)
			goto err;
			}

	state->bandwidth_hz = 0; /* force to program all parameters */		state->bandwidth_hz = 0; /* force to program all parameters */

	return 0;		return 0;

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

+108 −47

Original line number	Original line	Diff line number	Diff line
	@@ -209,10 +209,14 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
	if (msg[0].len > 40 \|\| msg[1].len > 40) {		if (msg[0].len > 40 \|\| msg[1].len > 40) {
	/* TODO: correct limits > 40 */		/* TODO: correct limits > 40 */
	ret = -EOPNOTSUPP;		ret = -EOPNOTSUPP;
	} else if (msg[0].addr == state->af9033_config[0].i2c_addr) {		} else if ((msg[0].addr == state->af9033_config[0].i2c_addr) \|\|
			(msg[0].addr == state->af9033_config[1].i2c_addr)) {
	/* integrated demod */		/* integrated demod */
	u32 reg = msg[0].buf[0] << 16 \| msg[0].buf[1] << 8 \|		u32 reg = msg[0].buf[0] << 16 \| msg[0].buf[1] << 8 \|
	msg[0].buf[2];		msg[0].buf[2];
			if (state->af9033_config[1].i2c_addr &&
			(msg[0].addr == state->af9033_config[1].i2c_addr))
			reg \|= 0x100000;
	ret = af9035_rd_regs(d, reg, &msg[1].buf[0],		ret = af9035_rd_regs(d, reg, &msg[1].buf[0],
	msg[1].len);		msg[1].len);
	} else {		} else {
	@@ -220,8 +224,9 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
	u8 buf[5 + msg[0].len];		u8 buf[5 + msg[0].len];
	struct usb_req req = { CMD_I2C_RD, 0, sizeof(buf),		struct usb_req req = { CMD_I2C_RD, 0, sizeof(buf),
	buf, msg[1].len, msg[1].buf };		buf, msg[1].len, msg[1].buf };
			req.mbox \|= ((msg[0].addr & 0x80) >> 3);
	buf[0] = msg[1].len;		buf[0] = msg[1].len;
	buf[1] = msg[0].addr << 1;		buf[1] = (u8)(msg[0].addr << 1);
	buf[2] = 0x00; /* reg addr len */		buf[2] = 0x00; /* reg addr len */
	buf[3] = 0x00; /* reg addr MSB */		buf[3] = 0x00; /* reg addr MSB */
	buf[4] = 0x00; /* reg addr LSB */		buf[4] = 0x00; /* reg addr LSB */
	@@ -232,10 +237,14 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
	if (msg[0].len > 40) {		if (msg[0].len > 40) {
	/* TODO: correct limits > 40 */		/* TODO: correct limits > 40 */
	ret = -EOPNOTSUPP;		ret = -EOPNOTSUPP;
	} else if (msg[0].addr == state->af9033_config[0].i2c_addr) {		} else if ((msg[0].addr == state->af9033_config[0].i2c_addr) \|\|
			(msg[0].addr == state->af9033_config[1].i2c_addr)) {
	/* integrated demod */		/* integrated demod */
	u32 reg = msg[0].buf[0] << 16 \| msg[0].buf[1] << 8 \|		u32 reg = msg[0].buf[0] << 16 \| msg[0].buf[1] << 8 \|
	msg[0].buf[2];		msg[0].buf[2];
			if (state->af9033_config[1].i2c_addr &&
			(msg[0].addr == state->af9033_config[1].i2c_addr))
			reg \|= 0x100000;
	ret = af9035_wr_regs(d, reg, &msg[0].buf[3],		ret = af9035_wr_regs(d, reg, &msg[0].buf[3],
	msg[0].len - 3);		msg[0].len - 3);
	} else {		} else {
	@@ -243,8 +252,9 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
	u8 buf[5 + msg[0].len];		u8 buf[5 + msg[0].len];
	struct usb_req req = { CMD_I2C_WR, 0, sizeof(buf), buf,		struct usb_req req = { CMD_I2C_WR, 0, sizeof(buf), buf,
	0, NULL };		0, NULL };
			req.mbox \|= ((msg[0].addr & 0x80) >> 3);
	buf[0] = msg[0].len;		buf[0] = msg[0].len;
	buf[1] = msg[0].addr << 1;		buf[1] = (u8)(msg[0].addr << 1);
	buf[2] = 0x00; /* reg addr len */		buf[2] = 0x00; /* reg addr len */
	buf[3] = 0x00; /* reg addr MSB */		buf[3] = 0x00; /* reg addr MSB */
	buf[4] = 0x00; /* reg addr LSB */		buf[4] = 0x00; /* reg addr LSB */
	@@ -283,9 +293,30 @@ static int af9035_identify_state(struct dvb_usb_device d, const char *name)
	int ret;		int ret;
	u8 wbuf[1] = { 1 };		u8 wbuf[1] = { 1 };
	u8 rbuf[4];		u8 rbuf[4];
			u8 tmp;
	struct usb_req req = { CMD_FW_QUERYINFO, 0, sizeof(wbuf), wbuf,		struct usb_req req = { CMD_FW_QUERYINFO, 0, sizeof(wbuf), wbuf,
	sizeof(rbuf), rbuf };		sizeof(rbuf), rbuf };

			/* check if there is dual tuners */
			ret = af9035_rd_reg(d, EEPROM_DUAL_MODE, &tmp);
			if (ret < 0)
			goto err;

			if (tmp) {
			/* read 2nd demodulator I2C address */
			ret = af9035_rd_reg(d, EEPROM_2WIREADDR, &tmp);
			if (ret < 0)
			goto err;

			ret = af9035_wr_reg(d, 0x00417f, tmp);
			if (ret < 0)
			goto err;

			ret = af9035_wr_reg(d, 0x00d81a, 1);
			if (ret < 0)
			goto err;
			}

	ret = af9035_ctrl_msg(d, &req);		ret = af9035_ctrl_msg(d, &req);
	if (ret < 0)		if (ret < 0)
	goto err;		goto err;
	@@ -498,6 +529,15 @@ static int af9035_read_config(struct dvb_usb_device *d)
	dev_dbg(&d->udev->dev, "%s: dual mode=%d\n",		dev_dbg(&d->udev->dev, "%s: dual mode=%d\n",
	__func__, state->dual_mode);		__func__, state->dual_mode);

			if (state->dual_mode) {
			/* read 2nd demodulator I2C address */
			ret = af9035_rd_reg(d, EEPROM_2WIREADDR, &tmp);
			if (ret < 0)
			goto err;
			state->af9033_config[1].i2c_addr = tmp;
			pr_debug("%s: 2nd demod I2C addr:%02x\n", __func__, tmp);
			}

	for (i = 0; i < state->dual_mode + 1; i++) {		for (i = 0; i < state->dual_mode + 1; i++) {
	/* tuner */		/* tuner */
	ret = af9035_rd_reg(d, EEPROM_1_TUNER_ID + eeprom_shift, &tmp);		ret = af9035_rd_reg(d, EEPROM_1_TUNER_ID + eeprom_shift, &tmp);
	@@ -731,6 +771,12 @@ static int af9035_frontend_callback(void *adapter_priv, int component,
	return 0;		return 0;
	}		}

			static int af9035_get_adapter_count(struct dvb_usb_device *d)
			{
			struct state *state = d_to_priv(d);
			return state->dual_mode + 1;
			}

	static int af9035_frontend_attach(struct dvb_usb_adapter *adap)		static int af9035_frontend_attach(struct dvb_usb_adapter *adap)
	{		{
	struct state *state = adap_to_priv(adap);		struct state *state = adap_to_priv(adap);
	@@ -786,13 +832,22 @@ static const struct fc0011_config af9035_fc0011_config = {
	.i2c_address = 0x60,		.i2c_address = 0x60,
	};		};

	static struct mxl5007t_config af9035_mxl5007t_config = {		static struct mxl5007t_config af9035_mxl5007t_config[] = {
			{
	.xtal_freq_hz = MxL_XTAL_24_MHZ,		.xtal_freq_hz = MxL_XTAL_24_MHZ,
	.if_freq_hz = MxL_IF_4_57_MHZ,		.if_freq_hz = MxL_IF_4_57_MHZ,
	.invert_if = 0,		.invert_if = 0,
	.loop_thru_enable = 0,		.loop_thru_enable = 0,
	.clk_out_enable = 0,		.clk_out_enable = 0,
	.clk_out_amp = MxL_CLKOUT_AMP_0_94V,		.clk_out_amp = MxL_CLKOUT_AMP_0_94V,
			}, {
			.xtal_freq_hz = MxL_XTAL_24_MHZ,
			.if_freq_hz = MxL_IF_4_57_MHZ,
			.invert_if = 0,
			.loop_thru_enable = 1,
			.clk_out_enable = 1,
			.clk_out_amp = MxL_CLKOUT_AMP_0_94V,
			}
	};		};

	static struct tda18218_config af9035_tda18218_config = {		static struct tda18218_config af9035_tda18218_config = {
	@@ -843,6 +898,10 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
	&d->i2c_adap, &af9035_fc0011_config);		&d->i2c_adap, &af9035_fc0011_config);
	break;		break;
	case AF9033_TUNER_MXL5007T:		case AF9033_TUNER_MXL5007T:
			state->tuner_address[adap->id] = 0x60;
			/* hack, use b[7] to carry used I2C-bus */
			state->tuner_address[adap->id] \|= (adap->id << 7);
			if (adap->id == 0) {
	ret = af9035_wr_reg(d, 0x00d8e0, 1);		ret = af9035_wr_reg(d, 0x00d8e0, 1);
	if (ret < 0)		if (ret < 0)
	goto err;		goto err;
	@@ -879,10 +938,12 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
	ret = af9035_wr_reg(d, 0x00d8b3, 1);		ret = af9035_wr_reg(d, 0x00d8b3, 1);
	if (ret < 0)		if (ret < 0)
	goto err;		goto err;
			}

	/* attach tuner */		/* attach tuner */
	fe = dvb_attach(mxl5007t_attach, adap->fe[0],		fe = dvb_attach(mxl5007t_attach, adap->fe[0],
	&d->i2c_adap, 0x60, &af9035_mxl5007t_config);		&d->i2c_adap, state->tuner_address[adap->id],
			&af9035_mxl5007t_config[adap->id]);
	break;		break;
	case AF9033_TUNER_TDA18218:		case AF9033_TUNER_TDA18218:
	/* attach tuner */		/* attach tuner */
	@@ -971,8 +1032,8 @@ static int af9035_init(struct dvb_usb_device *d)
	{ 0x00dd8a, (frame_size >> 0) & 0xff, 0xff},		{ 0x00dd8a, (frame_size >> 0) & 0xff, 0xff},
	{ 0x00dd8b, (frame_size >> 8) & 0xff, 0xff},		{ 0x00dd8b, (frame_size >> 8) & 0xff, 0xff},
	{ 0x00dd0d, packet_size, 0xff },		{ 0x00dd0d, packet_size, 0xff },
	{ 0x80f9a3, 0x00, 0x01 },		{ 0x80f9a3, state->dual_mode, 0x01 },
	{ 0x80f9cd, 0x00, 0x01 },		{ 0x80f9cd, state->dual_mode, 0x01 },
	{ 0x80f99d, 0x00, 0x01 },		{ 0x80f99d, 0x00, 0x01 },
	{ 0x80f9a4, 0x00, 0x01 },		{ 0x80f9a4, 0x00, 0x01 },
	};		};
	@@ -1094,7 +1155,7 @@ static const struct dvb_usb_device_properties af9035_props = {
	.init = af9035_init,		.init = af9035_init,
	.get_rc_config = af9035_get_rc_config,		.get_rc_config = af9035_get_rc_config,

	.num_adapters = 1,		.get_adapter_count = af9035_get_adapter_count,
	.adapter = {		.adapter = {
	{		{
	.stream = DVB_USB_STREAM_BULK(0x84, 6, 87 * 188),		.stream = DVB_USB_STREAM_BULK(0x84, 6, 87 * 188),

drivers/media/usb/dvb-usb-v2/af9035.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,8 @@ struct state {
	bool dual_mode;		bool dual_mode;

	struct af9033_config af9033_config[2];		struct af9033_config af9033_config[2];

			u8 tuner_address[2];
	};		};

	u32 clock_lut[] = {		u32 clock_lut[] = {
	@@ -92,6 +94,7 @@ u32 clock_lut_it9135[] = {
	/* EEPROM locations */		/* EEPROM locations */
	#define EEPROM_IR_MODE 0x430d		#define EEPROM_IR_MODE 0x430d
	#define EEPROM_DUAL_MODE 0x4326		#define EEPROM_DUAL_MODE 0x4326
			#define EEPROM_2WIREADDR 0x4327
	#define EEPROM_IR_TYPE 0x4329		#define EEPROM_IR_TYPE 0x4329
	#define EEPROM_1_IFFREQ_L 0x432d		#define EEPROM_1_IFFREQ_L 0x432d
	#define EEPROM_1_IFFREQ_H 0x432e		#define EEPROM_1_IFFREQ_H 0x432e