[media] saa7134: Kworld SBTVD: make both analog and digital to work

There are some weird bugs at tda8290/tda18271 initialization, as it
insits do do analog initialization during DVB frontend attach:

DVB: registering new adapter (saa7133[0])
DVB: registering adapter 0 frontend 0 (Fujitsu mb86A20s)...
mb86a20s: mb86a20s_initfe
tda18271_write_regs: [2-0060|M] ERROR: idx = 0x5, len = 1, i2c_transfer returned: -5
tda18271_init: [2-0060|M] error -5 on line 830
tda18271_tune: [2-0060|M] error -5 on line 908
tda18271_write_regs
tda18271_write_regs: [2-0060|M] ERROR: idx = 0x5, len = 1, i2c_transfer returned: -5
tda18271c2_rf_tracking_filters_correction: [2-0060|M] error -5 on line 265
tda18271_write_regs
tda18271_write_regs: [2-0060|M] ERROR: idx = 0x25, len = 1, i2c_transfer returned: -5
tda18271_channel_configuration: [2-0060|M] error -5 on line 119
tda18271_set_analog_params: [2-0060|M] error -5 on line 1045
tda18271_set_analog_params: [2-0060|M] error -5 on line 1045
tda829x 2-004b: tda8295 not locked, no signal?
tda829x 2-004b: tda8295_i2c_bridge: disable i2c gate
tda829x 2-004b: tda8295 not locked, no signal?
tda829x 2-004b: tda8295_i2c_bridge: disable i2c gate
mb86a20s_i2c_writereg: writereg error (rc == -5, reg == 0x29, data == 0x33)
mb86a20s: Init failed. Will try again later

The problem is that mb86a20s is only visible if the analog part is disabled.

However, due to a trick at mb86a20s, it will later initialize properly:

mb86a20s: mb86a20s_initfe: Initialization succeded.

This is hacky and ugly. However, I coldn't find any easy way to fix it.
A proper fix would be to have a resource locking schema, used by both
V4L and DVB parts that would block access to analog registers while
digital registers are in use, but this will probably put tda829x into
a dead lock.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index d2a12df28af0..f65cad287b83 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -237,6 +237,8 @@ static struct tda18271_std_map mb86a20s_tda18271_std_map = {
 static struct tda18271_config kworld_tda18271_config = {
         .std_map = &mb86a20s_tda18271_std_map,
         .gate    = TDA18271_GATE_DIGITAL,
+        .config  = 3,   /* Use tuner callback for AGC */
+
 };
 
 static const struct mb86a20s_config kworld_mb86a20s_config = {
@@ -1654,24 +1656,16 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG:
-                saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x14000);
-                saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x14000);
-                msleep(20);
-                saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x54000);
-                saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x54000);
-                msleep(20);
+                /* Switch to digital mode */
+                saa7134_tuner_callback(dev, 0,
+                                       TDA18271_CALLBACK_CMD_AGC_ENABLE, 1);
                 fe0->dvb.frontend = dvb_attach(mb86a20s_attach,
                                                &kworld_mb86a20s_config,
                                                &dev->i2c_adap);
                 if (fe0->dvb.frontend != NULL) {
-#if 0
                         dvb_attach(tda829x_attach, fe0->dvb.frontend,
                                    &dev->i2c_adap, 0x4b,
                                    &tda829x_no_probe);
-#else
-                        dvb_attach(tda829x_attach, fe0->dvb.frontend,
-                                   &dev->i2c_adap, 0x4b, NULL);
-#endif
                         dvb_attach(tda18271_attach, fe0->dvb.frontend,
                                    0x60, &dev->i2c_adap,
                                    &kworld_tda18271_config);