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

Commit c790885b authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] si2168: add support for DVB-C (annex A version) 



Add support for DVB-C (annex A version).

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent ae4c8919

drivers/media/dvb-frontends/si2168.c

+22 −14
Original line number Diff line number Diff line
@@ -84,6 +84,12 @@ static int si2168_read_status(struct dvb_frontend *fe, fe_status_t *status) 
		cmd.wlen = 2;

		cmd.rlen = 13;

		break;

	case SYS_DVBC_ANNEX_A:

		cmd.args[0] = 0x90;

		cmd.args[1] = 0x01;

		cmd.wlen = 2;

		cmd.rlen = 9;

		break;

	case SYS_DVBT2:

		cmd.args[0] = 0x50;

		cmd.args[1] = 0x01;
@@ -157,6 +163,9 @@ static int si2168_set_frontend(struct dvb_frontend *fe) 
	case SYS_DVBT:

		delivery_system = 0x20;

		break;

	case SYS_DVBC_ANNEX_A:

		delivery_system = 0x30;

		break;

	case SYS_DVBT2:

		delivery_system = 0x70;

		break;
@@ -165,23 +174,20 @@ static int si2168_set_frontend(struct dvb_frontend *fe) 
		goto err;

	}



	switch (c->bandwidth_hz) {

	case 5000000:

	if (c->bandwidth_hz <= 5000000)

		bandwidth = 0x05;

		break;

	case 6000000:

	else if (c->bandwidth_hz <= 6000000)

		bandwidth = 0x06;

		break;

	case 7000000:

	else if (c->bandwidth_hz <= 7000000)

		bandwidth = 0x07;

		break;

	case 8000000:

	else if (c->bandwidth_hz <= 8000000)

		bandwidth = 0x08;

		break;

	default:

		ret = -EINVAL;

		goto err;

	}

	else if (c->bandwidth_hz <= 9000000)

		bandwidth = 0x09;

	else if (c->bandwidth_hz <= 10000000)

		bandwidth = 0x0a;

	else

		bandwidth = 0x0f;



	/* program tuner */

	if (fe->ops.tuner_ops.set_params) {
@@ -200,6 +206,8 @@ static int si2168_set_frontend(struct dvb_frontend *fe) 
	/* that has no big effect */

	if (c->delivery_system == SYS_DVBT)

		memcpy(cmd.args, "\x89\x21\x06\x11\xff\x98", 6);

	else if (c->delivery_system == SYS_DVBC_ANNEX_A)

		memcpy(cmd.args, "\x89\x21\x06\x11\x89\xf0", 6);

	else if (c->delivery_system == SYS_DVBT2)

		memcpy(cmd.args, "\x89\x21\x06\x11\x89\x20", 6);

	cmd.wlen = 6;
@@ -614,7 +622,7 @@ static int si2168_deselect(struct i2c_adapter *adap, void *mux_priv, u32 chan) 
}



static const struct dvb_frontend_ops si2168_ops = {

	.delsys = {SYS_DVBT, SYS_DVBT2},

	.delsys = {SYS_DVBT, SYS_DVBT2, SYS_DVBC_ANNEX_A},

	.info = {

		.name = "Silicon Labs Si2168",

		.caps =	FE_CAN_FEC_1_2 |