1 files changed, 21 insertions, 26 deletions

diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index 5b9c5bb29b23..110536843e8e 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -30,13 +30,13 @@
 #include <linux/slab.h>
 
 #include "dvb_frontend.h"
-#include "tda10021.h"
+#include "tda1002x.h"
 
 
 struct tda10021_state {
         struct i2c_adapter* i2c;
         /* configuration settings */
-        const struct tda10021_config* config;
+        const struct tda1002x_config* config;
         struct dvb_frontend frontend;
 
         u8 pwm;
@@ -53,9 +53,6 @@ struct tda10021_state {
 static int verbose;
 
 #define XIN 57840000UL
-#define DISABLE_INVERSION(reg0)         do { reg0 |= 0x20; } while (0)
-#define ENABLE_INVERSION(reg0)          do { reg0 &= ~0x20; } while (0)
-#define HAS_INVERSION(reg0)             (!(reg0 & 0x20))
 
 #define FIN (XIN >> 4)
 
@@ -64,7 +61,7 @@ static u8 tda10021_inittab[0x40]=
 {
         0x73, 0x6a, 0x23, 0x0a, 0x02, 0x37, 0x77, 0x1a,
         0x37, 0x6a, 0x17, 0x8a, 0x1e, 0x86, 0x43, 0x40,
-        0xb8, 0x3f, 0xa0, 0x00, 0xcd, 0x01, 0x00, 0xff,
+        0xb8, 0x3f, 0xa1, 0x00, 0xcd, 0x01, 0x00, 0xff,
         0x11, 0x00, 0x7c, 0x31, 0x30, 0x20, 0x00, 0x00,
         0x02, 0x00, 0x00, 0x7d, 0x00, 0x00, 0x00, 0x00,
         0x07, 0x00, 0x33, 0x11, 0x0d, 0x95, 0x08, 0x58,
@@ -97,7 +94,8 @@ static u8 tda10021_readreg (struct tda10021_state* state, u8 reg)
         int ret;
 
         ret = i2c_transfer (state->i2c, msg, 2);
-        if (ret != 2)
+        // Don't print an error message if the id is read.
+        if (ret != 2 && reg != 0x1a)
                 printk("DVB: TDA10021: %s: readreg error (ret == %i)\n",
                                 __FUNCTION__, ret);
         return b1[0];
@@ -136,10 +134,10 @@ static int tda10021_setup_reg0 (struct tda10021_state* state, u8 reg0,
 {
         reg0 |= state->reg0 & 0x63;
 
-        if (INVERSION_ON == inversion)
-                ENABLE_INVERSION(reg0);
-        else if (INVERSION_OFF == inversion)
-                DISABLE_INVERSION(reg0);
+        if ((INVERSION_ON == inversion) ^ (state->config->invert == 0))
+                reg0 &= ~0x20;
+        else
+                reg0 |= 0x20;
 
         _tda10021_writereg (state, 0x00, reg0 & 0xfe);
         _tda10021_writereg (state, 0x00, reg0 | 0x01);
@@ -201,16 +199,6 @@ static int tda10021_set_symbolrate (struct tda10021_state* state, u32 symbolrate
         return 0;
 }
 
-static int tda10021_write(struct dvb_frontend* fe, u8 *buf, int len)
-{
-        struct tda10021_state* state = fe->demodulator_priv;
-
-        if (len != 2)
-                return -EINVAL;
-
-        return _tda10021_writereg(state, buf[0], buf[1]);
-}
-
 static int tda10021_init (struct dvb_frontend *fe)
 {
         struct tda10021_state* state = fe->demodulator_priv;
@@ -258,6 +246,9 @@ static int tda10021_set_parameters (struct dvb_frontend *fe,
         if (qam < 0 || qam > 5)
                 return -EINVAL;
 
+        if (p->inversion != INVERSION_ON && p->inversion != INVERSION_OFF)
+                return -EINVAL;
+
         //printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p->frequency,qam,p->u.qam.symbol_rate);
 
         if (fe->ops.tuner_ops.set_params) {
@@ -366,7 +357,7 @@ static int tda10021_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa
                        -((s32)p->u.qam.symbol_rate * afc) >> 10);
         }
 
-        p->inversion = HAS_INVERSION(state->reg0) ? INVERSION_ON : INVERSION_OFF;
+        p->inversion = ((state->reg0 & 0x20) == 0x20) ^ (state->config->invert != 0) ? INVERSION_ON : INVERSION_OFF;
         p->u.qam.modulation = ((state->reg0 >> 2) & 7) + QAM_16;
 
         p->u.qam.fec_inner = FEC_NONE;
@@ -408,11 +399,12 @@ static void tda10021_release(struct dvb_frontend* fe)
 
 static struct dvb_frontend_ops tda10021_ops;
 
-struct dvb_frontend* tda10021_attach(const struct tda10021_config* config,
+struct dvb_frontend* tda10021_attach(const struct tda1002x_config* config,
                                      struct i2c_adapter* i2c,
                                      u8 pwm)
 {
         struct tda10021_state* state = NULL;
+        u8 id;
 
         /* allocate memory for the internal state */
         state = kmalloc(sizeof(struct tda10021_state), GFP_KERNEL);
@@ -425,7 +417,11 @@ struct dvb_frontend* tda10021_attach(const struct tda10021_config* config,
         state->reg0 = tda10021_inittab[0];
 
         /* check if the demod is there */
-        if ((tda10021_readreg(state, 0x1a) & 0xf0) != 0x70) goto error;
+        id = tda10021_readreg(state, 0x1a);
+        if ((id & 0xf0) != 0x70) goto error;
+
+        printk("TDA10021: i2c-addr = 0x%02x, id = 0x%02x\n",
+               state->config->demod_address, id);
 
         /* create dvb_frontend */
         memcpy(&state->frontend.ops, &tda10021_ops, sizeof(struct dvb_frontend_ops));
@@ -447,7 +443,7 @@ static struct dvb_frontend_ops tda10021_ops = {
                 .frequency_max = 858000000,
                 .symbol_rate_min = (XIN/2)/64,     /* SACLK/64 == (XIN/2)/64 */
                 .symbol_rate_max = (XIN/2)/4,      /* SACLK/4 */
-#if 0
+        #if 0
                 .frequency_tolerance = ???,
                 .symbol_rate_tolerance = ???,  /* ppm */  /* == 8% (spec p. 5) */
         #endif
@@ -461,7 +457,6 @@ static struct dvb_frontend_ops tda10021_ops = {
 
         .init = tda10021_init,
         .sleep = tda10021_sleep,
-        .write = tda10021_write,
         .i2c_gate_ctrl = tda10021_i2c_gate_ctrl,
 
         .set_frontend = tda10021_set_parameters,