V4L/DVB (4999): [PATCH] Cablestar2 support

This patch changes the initialization of alps tdee4 tuner in
flexcop-fe-tuner.c to match what is used in the old driver that was
written specifically for Cablestar cards by Patrick Boettcher. This
patch should make Cablestar2 work again with recent dvb drivers without
breaking other stv0297 based cards.

Signed-off-by: Antti Seppala <ajhseppa@niksula.hut.fi>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 35 insertions, 55 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index c2b35e366242..752cf79c532f 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -385,9 +385,9 @@ static int alps_tdee4_stv0297_tuner_set_params(struct dvb_frontend* fe,
         else buf[3] = 0x88;
 
         if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
+                fe->ops.i2c_gate_ctrl(fe, 0);
         deb_tuner("tuner buffer for %d Hz: %x %x %x %x\n",fep->frequency, buf[0],buf[1],buf[2],buf[3]);
-        ret = fc->i2c_request(fc,FC_WRITE,FC_I2C_PORT_TUNER,0x61,buf[0],&buf[1],3);
+        ret = fc->i2c_request(fc, FC_WRITE, FC_I2C_PORT_TUNER, 0x61, buf[0], &buf[1], 3);
         deb_tuner("tuner write returned: %d\n",ret);
 
         return 0;
@@ -398,91 +398,71 @@ static u8 alps_tdee4_stv0297_inittab[] = {
         0x80, 0x00,
         0x81, 0x01,
         0x81, 0x00,
-        0x00, 0x09,
-        0x01, 0x69,
+        0x00, 0x48,
+        0x01, 0x58,
         0x03, 0x00,
         0x04, 0x00,
         0x07, 0x00,
         0x08, 0x00,
-        0x20, 0x00,
-        0x21, 0x40,
-        0x22, 0x00,
-        0x23, 0x00,
-        0x24, 0x40,
-        0x25, 0x88,
         0x30, 0xff,
-        0x31, 0x00,
+        0x31, 0x9d,
         0x32, 0xff,
         0x33, 0x00,
-        0x34, 0x50,
-        0x35, 0x7f,
-        0x36, 0x00,
-        0x37, 0x20,
-        0x38, 0x00,
-        0x40, 0x1c,
-        0x41, 0xff,
-        0x42, 0x29,
+        0x34, 0x29,
+        0x35, 0x55,
+        0x36, 0x80,
+        0x37, 0x6e,
+        0x38, 0x9c,
+        0x40, 0x1a,
+        0x41, 0xfe,
+        0x42, 0x33,
         0x43, 0x00,
         0x44, 0xff,
         0x45, 0x00,
         0x46, 0x00,
         0x49, 0x04,
-        0x4a, 0x00,
+        0x4a, 0x51,
         0x4b, 0xf8,
         0x52, 0x30,
-        0x55, 0xae,
-        0x56, 0x47,
-        0x57, 0xe1,
-        0x58, 0x3a,
-        0x5a, 0x1e,
-        0x5b, 0x34,
-        0x60, 0x00,
-        0x63, 0x00,
-        0x64, 0x00,
-        0x65, 0x00,
-        0x66, 0x00,
-        0x67, 0x00,
-        0x68, 0x00,
-        0x69, 0x00,
-        0x6a, 0x02,
-        0x6b, 0x00,
+        0x53, 0x06,
+        0x59, 0x06,
+        0x5a, 0x5e,
+        0x5b, 0x04,
+        0x61, 0x49,
+        0x62, 0x0a,
         0x70, 0xff,
-        0x71, 0x00,
+        0x71, 0x04,
         0x72, 0x00,
         0x73, 0x00,
         0x74, 0x0c,
-        0x80, 0x00,
+        0x80, 0x20,
         0x81, 0x00,
-        0x82, 0x00,
+        0x82, 0x30,
         0x83, 0x00,
         0x84, 0x04,
-        0x85, 0x80,
-        0x86, 0x24,
-        0x87, 0x78,
-        0x88, 0x10,
+        0x85, 0x22,
+        0x86, 0x08,
+        0x87, 0x1b,
+        0x88, 0x00,
         0x89, 0x00,
-        0x90, 0x01,
-        0x91, 0x01,
-        0xa0, 0x04,
+        0x90, 0x00,
+        0x91, 0x04,
+        0xa0, 0x86,
         0xa1, 0x00,
         0xa2, 0x00,
         0xb0, 0x91,
         0xb1, 0x0b,
-        0xc0, 0x53,
-        0xc1, 0x70,
+        0xc0, 0x5b,
+        0xc1, 0x10,
         0xc2, 0x12,
-        0xd0, 0x00,
+        0xd0, 0x02,
         0xd1, 0x00,
         0xd2, 0x00,
         0xd3, 0x00,
-        0xd4, 0x00,
+        0xd4, 0x02,
         0xd5, 0x00,
         0xde, 0x00,
-        0xdf, 0x00,
-        0x61, 0x49,
-        0x62, 0x0b,
-        0x53, 0x08,
-        0x59, 0x08,
+        0xdf, 0x01,
         0xff, 0xff,
 };