Merge master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / drivers / media / video / tea5767.c

diff --git a/drivers/media/video/tea5767.c b/drivers/media/video/tea5767.c
index 4d27ac1..38bf509 100644 (file)
--- a/drivers/media/video/tea5767.c
+++ b/drivers/media/video/tea5767.c
@@ -2,7 +2,6 @@
  * For Philips TEA5767 FM Chip used on some TV Cards like Prolink Pixelview
  * I2C address is allways 0xC0.
  *
- * $Id: tea5767.c,v 1.21 2005/07/14 03:06:43 mchehab Exp $
  *
  * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)
  * This code is placed under the terms of the GNU General Public License
@@ -15,7 +14,6 @@
 #include <linux/videodev.h>
 #include <linux/delay.h>
 #include <media/tuner.h>
-#include <media/tuner.h>
 
 #define PREFIX "TEA5767 "
 
@@ -206,11 +204,6 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
                    TEA5767_ST_NOISE_CTL | TEA5767_JAPAN_BAND;
        buffer[4] = 0;
 
-       if (t->mode == T_STANDBY) {
-               tuner_dbg("TEA5767 set to standby mode\n");
-               buffer[3] |= TEA5767_STDBY;
-       }
-
        if (t->audmode == V4L2_TUNER_MODE_MONO) {
                tuner_dbg("TEA5767 set to mono\n");
                buffer[2] |= TEA5767_MONO;
@@ -291,18 +284,36 @@ static int tea5767_stereo(struct i2c_client *c)
        return ((buffer[2] & TEA5767_STEREO_MASK) ? V4L2_TUNER_SUB_STEREO : 0);
 }
 
+static void tea5767_standby(struct i2c_client *c)
+{
+       unsigned char buffer[5];
+       struct tuner *t = i2c_get_clientdata(c);
+       unsigned div, rc;
+
+       div = (87500 * 4 + 700 + 225 + 25) / 50; /* Set frequency to 87.5 MHz */
+       buffer[0] = (div >> 8) & 0x3f;
+       buffer[1] = div & 0xff;
+       buffer[2] = TEA5767_PORT1_HIGH;
+       buffer[3] = TEA5767_PORT2_HIGH | TEA5767_HIGH_CUT_CTRL |
+                   TEA5767_ST_NOISE_CTL | TEA5767_JAPAN_BAND | TEA5767_STDBY;
+       buffer[4] = 0;
+
+       if (5 != (rc = i2c_master_send(c, buffer, 5)))
+               tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);
+}
+
 int tea5767_autodetection(struct i2c_client *c)
 {
-       unsigned char buffer[5] = { 0xff, 0xff, 0xff, 0xff, 0xff };
+       unsigned char buffer[7] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
        int rc;
        struct tuner *t = i2c_get_clientdata(c);
 
-       if (5 != (rc = i2c_master_recv(c, buffer, 5))) {
+       if ((rc = i2c_master_recv(c, buffer, 7))< 5) {
                tuner_warn("It is not a TEA5767. Received %i bytes.\n", rc);
                return EINVAL;
        }
 
-       /* If all bytes are the same then it's a TV tuner and not a tea5767 chip. */
+       /* If all bytes are the same then it's a TV tuner and not a tea5767 */
        if (buffer[0] == buffer[1] && buffer[0] == buffer[2] &&
            buffer[0] == buffer[3] && buffer[0] == buffer[4]) {
                tuner_warn("All bytes are equal. It is not a TEA5767\n");
@@ -314,11 +325,17 @@ int tea5767_autodetection(struct i2c_client *c)
         *          bit 0   : internally set to 0
         *  Byte 5: bit 7:0 : == 0
         */
-       if (!((buffer[3] & 0x0f) == 0x00) && (buffer[4] == 0x00)) {
+       if (((buffer[3] & 0x0f) != 0x00) || (buffer[4] != 0x00)) {
                tuner_warn("Chip ID is not zero. It is not a TEA5767\n");
                return EINVAL;
        }
 
+       /* It seems that tea5767 returns 0xff after the 5th byte */
+       if ((buffer[5] != 0xff) || (buffer[6] != 0xff)) {
+               tuner_warn("Returned more than 5 bytes. It is not a TEA5767\n");
+               return EINVAL;
+       }
+
        tuner_warn("TEA5767 detected.\n");
        return 0;
 }
@@ -327,9 +344,6 @@ int tea5767_tuner_init(struct i2c_client *c)
 {
        struct tuner *t = i2c_get_clientdata(c);
 
-       if (tea5767_autodetection(c) == EINVAL)
-               return EINVAL;
-
        tuner_info("type set to %d (%s)\n", t->type, "Philips TEA5767HN FM Radio");
        strlcpy(c->name, "tea5767", sizeof(c->name));
 
@@ -337,6 +351,7 @@ int tea5767_tuner_init(struct i2c_client *c)
        t->radio_freq = set_radio_freq;
        t->has_signal = tea5767_signal;
        t->is_stereo = tea5767_stereo;
+       t->standby = tea5767_standby;
 
        return (0);
 }