Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (244 commits)
  V4L/DVB (4210b): git-dvb: tea575x-tuner build fix
  V4L/DVB (4210a): git-dvb versus matroxfb
  V4L/DVB (4209): Added some BTTV PCI IDs for newer boards
  Fixes some sync issues between V4L/DVB development and GIT
  V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id
  V4L/DVB (4205): Merge tda9887 module into tuner.
  V4L/DVB (4203): Explicitly set the enum values.
  V4L/DVB (4202): allow selecting CX2341x port mode
  V4L/DVB (4200): Disable bitrate_mode when encoding mpeg-1.
  V4L/DVB (4199): Add cx2341x-specific control array to cx2341x.c
  V4L/DVB (4198): Avoid newer usages of obsoleted experimental MPEGCOMP API
  V4L/DVB (4197): Port new MPEG API to saa7134-empress with saa6752hs
  V4L/DVB (4196): Port cx88-blackbird to the new MPEG API.
  V4L/DVB (4193): Update cx2341x fw encoding API doc.
  V4L/DVB (4192): Use control helpers for saa7115, cx25840, msp3400.
  V4L/DVB (4191): Add CX2341X MPEG encoder module.
  V4L/DVB (4190): Add helper functions for control processing to v4l2-common.
  V4L/DVB (4189): Add videodev support for VIDIOC_S/G/TRY_EXT_CTRLS.
  V4L/DVB (4188): Add new MPEG control/ioctl definitions to videodev2.h
  V4L/DVB (4186): Add support for the DNTV Live! mini DVB-T card.
  ...

1 files changed, 26 insertions, 4 deletions

diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index d7d9f59d76d..2b95e8b6cd3 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -34,7 +34,6 @@
 struct zl10353_state {
         struct i2c_adapter *i2c;
         struct dvb_frontend frontend;
-        struct dvb_frontend_ops ops;
 
         struct zl10353_config config;
 };
@@ -126,6 +125,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
                                   struct dvb_frontend_parameters *param)
 {
         struct zl10353_state *state = fe->demodulator_priv;
+
         u8 pllbuf[6] = { 0x67 };
 
         /* These settings set "auto-everything" and start the FSM. */
@@ -142,7 +142,30 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
         zl10353_single_write(fe, 0x66, 0xE9);
         zl10353_single_write(fe, 0x62, 0x0A);
 
-        state->config.pll_set(fe, param, pllbuf + 1);
+        // if there is no attached secondary tuner, we call set_params to program
+        // a potential tuner attached somewhere else
+        if (state->config.no_tuner) {
+                if (fe->ops.tuner_ops.set_params) {
+                        fe->ops.tuner_ops.set_params(fe, param);
+                        if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
+                }
+        }
+
+        // if pllbuf is defined, retrieve the settings
+        if (fe->ops.tuner_ops.calc_regs) {
+                fe->ops.tuner_ops.calc_regs(fe, param, pllbuf+1, 5);
+                pllbuf[1] <<= 1;
+        } else {
+                // fake pllbuf settings
+                pllbuf[1] = 0x61 << 1;
+                pllbuf[2] = 0;
+                pllbuf[3] = 0;
+                pllbuf[3] = 0;
+                pllbuf[4] = 0;
+        }
+
+        // there is no call to _just_ start decoding, so we send the pllbuf anyway
+        // even if there isn't a PLL attached to the secondary bus
         zl10353_write(fe, pllbuf, sizeof(pllbuf));
 
         zl10353_single_write(fe, 0x70, 0x01);
@@ -254,14 +277,13 @@ struct dvb_frontend *zl10353_attach(const struct zl10353_config *config,
         /* setup the state */
         state->i2c = i2c;
         memcpy(&state->config, config, sizeof(struct zl10353_config));
-        memcpy(&state->ops, &zl10353_ops, sizeof(struct dvb_frontend_ops));
 
         /* check if the demod is there */
         if (zl10353_read_register(state, CHIP_ID) != ID_ZL10353)
                 goto error;
 
         /* create dvb_frontend */
-        state->frontend.ops = &state->ops;
+        memcpy(&state->frontend.ops, &zl10353_ops, sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
 
         return &state->frontend;