git://ftp.safe.ca / safe / jmp / linux-2.6 / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
V4L/DVB: tm6000: fix some info messages
[safe/jmp/linux-2.6] / drivers / staging / tm6000 / tm6000-core.c
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index 35e7d63..bf40aa8 100644 (file)
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-core.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-core.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org>
 
@@ -24,7 +24,6 @@
 #include <linux/kernel.h>
 #include <linux/usb.h>
 #include <linux/i2c.h>
-#include <linux/video_decoder.h>
 #include "tm6000.h"
 #include "tm6000-regs.h"
 #include <media/v4l2-common.h>
@@ -71,7 +70,7 @@ int tm6000_read_write_usb (struct tm6000_core *dev, u8 req_type, u8 req,
                        for (i=0;i<len;i++) {
                                printk(" %02x",buf[i]);
                        }
-                       printk("\n");
+               printk("\n");
                }
        }
 
@@ -109,6 +108,7 @@ int tm6000_set_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index)
                tm6000_read_write_usb (dev, USB_DIR_OUT | USB_TYPE_VENDOR,
                                       req, value, index, NULL, 0);
 }
+EXPORT_SYMBOL_GPL(tm6000_set_reg);
 
 int tm6000_get_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index)
 {
@@ -123,6 +123,7 @@ int tm6000_get_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index)
 
        return *buf;
 }
+EXPORT_SYMBOL_GPL(tm6000_get_reg);
 
 int tm6000_get_reg16 (struct tm6000_core *dev, u8 req, u16 value, u16 index)
 {
@@ -140,12 +141,16 @@ int tm6000_get_reg16 (struct tm6000_core *dev, u8 req, u16 value, u16 index)
 
 void tm6000_set_fourcc_format(struct tm6000_core *dev)
 {
-       if (dev->fourcc==V4L2_PIX_FMT_UYVY) {
-               /* Sets driver to UYUV */
-               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0xd0);
+       if (dev->dev_type == TM6010) {
+               if (dev->fourcc == V4L2_PIX_FMT_UYVY)
+                       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0xfc);
+               else
+                       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0xfd);
        } else {
-               /* Sets driver to YUV2 */
-               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0x90);
+               if (dev->fourcc == V4L2_PIX_FMT_UYVY)
+                       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0xd0);
+               else
+                       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0x90);
        }
 }
 
@@ -203,7 +208,7 @@ int tm6000_init_analog_mode (struct tm6000_core *dev)
        struct v4l2_frequency f;
        mutex_lock(&dev->lock);
        f.frequency=dev->freq;
-       tm6000_i2c_call_clients(dev,VIDIOC_S_FREQUENCY,&f);
+       v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_frequency, &f);
        mutex_unlock(&dev->lock);
 
        msleep(100);
@@ -215,33 +220,53 @@ int tm6000_init_analog_mode (struct tm6000_core *dev)
 
 int tm6000_init_digital_mode (struct tm6000_core *dev)
 {
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00ff, 0x08);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00ff, 0x00);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x003f, 0x01);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00df, 0x08);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00e2, 0x0c);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00e8, 0xff);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00eb, 0xd8);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00c0, 0x40);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00c1, 0xd0);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00c3, 0x09);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00da, 0x37);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00d1, 0xd8);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00d2, 0xc0);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00d6, 0x60);
-
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00e2, 0x0c);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00e8, 0xff);
-       tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00eb, 0x08);
-       msleep(50);
-
-       tm6000_set_reg (dev, REQ_04_EN_DISABLE_MCU_INT, 0x0020, 0x00);
-       msleep(50);
-       tm6000_set_reg (dev, REQ_04_EN_DISABLE_MCU_INT, 0x0020, 0x01);
-       msleep(50);
-       tm6000_set_reg (dev, REQ_04_EN_DISABLE_MCU_INT, 0x0020, 0x00);
-       msleep(100);
+       if (dev->dev_type == TM6010) {
+               int val;
+               u8 buf[2];
 
+               /* digital init */
+               val = tm6000_get_reg(dev, REQ_07_SET_GET_AVREG, 0xcc, 0);
+               val &= ~0x60;
+               tm6000_set_reg(dev, REQ_07_SET_GET_AVREG, 0xcc, val);
+               val = tm6000_get_reg(dev, REQ_07_SET_GET_AVREG, 0xc0, 0);
+               val |= 0x40;
+               tm6000_set_reg(dev, REQ_07_SET_GET_AVREG, 0xc0, val);
+               tm6000_set_reg(dev, REQ_07_SET_GET_AVREG, 0xfe, 0x28);
+               tm6000_set_reg(dev, REQ_08_SET_GET_AVREG_BIT, 0xe2, 0xfc);
+               tm6000_set_reg(dev, REQ_08_SET_GET_AVREG_BIT, 0xe6, 0xff);
+               tm6000_set_reg(dev, REQ_08_SET_GET_AVREG_BIT, 0xf1, 0xfe);
+               tm6000_read_write_usb (dev, 0xc0, 0x0e, 0x00c2, 0x0008, buf, 2);
+               printk (KERN_INFO "buf %#x %#x \n", buf[0], buf[1]);
+
+
+       } else  {
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00ff, 0x08);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00ff, 0x00);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x003f, 0x01);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00df, 0x08);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00e2, 0x0c);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00e8, 0xff);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00eb, 0xd8);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00c0, 0x40);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00c1, 0xd0);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00c3, 0x09);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00da, 0x37);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00d1, 0xd8);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00d2, 0xc0);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00d6, 0x60);
+
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00e2, 0x0c);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00e8, 0xff);
+               tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0x00eb, 0x08);
+               msleep(50);
+
+               tm6000_set_reg (dev, REQ_04_EN_DISABLE_MCU_INT, 0x0020, 0x00);
+               msleep(50);
+               tm6000_set_reg (dev, REQ_04_EN_DISABLE_MCU_INT, 0x0020, 0x01);
+               msleep(50);
+               tm6000_set_reg (dev, REQ_04_EN_DISABLE_MCU_INT, 0x0020, 0x00);
+               msleep(100);
+       }
        return 0;
 }
 
