3 files changed, 25 insertions, 2 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index a2ba09e0aef0..2cbac93866be 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -200,11 +200,16 @@ struct cx23885_board cx23885_boards[] = {
         },
         [CX23885_BOARD_MYGICA_X8506] = {
                 .name           = "Mygica X8506 DMB-TH",
-                .tuner_type = TUNER_ABSENT,
+                .tuner_type = TUNER_XC5000,
+                .tuner_addr = 0x61,
                 .porta          = CX23885_ANALOG_VIDEO,
                 .portb          = CX23885_MPEG_DVB,
                 .input          = {
                         {
+                                .type   = CX23885_VMUX_TELEVISION,
+                                .vmux   = CX25840_COMPOSITE2,
+                        },
+                        {
                                 .type   = CX23885_VMUX_COMPOSITE1,
                                 .vmux   = CX25840_COMPOSITE8,
                         },
@@ -224,11 +229,16 @@ struct cx23885_board cx23885_boards[] = {
         },
         [CX23885_BOARD_MAGICPRO_PROHDTVE2] = {
                 .name           = "Magic-Pro ProHDTV Extreme 2",
-                .tuner_type = TUNER_ABSENT,
+                .tuner_type = TUNER_XC5000,
+                .tuner_addr = 0x61,
                 .porta          = CX23885_ANALOG_VIDEO,
                 .portb          = CX23885_MPEG_DVB,
                 .input          = {
                         {
+                                .type   = CX23885_VMUX_TELEVISION,
+                                .vmux   = CX25840_COMPOSITE2,
+                        },
+                        {
                                 .type   = CX23885_VMUX_COMPOSITE1,
                                 .vmux   = CX25840_COMPOSITE8,
                         },
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 875597640d74..4d439f2c4abc 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -486,6 +486,11 @@ static int cx23885_dvb_set_frontend(struct dvb_frontend *fe,
                         break;
                 }
                 break;
+        case CX23885_BOARD_MYGICA_X8506:
+        case CX23885_BOARD_MAGICPRO_PROHDTVE2:
+                /* Select Digital TV */
+                cx23885_gpio_set(dev, GPIO_0);
+                break;
         }
         return 0;
 }
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index e14cb39d8412..8b372b4f0de2 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -402,6 +402,13 @@ static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
                 INPUT(input)->gpio2, INPUT(input)->gpio3);
         dev->input = input;
 
+        if (dev->board == CX23885_BOARD_MYGICA_X8506 ||
+                dev->board == CX23885_BOARD_MAGICPRO_PROHDTVE2) {
+                /* Select Analog TV */
+                if (INPUT(input)->type == CX23885_VMUX_TELEVISION)
+                        cx23885_gpio_clear(dev, GPIO_0);
+        }
+
         /* Tell the internal A/V decoder */
         v4l2_subdev_call(dev->sd_cx25840, video, s_routing,
                         INPUT(input)->vmux, 0, 0);
@@ -1508,6 +1515,7 @@ int cx23885_video_register(struct cx23885_dev *dev)
                         tun_setup.mode_mask = T_ANALOG_TV;
                         tun_setup.type = dev->tuner_type;
                         tun_setup.addr = v4l2_i2c_subdev_addr(sd);
+                        tun_setup.tuner_callback = cx23885_tuner_callback;
 
                         v4l2_subdev_call(sd, tuner, s_type_addr, &tun_setup);
                 }