Commit d10f89cc authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Mauro Carvalho Chehab

[media] rtl2832: add support for slave ts pid filter

The rtl2832 demod has 2 sets of PID filters. This patch enables
the filter support when using a slave demod.
Signed-off-by: default avatarBenjamin Larsson <benjamin@southpole.se>
Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 2b987ea7
...@@ -947,6 +947,8 @@ static int rtl2832_slave_ts_ctrl(struct i2c_client *client, bool enable) ...@@ -947,6 +947,8 @@ static int rtl2832_slave_ts_ctrl(struct i2c_client *client, bool enable)
goto err; goto err;
} }
dev->slave_ts = enable;
return 0; return 0;
err: err:
dev_dbg(&client->dev, "failed=%d\n", ret); dev_dbg(&client->dev, "failed=%d\n", ret);
...@@ -960,7 +962,7 @@ static int rtl2832_pid_filter_ctrl(struct dvb_frontend *fe, int onoff) ...@@ -960,7 +962,7 @@ static int rtl2832_pid_filter_ctrl(struct dvb_frontend *fe, int onoff)
int ret; int ret;
u8 u8tmp; u8 u8tmp;
dev_dbg(&client->dev, "onoff=%d\n", onoff); dev_dbg(&client->dev, "onoff=%d, slave_ts=%d\n", onoff, dev->slave_ts);
/* enable / disable PID filter */ /* enable / disable PID filter */
if (onoff) if (onoff)
...@@ -968,7 +970,10 @@ static int rtl2832_pid_filter_ctrl(struct dvb_frontend *fe, int onoff) ...@@ -968,7 +970,10 @@ static int rtl2832_pid_filter_ctrl(struct dvb_frontend *fe, int onoff)
else else
u8tmp = 0x00; u8tmp = 0x00;
ret = regmap_update_bits(dev->regmap, 0x061, 0xc0, u8tmp); if (dev->slave_ts)
ret = regmap_update_bits(dev->regmap, 0x021, 0xc0, u8tmp);
else
ret = regmap_update_bits(dev->regmap, 0x061, 0xc0, u8tmp);
if (ret) if (ret)
goto err; goto err;
...@@ -986,8 +991,8 @@ static int rtl2832_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid, ...@@ -986,8 +991,8 @@ static int rtl2832_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid,
int ret; int ret;
u8 buf[4]; u8 buf[4];
dev_dbg(&client->dev, "index=%d pid=%04x onoff=%d\n", dev_dbg(&client->dev, "index=%d pid=%04x onoff=%d slave_ts=%d\n",
index, pid, onoff); index, pid, onoff, dev->slave_ts);
/* skip invalid PIDs (0x2000) */ /* skip invalid PIDs (0x2000) */
if (pid > 0x1fff || index > 32) if (pid > 0x1fff || index > 32)
...@@ -1003,14 +1008,22 @@ static int rtl2832_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid, ...@@ -1003,14 +1008,22 @@ static int rtl2832_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid,
buf[1] = (dev->filters >> 8) & 0xff; buf[1] = (dev->filters >> 8) & 0xff;
buf[2] = (dev->filters >> 16) & 0xff; buf[2] = (dev->filters >> 16) & 0xff;
buf[3] = (dev->filters >> 24) & 0xff; buf[3] = (dev->filters >> 24) & 0xff;
ret = regmap_bulk_write(dev->regmap, 0x062, buf, 4);
if (dev->slave_ts)
ret = regmap_bulk_write(dev->regmap, 0x022, buf, 4);
else
ret = regmap_bulk_write(dev->regmap, 0x062, buf, 4);
if (ret) if (ret)
goto err; goto err;
/* add PID */ /* add PID */
buf[0] = (pid >> 8) & 0xff; buf[0] = (pid >> 8) & 0xff;
buf[1] = (pid >> 0) & 0xff; buf[1] = (pid >> 0) & 0xff;
ret = regmap_bulk_write(dev->regmap, 0x066 + 2 * index, buf, 2);
if (dev->slave_ts)
ret = regmap_bulk_write(dev->regmap, 0x026 + 2 * index, buf, 2);
else
ret = regmap_bulk_write(dev->regmap, 0x066 + 2 * index, buf, 2);
if (ret) if (ret)
goto err; goto err;
......
...@@ -44,6 +44,7 @@ struct rtl2832_dev { ...@@ -44,6 +44,7 @@ struct rtl2832_dev {
bool sleeping; bool sleeping;
struct delayed_work i2c_gate_work; struct delayed_work i2c_gate_work;
unsigned long filters; /* PID filter */ unsigned long filters; /* PID filter */
bool slave_ts;
}; };
struct rtl2832_reg_entry { struct rtl2832_reg_entry {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment