p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

media: si2168: Add ts bus coontrol, turn off bus on sleep 

Includes a function to set TS MODE property os si2168. The function
either disables the TS output bus, or sets mode to config option.

When going to sleep the TS bus is turned off, this makes the driver
compatible with multiple frontend usage.

Signed-off-by: Brad Love <brad@nextdimension.cc>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Brad Love 2018-01-12 11:19:39 -05:00 committed by Mauro Carvalho Chehab
parent 2af0424434
commit 445877742c
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/media/dvb-frontends/si2168.c
View File

@ -409,6 +409,30 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
return ret; return ret;
} }
static int si2168_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
{
struct i2c_client *client = fe->demodulator_priv;
struct si2168_dev *dev = i2c_get_clientdata(client);
struct si2168_cmd cmd;
int ret = 0;
dev_dbg(&client->dev, "%s acquire: %d\n", __func__, acquire);
/* set TS_MODE property */
memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6);
if (acquire)
cmd.args[4] |= dev->ts_mode;
else
cmd.args[4] |= SI2168_TS_TRISTATE;
if (dev->ts_clock_gapped)
cmd.args[4] |= 0x40;
cmd.wlen = 6;
cmd.rlen = 4;
ret = si2168_cmd_execute(client, &cmd);
return ret;
}
static int si2168_init(struct dvb_frontend *fe) static int si2168_init(struct dvb_frontend *fe)
{ {
struct i2c_client *client = fe->demodulator_priv; struct i2c_client *client = fe->demodulator_priv;
@ -540,14 +564,7 @@ static int si2168_init(struct dvb_frontend *fe)
dev->version >> 24 & 0xff, dev->version >> 16 & 0xff, dev->version >> 24 & 0xff, dev->version >> 16 & 0xff,
dev->version >> 8 & 0xff, dev->version >> 0 & 0xff); dev->version >> 8 & 0xff, dev->version >> 0 & 0xff);
/* set ts mode */ ret = si2168_ts_bus_ctrl(fe, 1);
memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6);
cmd.args[4] |= dev->ts_mode;
if (dev->ts_clock_gapped)
cmd.args[4] |= 0x40;
cmd.wlen = 6;
cmd.rlen = 4;
ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
@ -584,6 +601,9 @@ static int si2168_sleep(struct dvb_frontend *fe)
dev->active = false; dev->active = false;
/* tri-state data bus */
si2168_ts_bus_ctrl(fe, 0);
/* Firmware B 4.0-11 or later loses warm state during sleep */ /* Firmware B 4.0-11 or later loses warm state during sleep */
if (dev->version > ('B' << 24 | 4 << 16 | 0 << 8 | 11 << 0)) if (dev->version > ('B' << 24 | 4 << 16 | 0 << 8 | 11 << 0))
dev->warm = false; dev->warm = false;
@ -681,6 +701,8 @@ static const struct dvb_frontend_ops si2168_ops = {
.init = si2168_init, .init = si2168_init,
.sleep = si2168_sleep, .sleep = si2168_sleep,
.ts_bus_ctrl = si2168_ts_bus_ctrl,
.set_frontend = si2168_set_frontend, .set_frontend = si2168_set_frontend,
.read_status = si2168_read_status, .read_status = si2168_read_status,

1
drivers/media/dvb-frontends/si2168.h
View File

@ -38,6 +38,7 @@ struct si2168_config {
/* TS mode */ /* TS mode */
#define SI2168_TS_PARALLEL 0x06 #define SI2168_TS_PARALLEL 0x06
#define SI2168_TS_SERIAL 0x03 #define SI2168_TS_SERIAL 0x03
#define SI2168_TS_TRISTATE 0x00
u8 ts_mode; u8 ts_mode;
/* TS clock inverted */ /* TS clock inverted */