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

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

[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

drivers/media/dvb-frontends/rtl2832.c

+19 −6
Original line number Diff line number Diff line
@@ -947,6 +947,8 @@ static int rtl2832_slave_ts_ctrl(struct i2c_client *client, bool enable) 
			goto err;

	}



	dev->slave_ts = enable;



	return 0;

err:

	dev_dbg(&client->dev, "failed=%d\n", ret);
@@ -960,7 +962,7 @@ static int rtl2832_pid_filter_ctrl(struct dvb_frontend *fe, int onoff) 
	int ret;

	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 */

	if (onoff)
@@ -968,6 +970,9 @@ static int rtl2832_pid_filter_ctrl(struct dvb_frontend *fe, int onoff) 
	else

		u8tmp = 0x00;



	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)

		goto err;
@@ -986,8 +991,8 @@ static int rtl2832_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid, 
	int ret;

	u8 buf[4];



	dev_dbg(&client->dev, "index=%d pid=%04x onoff=%d\n",

		index, pid, onoff);

	dev_dbg(&client->dev, "index=%d pid=%04x onoff=%d slave_ts=%d\n",

		index, pid, onoff, dev->slave_ts);



	/* skip invalid PIDs (0x2000) */

	if (pid > 0x1fff || index > 32)
@@ -1003,6 +1008,10 @@ static int rtl2832_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid, 
	buf[1] = (dev->filters >>  8) & 0xff;

	buf[2] = (dev->filters >> 16) & 0xff;

	buf[3] = (dev->filters >> 24) & 0xff;



	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)

		goto err;
@@ -1010,6 +1019,10 @@ static int rtl2832_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid, 
	/* add PID */

	buf[0] = (pid >> 8) & 0xff;

	buf[1] = (pid >> 0) & 0xff;



	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)

		goto err;

drivers/media/dvb-frontends/rtl2832_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct rtl2832_dev { 
	bool sleeping;

	struct delayed_work i2c_gate_work;

	unsigned long filters; /* PID filter */

	bool slave_ts;

};



struct rtl2832_reg_entry {