aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common/tuners
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@kernellabs.com>2012-02-06 23:16:27 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-02-14 14:20:22 -0500
commitd83988058cba594ac2011a4ca0c50097bd24c2de (patch)
treeefc8fec3a8db4e7886656736471f98098ed35e4a /drivers/media/common/tuners
parent76efb0ba2118c286231dd062bf02b2537cc8738f (diff)
[media] xc5000: add XC5000C_DEFAULT_FIRMWARE: dvb-fe-xc5000c-41.024.5-31875.fw
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/tuners')
-rw-r--r--drivers/media/common/tuners/xc5000.c5
-rw-r--r--drivers/media/common/tuners/xc5000.h5
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index 16c3f75816c4..5af309cddd5e 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -208,6 +208,11 @@ struct xc5000_fw_cfg xc5000a_1_6_114 = {
208 .size = 12401, 208 .size = 12401,
209}; 209};
210 210
211struct xc5000_fw_cfg xc5000c_41_024_5_31875 = {
212 .name = "dvb-fe-xc5000c-41.024.5-31875.fw",
213 .size = 16503,
214};
215
211static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe); 216static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe);
212static int xc5000_is_firmware_loaded(struct dvb_frontend *fe); 217static int xc5000_is_firmware_loaded(struct dvb_frontend *fe);
213static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val); 218static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val);
diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h
index 06d116266d81..471f3f8ef769 100644
--- a/drivers/media/common/tuners/xc5000.h
+++ b/drivers/media/common/tuners/xc5000.h
@@ -33,10 +33,13 @@ struct xc5000_fw_cfg {
33}; 33};
34 34
35extern struct xc5000_fw_cfg xc5000a_1_6_114; 35extern struct xc5000_fw_cfg xc5000a_1_6_114;
36extern struct xc5000_fw_cfg xc5000c_41_024_5_31875;
36 37
37#define XC5000_FW_A_1_6_114 &xc5000a_1_6_114 38#define XC5000_FW_A_1_6_114 &xc5000a_1_6_114
39#define XC5000_FW_C_41_024_5_31875 &xc5000c_41_024_5_31875
38 40
39#define XC5000_DEFAULT_FIRMWARE XC5000_FW_A_1_6_114 41#define XC5000_DEFAULT_FIRMWARE XC5000_FW_A_1_6_114
42#define XC5000C_DEFAULT_FIRMWARE XC5000_FW_C_41_024_5_31875
40 43
41struct xc5000_config { 44struct xc5000_config {
42 u8 i2c_address; 45 u8 i2c_address;