Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] xc5000: support 32MHz & 31.875MHz xtal using the 41.024.5 firmware

Browse source 
Rather than loading firmware specific for the xtal frequency, just use
the standard firmware and set the xtal frequency after firmware upload.

The modified firmware will never be released, so we're better off
merging this now rather than waiting for v3.5.

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Michael Krufky 2012-04-16 14:59:32 -03:00 committed by Mauro Carvalho Chehab
parent 18311c5395
commit e631f57804
2 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/media/common/tuners/xc5000.c
View file

@ -54,6 +54,7 @@ struct xc5000_priv {
struct list_head hybrid_tuner_instance_list; struct list_head hybrid_tuner_instance_list;
u32 if_khz; u32 if_khz;
u32 xtal_khz;
u32 freq_hz; u32 freq_hz;
u32 bandwidth; u32 bandwidth;
u8 video_standard; u8 video_standard;
@ -214,9 +215,9 @@ static const struct xc5000_fw_cfg xc5000a_1_6_114 = {
.size = 12401, .size = 12401,
}; };
static const struct xc5000_fw_cfg xc5000c_41_024_5_31875 = { static const struct xc5000_fw_cfg xc5000c_41_024_5 = {
.name = "dvb-fe-xc5000c-41.024.5-31875.fw", .name = "dvb-fe-xc5000c-41.024.5.fw",
.size = 16503, .size = 16497,
}; };
static inline const struct xc5000_fw_cfg *xc5000_assign_firmware(int chip_id) static inline const struct xc5000_fw_cfg *xc5000_assign_firmware(int chip_id)
@ -226,7 +227,7 @@ static inline const struct xc5000_fw_cfg *xc5000_assign_firmware(int chip_id)
case XC5000A: case XC5000A:
return &xc5000a_1_6_114; return &xc5000a_1_6_114;
case XC5000C: case XC5000C:
return &xc5000c_41_024_5_31875; return &xc5000c_41_024_5;
} }
} }
@ -572,6 +573,31 @@ static int xc_tune_channel(struct xc5000_priv *priv, u32 freq_hz, int mode)
return found; return found;
} }
static int xc_set_xtal(struct dvb_frontend *fe)
{
struct xc5000_priv *priv = fe->tuner_priv;
int ret = XC_RESULT_SUCCESS;
switch (priv->chip_id) {
default:
case XC5000A:
/* 32.000 MHz xtal is default */
break;
case XC5000C:
switch (priv->xtal_khz) {
default:
case 32000:
/* 32.000 MHz xtal is default */
break;
case 31875:
/* 31.875 MHz xtal configuration */
ret = xc_write_reg(priv, 0x000f, 0x8081);
break;
}
break;
}
return ret;
}
static int xc5000_fwupload(struct dvb_frontend *fe) static int xc5000_fwupload(struct dvb_frontend *fe)
{ {
@ -603,6 +629,8 @@ static int xc5000_fwupload(struct dvb_frontend *fe)
} else { } else {
printk(KERN_INFO "xc5000: firmware uploading...\n"); printk(KERN_INFO "xc5000: firmware uploading...\n");
ret = xc_load_i2c_sequence(fe, fw->data); ret = xc_load_i2c_sequence(fe, fw->data);
if (XC_RESULT_SUCCESS == ret)
ret = xc_set_xtal(fe);
printk(KERN_INFO "xc5000: firmware upload complete...\n"); printk(KERN_INFO "xc5000: firmware upload complete...\n");
} }
@ -1164,6 +1192,9 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
priv->if_khz = cfg->if_khz; priv->if_khz = cfg->if_khz;
} }
if (priv->xtal_khz == 0)
priv->xtal_khz = cfg->xtal_khz;
if (priv->radio_input == 0) if (priv->radio_input == 0)
priv->radio_input = cfg->radio_input; priv->radio_input = cfg->radio_input;

1
drivers/media/common/tuners/xc5000.h
View file

@ -34,6 +34,7 @@ struct xc5000_config {
u8 i2c_address; u8 i2c_address;
u32 if_khz; u32 if_khz;
u8 radio_input; u8 radio_input;
u32 xtal_khz;
int chip_id; int chip_id;
}; };