@@ -391,6 +416,13 @@ struct reg_init tm6010_init_tab[] = {
 
        { REQ_05_SET_GET_USBREG, 0x18, 0x00 },
 
+       { REQ_07_SET_GET_AVREG, 0xdc, 0xaa },
+       { REQ_07_SET_GET_AVREG, 0xdd, 0x30 },
+       { REQ_07_SET_GET_AVREG, 0xde, 0x20 },
+       { REQ_07_SET_GET_AVREG, 0xdf, 0xd0 },
+       { REQ_04_EN_DISABLE_MCU_INT, 0x02, 0x00 },
+       { REQ_07_SET_GET_AVREG, 0xd8, 0x2f },
+
        /* set remote wakeup key:any key wakeup */
        { REQ_07_SET_GET_AVREG,  0xe5,  0xfe },
        { REQ_07_SET_GET_AVREG,  0xda,  0xff },
@@ -430,57 +462,12 @@ int tm6000_init (struct tm6000_core *dev)
                printk (KERN_ERR "Error %i while retrieving board version\n",board);
        }
 
-       if (dev->dev_type == TM6010) {
-               /* Turn xceive 3028 on */
-               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6010_GPIO_3, 0x01);
-               msleep(11);
-       }
-
-       /* Reset GPIO1 and GPIO4. */
-       for (i=0; i< 2; i++) {
-               rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-                                       dev->tuner_reset_gpio, 0x00);
-               if (rc<0) {
-                       printk (KERN_ERR "Error %i doing GPIO1 reset\n",rc);
-                       return rc;
-               }
+       rc = tm6000_cards_setup(dev);
 
-               msleep(10); /* Just to be conservative */
-               rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-                                       dev->tuner_reset_gpio, 0x01);
-               if (rc<0) {
-                       printk (KERN_ERR "Error %i doing GPIO1 reset\n",rc);
-                       return rc;
-               }
-
-               msleep(10);
-               rc=tm6000_set_reg (dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_4, 0);
-               if (rc<0) {
-                       printk (KERN_ERR "Error %i doing GPIO4 reset\n",rc);
-                       return rc;
-               }
-
-               msleep(10);
-               rc=tm6000_set_reg (dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_4, 1);
-               if (rc<0) {
-                       printk (KERN_ERR "Error %i doing GPIO4 reset\n",rc);
-                       return rc;
-               }
-
-               if (!i) {
-                       rc=tm6000_get_reg16(dev, 0x40,0,0);
-                       if (rc>=0) {
-                               printk ("board=%d\n", rc);
-                       }
-               }
-       }
-
-       msleep(50);
-
-       return 0;
+       return rc;
 }
 
-int tm6000_set_audio_bitrate (struct tm6000_core *dev, int bitrate)
+int tm6000_set_audio_bitrate(struct tm6000_core *dev, int bitrate)
 {
        int val;
 
@@ -504,3 +491,4 @@ printk("Original value=%d\n",val);
 
        return val;
 }
+EXPORT_SYMBOL_GPL(tm6000_set_audio_bitrate);
Full containers within linux kernel