aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2008-09-04 19:35:19 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 07:36:57 -0400
commit83512e207479d0bdb83ee1e000a306af9e6e870e (patch)
treec7943cb69e5eaa44aaddb19f2ad1fa8938167a93 /drivers/media
parent9e615eac827094147401c44c9ff955b468d4fa79 (diff)
V4L/DVB (8890): budget: Add callback to load firmware for the TDHD1 tuner
Supply callback to load firmware for the TDHD1 tuner (using request_firmware). Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/frontends/tdhd1.h3
-rw-r--r--drivers/media/dvb/ttpci/budget.c7
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/tdhd1.h b/drivers/media/dvb/frontends/tdhd1.h
index de8aac7d7ae0..51f170678650 100644
--- a/drivers/media/dvb/frontends/tdhd1.h
+++ b/drivers/media/dvb/frontends/tdhd1.h
@@ -28,6 +28,8 @@
28 28
29#include "tda1004x.h" 29#include "tda1004x.h"
30 30
31static int alps_tdhd1_204_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name);
32
31static struct tda1004x_config alps_tdhd1_204a_config = { 33static struct tda1004x_config alps_tdhd1_204a_config = {
32 .demod_address = 0x8, 34 .demod_address = 0x8,
33 .invert = 1, 35 .invert = 1,
@@ -35,6 +37,7 @@ static struct tda1004x_config alps_tdhd1_204a_config = {
35 .xtal_freq = TDA10046_XTAL_4M, 37 .xtal_freq = TDA10046_XTAL_4M,
36 .agc_config = TDA10046_AGC_DEFAULT, 38 .agc_config = TDA10046_AGC_DEFAULT,
37 .if_freq = TDA10046_FREQ_3617, 39 .if_freq = TDA10046_FREQ_3617,
40 .request_firmware = alps_tdhd1_204_request_firmware
38}; 41};
39 42
40static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) 43static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index a4664ba5aded..d95203d55403 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -391,6 +391,13 @@ static struct stv0299_config alps_bsbe1_config_activy = {
391 .set_symbol_rate = alps_bsbe1_set_symbol_rate, 391 .set_symbol_rate = alps_bsbe1_set_symbol_rate,
392}; 392};
393 393
394static int alps_tdhd1_204_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name)
395{
396 struct budget *budget = (struct budget *)fe->dvb->priv;
397
398 return request_firmware(fw, name, &budget->dev->pci->dev);
399}
400
394 401
395static int i2c_readreg(struct i2c_adapter *i2c, u8 adr, u8 reg) 402static int i2c_readreg(struct i2c_adapter *i2c, u8 adr, u8 reg)
396{ 403{