From: Oliver Endriss Date: Thu, 4 Sep 2008 23:35:19 +0000 (-0300) Subject: V4L/DVB (8890): budget: Add callback to load firmware for the TDHD1 tuner X-Git-Tag: v2.6.28-rc1~601^2~218 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=83512e207479d0bdb83ee1e000a306af9e6e870e;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/frontends/tdhd1.h b/drivers/media/dvb/frontends/tdhd1.h index de8aac7d7ae..51f17067865 100644 --- a/drivers/media/dvb/frontends/tdhd1.h +++ b/drivers/media/dvb/frontends/tdhd1.h @@ -28,6 +28,8 @@ #include "tda1004x.h" +static int alps_tdhd1_204_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name); + static struct tda1004x_config alps_tdhd1_204a_config = { .demod_address = 0x8, .invert = 1, @@ -35,6 +37,7 @@ static struct tda1004x_config alps_tdhd1_204a_config = { .xtal_freq = TDA10046_XTAL_4M, .agc_config = TDA10046_AGC_DEFAULT, .if_freq = TDA10046_FREQ_3617, + .request_firmware = alps_tdhd1_204_request_firmware }; static 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 a4664ba5ade..d95203d5540 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 = { .set_symbol_rate = alps_bsbe1_set_symbol_rate, }; +static int alps_tdhd1_204_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name) +{ + struct budget *budget = (struct budget *)fe->dvb->priv; + + return request_firmware(fw, name, &budget->dev->pci->dev); +} + static int i2c_readreg(struct i2c_adapter *i2c, u8 adr, u8 reg) {