V4L/DVB (6645): xc2028: allow selection of D2633 firmware

Add a bit to select D2633 DTV firmware to struct xc2028_ctrl, so that it can
be enabled via .set_config.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
index fbaab68..a5efd5f 100644 (file)
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -665,9 +665,10 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
        tuner_dbg("I should change bandwidth %u\n", change_digital_bandwidth);
 
        if (change_digital_bandwidth) {
-
-               /*FIXME: Should allow selecting between D2620 and D2633 */
-               type |= D2620;
+               if (priv->ctrl.d2633)
+                       type |= D2633;
+               else
+                       type |= D2620;
 
                /* FIXME: When should select a DTV78 firmware?
                 */

diff --git a/drivers/media/video/tuner-xc2028.h b/drivers/media/video/tuner-xc2028.h
index a20eeb4..4edc4b7 100644 (file)
--- a/drivers/media/video/tuner-xc2028.h
+++ b/drivers/media/video/tuner-xc2028.h
@@ -20,6 +20,7 @@ struct xc2028_ctrl {
        enum xc2028_firm_type   type;
        char                    *fname;
        int                     max_len;
+       int                     d2633:1;
 };
 
 struct xc2028_config {