Commit b6851419 authored by nibble.max's avatar nibble.max Committed by Mauro Carvalho Chehab
Browse files

[media] m88ds3103: change ts clock config for serial mode 



1> When m88ds3103 works in serial ts mode, its serial ts clock is equal to ts master clock and the clock divider is bypassed.
2> The serial ts clock is configed by the bridge driver just like parallel ts clock.

Signed-off-by: default avatarNibble Max <nibble.max@gmail.com>
Reviewed-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c29d6a83

drivers/media/dvb-frontends/m88ds3103.c

+25 −30
Original line number Diff line number Diff line
@@ -245,9 +245,9 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) 
	struct dtv_frontend_properties *c = &fe->dtv_property_cache;

	int ret, len;

	const struct m88ds3103_reg_val *init;

	u8 u8tmp, u8tmp1, u8tmp2;

	u8 u8tmp, u8tmp1 = 0, u8tmp2 = 0; /* silence compiler warning */

	u8 buf[3];

	u16 u16tmp, divide_ratio;

	u16 u16tmp, divide_ratio = 0;

	u32 tuner_frequency, target_mclk;

	s32 s32tmp;
@@ -319,25 +319,23 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) 
	/* set M88DS3103 mclk and ts mclk. */

		priv->mclk_khz = 96000;



		if (c->delivery_system == SYS_DVBS)

			target_mclk = 96000;

		else {

		switch (priv->cfg->ts_mode) {

		case M88DS3103_TS_SERIAL:

		case M88DS3103_TS_SERIAL_D7:

				if (c->symbol_rate < 18000000)

					target_mclk = 96000;

				else

					target_mclk = 144000;

			target_mclk = priv->cfg->ts_clk;

			break;

		case M88DS3103_TS_PARALLEL:

		case M88DS3103_TS_CI:

			if (c->delivery_system == SYS_DVBS)

				target_mclk = 96000;

			else {

				if (c->symbol_rate < 18000000)

					target_mclk = 96000;

				else if (c->symbol_rate < 28000000)

					target_mclk = 144000;

				else

					target_mclk = 192000;

			}

			break;

		default:

			dev_dbg(&priv->i2c->dev, "%s: invalid ts_mode\n",
@@ -345,7 +343,6 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) 
			ret = -EINVAL;

			goto err;

		}

		}



		switch (target_mclk) {

		case 96000:
@@ -434,7 +431,6 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) 
			goto err;

	}



	u8tmp1 = 0; /* silence compiler warning */

	switch (priv->cfg->ts_mode) {

	case M88DS3103_TS_SERIAL:

		u8tmp1 = 0x00;
@@ -470,16 +466,15 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) 
		ret = m88ds3103_wr_reg_mask(priv, 0x29, u8tmp1, 0x20);

		if (ret)

			goto err;

	}



		u8tmp1 = 0;

		u8tmp2 = 0;

		break;

	default:

		if (priv->cfg->ts_clk) {

			divide_ratio = DIV_ROUND_UP(target_mclk, priv->cfg->ts_clk);

			u8tmp1 = divide_ratio / 2;

			u8tmp2 = DIV_ROUND_UP(divide_ratio, 2);

	} else {

		divide_ratio = 0;

		u8tmp1 = 0;

		u8tmp2 = 0;

		}

	}



	dev_dbg(&priv->i2c->dev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE