leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] mn88472: calculate the IF register values

Browse Source 
Add xtal as a configuration parameter so it can be used
in the IF register value calculation.

Signed-off-by: Benjamin Larsson <benjamin@southpole.se>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Benjamin Larsson 2014-11-26 18:51:46 -03:00 committed by Mauro Carvalho Chehab
parent 417d2e507e
commit d2fb785227
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/dvb-frontends/mn88472.h
View File

@ -33,6 +33,12 @@ struct mn88472_config {
* DVB frontend. * DVB frontend.
*/ */
struct dvb_frontend **fe; struct dvb_frontend **fe;
/*
* Xtal frequency.
* Hz
*/
u32 xtal;
}; };
#endif #endif

1
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
View File

@ -852,6 +852,7 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
mn88472_config.fe = &adap->fe[1]; mn88472_config.fe = &adap->fe[1];
mn88472_config.i2c_wr_max = 22, mn88472_config.i2c_wr_max = 22,
strlcpy(info.type, "mn88472", I2C_NAME_SIZE); strlcpy(info.type, "mn88472", I2C_NAME_SIZE);
mn88472_config.xtal = 20500000;
info.addr = 0x18; info.addr = 0x18;
info.platform_data = &mn88472_config; info.platform_data = &mn88472_config;
request_module(info.type); request_module(info.type);

23
drivers/staging/media/mn88472/mn88472.c
View File

@ -30,6 +30,7 @@ static int mn88472_set_frontend(struct dvb_frontend *fe)
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret, i; int ret, i;
u32 if_frequency = 0; u32 if_frequency = 0;
u64 tmp;
u8 delivery_system_val, if_val[3], bw_val[7], bw_val2; u8 delivery_system_val, if_val[3], bw_val[7], bw_val2;
dev_dbg(&client->dev, dev_dbg(&client->dev,
@ -62,17 +63,14 @@ static int mn88472_set_frontend(struct dvb_frontend *fe)
case SYS_DVBT2: case SYS_DVBT2:
if (c->bandwidth_hz <= 6000000) { if (c->bandwidth_hz <= 6000000) {
/* IF 3570000 Hz, BW 6000000 Hz */ /* IF 3570000 Hz, BW 6000000 Hz */
memcpy(if_val, "\x2c\x94\xdb", 3);
memcpy(bw_val, "\xbf\x55\x55\x15\x6b\x15\x6b", 7); memcpy(bw_val, "\xbf\x55\x55\x15\x6b\x15\x6b", 7);
bw_val2 = 0x02; bw_val2 = 0x02;
} else if (c->bandwidth_hz <= 7000000) { } else if (c->bandwidth_hz <= 7000000) {
/* IF 4570000 Hz, BW 7000000 Hz */ /* IF 4570000 Hz, BW 7000000 Hz */
memcpy(if_val, "\x39\x11\xbc", 3);
memcpy(bw_val, "\xa4\x00\x00\x0f\x2c\x0f\x2c", 7); memcpy(bw_val, "\xa4\x00\x00\x0f\x2c\x0f\x2c", 7);
bw_val2 = 0x01; bw_val2 = 0x01;
} else if (c->bandwidth_hz <= 8000000) { } else if (c->bandwidth_hz <= 8000000) {
/* IF 4570000 Hz, BW 8000000 Hz */ /* IF 4570000 Hz, BW 8000000 Hz */
memcpy(if_val, "\x39\x11\xbc", 3);
memcpy(bw_val, "\x8f\x80\x00\x08\xee\x08\xee", 7); memcpy(bw_val, "\x8f\x80\x00\x08\xee\x08\xee", 7);
bw_val2 = 0x00; bw_val2 = 0x00;
} else { } else {
@ -82,7 +80,6 @@ static int mn88472_set_frontend(struct dvb_frontend *fe)
break; break;
case SYS_DVBC_ANNEX_A: case SYS_DVBC_ANNEX_A:
/* IF 5070000 Hz, BW 8000000 Hz */ /* IF 5070000 Hz, BW 8000000 Hz */
memcpy(if_val, "\x3f\x50\x2c", 3);
memcpy(bw_val, "\x8f\x80\x00\x08\xee\x08\xee", 7); memcpy(bw_val, "\x8f\x80\x00\x08\xee\x08\xee", 7);
bw_val2 = 0x00; bw_val2 = 0x00;
break; break;
@ -106,17 +103,12 @@ static int mn88472_set_frontend(struct dvb_frontend *fe)
dev_dbg(&client->dev, "get_if_frequency=%d\n", if_frequency); dev_dbg(&client->dev, "get_if_frequency=%d\n", if_frequency);
} }
switch (if_frequency) { /* Calculate IF registers ( (1<<24)*IF / Xtal ) */
case 3570000: tmp = div_u64(if_frequency * (u64)(1<<24) + (dev->xtal / 2),
case 4570000: dev->xtal);
case 5070000: if_val[0] = ((tmp >> 16) & 0xff);
break; if_val[1] = ((tmp >> 8) & 0xff);
default: if_val[2] = ((tmp >> 0) & 0xff);
dev_err(&client->dev, "IF frequency %d not supported\n",
if_frequency);
ret = -EINVAL;
goto err;
}
ret = regmap_write(dev->regmap[2], 0xfb, 0x13); ret = regmap_write(dev->regmap[2], 0xfb, 0x13);
ret = regmap_write(dev->regmap[2], 0xef, 0x13); ret = regmap_write(dev->regmap[2], 0xef, 0x13);
@ -411,6 +403,7 @@ static int mn88472_probe(struct i2c_client *client,
} }
dev->i2c_wr_max = config->i2c_wr_max; dev->i2c_wr_max = config->i2c_wr_max;
dev->xtal = config->xtal;
dev->client[0] = client; dev->client[0] = client;
dev->regmap[0] = regmap_init_i2c(dev->client[0], &regmap_config); dev->regmap[0] = regmap_init_i2c(dev->client[0], &regmap_config);
if (IS_ERR(dev->regmap[0])) { if (IS_ERR(dev->regmap[0])) {

1
drivers/staging/media/mn88472/mn88472_priv.h
View File

@ -31,6 +31,7 @@ struct mn88472_dev {
u16 i2c_wr_max; u16 i2c_wr_max;
fe_delivery_system_t delivery_system; fe_delivery_system_t delivery_system;
bool warm; /* FW running */ bool warm; /* FW running */
u32 xtal;
}; };
#endif #endif