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

Commit e7e10deb authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] bsbe1, bsru6, tdh1: use DVBv5 parameters on set_params() 



Instead of using DVBv3 parameters, rely on DVBv5 parameters to
set the tuner

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ab3eee07

drivers/media/dvb/frontends/bsbe1.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -71,16 +71,17 @@ static int alps_bsbe1_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ra 




static int alps_bsbe1_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)

static int alps_bsbe1_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)

{

{

	struct dtv_frontend_properties *p = &fe->dtv_property_cache;

	int ret;

	int ret;

	u8 data[4];

	u8 data[4];

	u32 div;

	u32 div;

	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };

	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };

	struct i2c_adapter *i2c = fe->tuner_priv;

	struct i2c_adapter *i2c = fe->tuner_priv;





	if ((params->frequency < 950000) || (params->frequency > 2150000))

	if ((p->frequency < 950000) || (p->frequency > 2150000))

		return -EINVAL;

		return -EINVAL;





	div = params->frequency / 1000;

	div = p->frequency / 1000;

	data[0] = (div >> 8) & 0x7f;

	data[0] = (div >> 8) & 0x7f;

	data[1] = div & 0xff;

	data[1] = div & 0xff;

	data[2] = 0x80 | ((div & 0x18000) >> 10) | 0x1;

	data[2] = 0x80 | ((div & 0x18000) >> 10) | 0x1;

drivers/media/dvb/frontends/bsru6.h

+4 −3
Original line number Original line Diff line number Diff line
@@ -103,21 +103,22 @@ static int alps_bsru6_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32 ra 




static int alps_bsru6_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)

static int alps_bsru6_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)

{

{

	struct dtv_frontend_properties *p = &fe->dtv_property_cache;

	u8 buf[4];

	u8 buf[4];

	u32 div;

	u32 div;

	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };

	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };

	struct i2c_adapter *i2c = fe->tuner_priv;

	struct i2c_adapter *i2c = fe->tuner_priv;





	if ((params->frequency < 950000) || (params->frequency > 2150000))

	if ((p->frequency < 950000) || (p->frequency > 2150000))

		return -EINVAL;

		return -EINVAL;





	div = (params->frequency + (125 - 1)) / 125;	// round correctly

	div = (p->frequency + (125 - 1)) / 125;	/* round correctly */

	buf[0] = (div >> 8) & 0x7f;

	buf[0] = (div >> 8) & 0x7f;

	buf[1] = div & 0xff;

	buf[1] = div & 0xff;

	buf[2] = 0x80 | ((div & 0x18000) >> 10) | 4;

	buf[2] = 0x80 | ((div & 0x18000) >> 10) | 4;

	buf[3] = 0xC4;

	buf[3] = 0xC4;





	if (params->frequency > 1530000)

	if (p->frequency > 1530000)

		buf[3] = 0xc0;

		buf[3] = 0xc0;





	if (fe->ops.i2c_gate_ctrl)

	if (fe->ops.i2c_gate_ctrl)

drivers/media/dvb/frontends/tdhd1.h

+5 −4
Original line number Original line Diff line number Diff line
@@ -42,22 +42,23 @@ static struct tda1004x_config alps_tdhd1_204a_config = { 




static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)

static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)

{

{

	struct dtv_frontend_properties *p = &fe->dtv_property_cache;

	struct i2c_adapter *i2c = fe->tuner_priv;

	struct i2c_adapter *i2c = fe->tuner_priv;

	u8 data[4];

	u8 data[4];

	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };

	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };

	u32 div;

	u32 div;





	div = (params->frequency + 36166666) / 166666;

	div = (p->frequency + 36166666) / 166666;





	data[0] = (div >> 8) & 0x7f;

	data[0] = (div >> 8) & 0x7f;

	data[1] = div & 0xff;

	data[1] = div & 0xff;

	data[2] = 0x85;

	data[2] = 0x85;





	if (params->frequency >= 174000000 && params->frequency <= 230000000)

	if (p->frequency >= 174000000 && p->frequency <= 230000000)

		data[3] = 0x02;

		data[3] = 0x02;

	else if (params->frequency >= 470000000 && params->frequency <= 823000000)

	else if (p->frequency >= 470000000 && p->frequency <= 823000000)

		data[3] = 0x0C;

		data[3] = 0x0C;

	else if (params->frequency > 823000000 && params->frequency <= 862000000)

	else if (p->frequency > 823000000 && p->frequency <= 862000000)

		data[3] = 0x8C;

		data[3] = 0x8C;

	else

	else

		return -EINVAL;

		return -EINVAL;