[media] cx88: kernel bz#9476: Fix tone setting for Nova-S+ model 92001

Hauppauge Nova-S-Plus DVB-S model 92001 does not lock on horizontal
polarisation. According with the info provided at the BZ, model
92002 does.

The difference is that, on model 92001, the tone select is done via
isl6421, while, on other devices, this is done via cx24123 code.
This patch adds a way to override the demod's set_tone at isl6421
driver. In order to avoid regressions, the override is enabled
only for cx88 Nova S plus model 92001. For all other models and
devices, the set_tone is provided by the demod driver.

Patch originally proposed at bz@9476[1] by Michel Meyers and
John Donoghue but applying the original patch would break support
for all other devices based on isl6421.

[1] https://bugzilla.kernel.org/show_bug.cgi?id=9476

Tested-by: Adam Sampson <ats@offog.org>
Tested-by: Hans-Peter Jansen <hpj@urpla.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 14 insertions, 4 deletions

diff --git a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c
index e2e0b8faf7a4..07b700a9ed7f 100644
--- a/drivers/media/pci/cx88/cx88-cards.c
+++ b/drivers/media/pci/cx88/cx88-cards.c
@@ -2855,6 +2855,7 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
         core->board.tuner_type = tv.tuner_type;
         core->tuner_formats = tv.tuner_formats;
         core->board.radio.type = tv.has_radio ? CX88_RADIO : 0;
+        core->model = tv.model;
 
         /* Make sure we support the board model */
         switch (tv.model)
diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c
index 672b267a2d3e..053ed1ba1d85 100644
--- a/drivers/media/pci/cx88/cx88-dvb.c
+++ b/drivers/media/pci/cx88/cx88-dvb.c
@@ -1042,7 +1042,7 @@ static int dvb_register(struct cx8802_dev *dev)
                         if (!dvb_attach(isl6421_attach,
                                         fe0->dvb.frontend,
                                         &dev->core->i2c_adap,
-                                        0x08, ISL6421_DCL, 0x00))
+                                        0x08, ISL6421_DCL, 0x00, false))
                                 goto frontend_detach;
                 }
                 /* MFE frontend 2 */
@@ -1279,8 +1279,16 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &hauppauge_novas_config,
                                                &core->i2c_adap);
                 if (fe0->dvb.frontend) {
+                        bool override_tone;
+
+                        if (core->model == 92001)
+                                override_tone = true;
+                        else
+                                override_tone = false;
+
                         if (!dvb_attach(isl6421_attach, fe0->dvb.frontend,
-                                        &core->i2c_adap, 0x08, ISL6421_DCL, 0x00))
+                                        &core->i2c_adap, 0x08, ISL6421_DCL, 0x00,
+                                        override_tone))
                                 goto frontend_detach;
                 }
                 break;
@@ -1403,7 +1411,7 @@ static int dvb_register(struct cx8802_dev *dev)
                         if (!dvb_attach(isl6421_attach,
                                         fe0->dvb.frontend,
                                         &dev->core->i2c_adap,
-                                        0x08, ISL6421_DCL, 0x00))
+                                        0x08, ISL6421_DCL, 0x00, false))
                                 goto frontend_detach;
                 }
                 /* MFE frontend 2 */
@@ -1431,7 +1439,7 @@ static int dvb_register(struct cx8802_dev *dev)
                         if (!dvb_attach(isl6421_attach,
                                         fe0->dvb.frontend,
                                         &dev->core->i2c_adap,
-                                        0x08, ISL6421_DCL, 0x00))
+                                        0x08, ISL6421_DCL, 0x00, false))
                                 goto frontend_detach;
                 }
                 break;
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h
index eca02c2435de..4e29c9deb684 100644
--- a/drivers/media/pci/cx88/cx88.h
+++ b/drivers/media/pci/cx88/cx88.h
@@ -334,6 +334,7 @@ struct cx88_core {
         /* board name */
         int                        nr;
         char                       name[32];
+        u32                        model;
 
         /* pci stuff */
         int                        pci_bus;