media: cx23885: Add analog frontend to 1265_K4

Enables the analog tuning frontend for Hauppauge HVR-1265_K4.

Signed-off-by: Brad Love <brad@nextdimension.cc>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 266bd529017b1f187922c1a6b186775a362b747b..f1bd73eb44cb745abc73c881a0cd742d0e3044f3 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -804,8 +804,14 @@ struct cx23885_board cx23885_boards[] = {
                .porta          = CX23885_ANALOG_VIDEO,
                .portc          = CX23885_MPEG_DVB,
                .tuner_type     = TUNER_ABSENT,
-               .force_bff      = 1,
                .input          = {{
+                       .type   = CX23885_VMUX_TELEVISION,
+                       .vmux   =       CX25840_VIN7_CH3 |
+                                       CX25840_VIN5_CH2 |
+                                       CX25840_VIN2_CH1 |
+                                       CX25840_DIF_ON,
+                       .amux   = CX25840_AUDIO8,
+               }, {
                        .type   = CX23885_VMUX_COMPOSITE1,
                        .vmux   =       CX25840_VIN7_CH3 |
                                        CX25840_VIN4_CH2 |

diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 81058d3005831a986ba5c85e247771c94560f395..7c2c8f15945d0e36fe33b491f4c0d5d4530f6c58 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -2547,6 +2547,11 @@ static int dvb_register(struct cx23885_tsport *port)
                                goto frontend_detach;
                        }
                        port->i2c_client_tuner = client_tuner;
+
+                       dev->ts1.analog_fe.tuner_priv = client_tuner;
+                       memcpy(&dev->ts1.analog_fe.ops.tuner_ops,
+                              &fe0->dvb.frontend->ops.tuner_ops,
+                              sizeof(struct dvb_tuner_ops));
                        break;
                }
                break;