Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] mn88473: calculate the IF register values

Add xtal as a configuration parameter so it can be used
in the IF register value calculation. If not set in the
configuration then use a default value.

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>

authored by

Benjamin Larsson and committed by
Mauro Carvalho Chehab
3b786f13 269bd132

+18 -15
+6
drivers/media/dvb-frontends/mn88473.h
··· 33 33 * DVB frontend. 34 34 */ 35 35 struct dvb_frontend **fe; 36 + 37 + /* 38 + * Xtal frequency. 39 + * Hz 40 + */ 41 + u32 xtal; 36 42 }; 37 43 38 44 #endif
+11 -15
drivers/staging/media/mn88473/mn88473.c
··· 30 30 struct dtv_frontend_properties *c = &fe->dtv_property_cache; 31 31 int ret, i; 32 32 u32 if_frequency; 33 + u64 tmp; 33 34 u8 delivery_system_val, if_val[3], bw_val[7]; 34 35 35 36 dev_dbg(&client->dev, ··· 64 63 case SYS_DVBT2: 65 64 if (c->bandwidth_hz <= 6000000) { 66 65 /* IF 3570000 Hz, BW 6000000 Hz */ 67 - memcpy(if_val, "\x24\x8e\x8a", 3); 68 66 memcpy(bw_val, "\xe9\x55\x55\x1c\x29\x1c\x29", 7); 69 67 } else if (c->bandwidth_hz <= 7000000) { 70 68 /* IF 4570000 Hz, BW 7000000 Hz */ 71 - memcpy(if_val, "\x2e\xcb\xfb", 3); 72 69 memcpy(bw_val, "\xc8\x00\x00\x17\x0a\x17\x0a", 7); 73 70 } else if (c->bandwidth_hz <= 8000000) { 74 71 /* IF 4570000 Hz, BW 8000000 Hz */ 75 - memcpy(if_val, "\x2e\xcb\xfb", 3); 76 72 memcpy(bw_val, "\xaf\x00\x00\x11\xec\x11\xec", 7); 77 73 } else { 78 74 ret = -EINVAL; ··· 78 80 break; 79 81 case SYS_DVBC_ANNEX_A: 80 82 /* IF 5070000 Hz, BW 8000000 Hz */ 81 - memcpy(if_val, "\x33\xea\xb3", 3); 82 83 memcpy(bw_val, "\xaf\x00\x00\x11\xec\x11\xec", 7); 83 84 break; 84 85 default: ··· 102 105 if_frequency = 0; 103 106 } 104 107 105 - switch (if_frequency) { 106 - case 3570000: 107 - case 4570000: 108 - case 5070000: 109 - break; 110 - default: 111 - dev_err(&client->dev, "IF frequency %d not supported\n", 112 - if_frequency); 113 - ret = -EINVAL; 114 - goto err; 115 - } 108 + /* Calculate IF registers ( (1<<24)*IF / Xtal ) */ 109 + tmp = div_u64(if_frequency * (u64)(1<<24) + (dev->xtal / 2), 110 + dev->xtal); 111 + if_val[0] = ((tmp >> 16) & 0xff); 112 + if_val[1] = ((tmp >> 8) & 0xff); 113 + if_val[2] = ((tmp >> 0) & 0xff); 116 114 117 115 ret = regmap_write(dev->regmap[2], 0x05, 0x00); 118 116 ret = regmap_write(dev->regmap[2], 0xfb, 0x13); ··· 344 352 } 345 353 346 354 dev->i2c_wr_max = config->i2c_wr_max; 355 + if (!config->xtal) 356 + dev->xtal = 25000000; 357 + else 358 + dev->xtal = config->xtal; 347 359 dev->client[0] = client; 348 360 dev->regmap[0] = regmap_init_i2c(dev->client[0], &regmap_config); 349 361 if (IS_ERR(dev->regmap[0])) {
+1
drivers/staging/media/mn88473/mn88473_priv.h
··· 31 31 u16 i2c_wr_max; 32 32 fe_delivery_system_t delivery_system; 33 33 bool warm; /* FW running */ 34 + u32 xtal; 34 35 }; 35 36 36 37 #endif