V4L/DVB: tm6000: switch to gpio strcut

[karo-tx-linux.git] / drivers / staging / tm6000 / tm6000-cards.c

diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index e09d75707714217f6bcfee9b9f562bb6009c4436..e43a4c4df2368223aa40014252577b6372921613 100644 (file)
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/drivers/staging/tm6000/tm6000-cards.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-cards.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-cards.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org>
 
@@ -47,6 +47,7 @@
 #define TM6010_BOARD_BEHOLD_WANDER             10
 #define TM6010_BOARD_BEHOLD_VOYAGER            11
 #define TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE        12
+#define TM6010_BOARD_TWINHAN_TU501             13
 
 #define TM6000_MAXBOARDS        16
 static unsigned int card[]     = {[0 ... (TM6000_MAXBOARDS - 1)] = UNSET };
@@ -65,7 +66,8 @@ struct tm6000_board {
        int             tuner_type;     /* type of the tuner */
        int             tuner_addr;     /* tuner address */
        int             demod_addr;     /* demodulator address */
-       int             gpio_addr_tun_reset;    /* GPIO used for tuner reset */
+
+       struct tm6000_gpio gpio;
 };
 
 struct tm6000_board tm6000_boards[] = {
@@ -74,7 +76,9 @@ struct tm6000_board tm6000_boards[] = {
                .caps = {
                        .has_tuner    = 1,
                },
-               .gpio_addr_tun_reset = TM6000_GPIO_1,
+               .gpio = {
+                       .tuner_reset    = TM6000_GPIO_1,
+               },
        },
        [TM5600_BOARD_GENERIC] = {
                .name         = "Generic tm5600 board",
@@ -84,7 +88,9 @@ struct tm6000_board tm6000_boards[] = {
                .caps = {
                        .has_tuner      = 1,
                },
-               .gpio_addr_tun_reset = TM6000_GPIO_1,
+               .gpio = {
+                       .tuner_reset    = TM6000_GPIO_1,
+               },
        },
        [TM6000_BOARD_GENERIC] = {
                .name         = "Generic tm6000 board",
@@ -94,7 +100,9 @@ struct tm6000_board tm6000_boards[] = {
                        .has_tuner      = 1,
                        .has_dvb        = 1,
                },
-               .gpio_addr_tun_reset = TM6000_GPIO_1,
+               .gpio = {
+                       .tuner_reset    = TM6000_GPIO_1,
+               },
        },
        [TM6010_BOARD_GENERIC] = {
                .name         = "Generic tm6010 board",
@@ -105,7 +113,9 @@ struct tm6000_board tm6000_boards[] = {
                        .has_tuner      = 1,
                        .has_dvb        = 1,
                },
-               .gpio_addr_tun_reset = TM6010_GPIO_4,
+               .gpio = {
+                       .tuner_reset    = TM6010_GPIO_4,
+               },
        },
        [TM5600_BOARD_10MOONS_UT821] = {
                .name         = "10Moons UT 821",
@@ -116,7 +126,9 @@ struct tm6000_board tm6000_boards[] = {
                        .has_tuner    = 1,
                        .has_eeprom   = 1,
                },
-               .gpio_addr_tun_reset = TM6000_GPIO_1,
+               .gpio = {
+                       .tuner_reset    = TM6000_GPIO_1,
+               },
        },
        [TM5600_BOARD_10MOONS_UT330] = {
                .name         = "10Moons UT 330",
@@ -153,7 +165,9 @@ struct tm6000_board tm6000_boards[] = {
                        .has_eeprom   = 0,
                        .has_remote   = 1,
                },
-               .gpio_addr_tun_reset = TM6000_GPIO_4,
+               .gpio = {
+                       .tuner_reset    = TM6000_GPIO_4,
+               },
        },
        [TM6000_BOARD_ADSTECH_MINI_DUAL_TV] = {
                .name         = "ADSTECH Mini Dual TV USB",
@@ -166,10 +180,12 @@ struct tm6000_board tm6000_boards[] = {
                        .has_zl10353  = 1,
                        .has_eeprom   = 0,
                },
-               .gpio_addr_tun_reset = TM6000_GPIO_4,
+               .gpio = {
+                       .tuner_reset    = TM6000_GPIO_4,
+               },
        },
        [TM6010_BOARD_HAUPPAUGE_900H] = {
-               .name         = "Hauppauge HVR-900H",
+               .name         = "Hauppauge WinTV HVR-900H / WinTV USB2-Stick",
                .tuner_type   = TUNER_XC2028, /* has a XC3028 */
                .tuner_addr   = 0xc2 >> 1,
                .demod_addr   = 0x1e >> 1,
@@ -180,7 +196,9 @@ struct tm6000_board tm6000_boards[] = {
                        .has_zl10353  = 1,
                        .has_eeprom   = 1,
                },
-               .gpio_addr_tun_reset = TM6000_GPIO_2,
+               .gpio = {
+                       .tuner_reset    = TM6010_GPIO_2,
+               },
        },
        [TM6010_BOARD_BEHOLD_WANDER] = {
                .name         = "Beholder Wander DVB-T/TV/FM USB2.0",
@@ -195,7 +213,9 @@ struct tm6000_board tm6000_boards[] = {
                        .has_eeprom   = 1,
                        .has_remote   = 1,
                },
-               .gpio_addr_tun_reset = TM6000_GPIO_2,
+               .gpio = {
+                       .tuner_reset    = TM6000_GPIO_2,
+               },
        },
        [TM6010_BOARD_BEHOLD_VOYAGER] = {
                .name         = "Beholder Voyager TV/FM USB2.0",
@@ -209,10 +229,12 @@ struct tm6000_board tm6000_boards[] = {
                        .has_eeprom   = 1,
                        .has_remote   = 1,
                },
-               .gpio_addr_tun_reset = TM6000_GPIO_2,
+               .gpio = {
+                       .tuner_reset    = TM6000_GPIO_2,
+               },
        },
        [TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE] = {
-               .name         = "Terratec Cinergy Hybrid XE",
+               .name         = "Terratec Cinergy Hybrid XE / Cinergy Hybrid-Stick",
                .tuner_type   = TUNER_XC2028, /* has a XC3028 */
                .tuner_addr   = 0xc2 >> 1,
                .demod_addr   = 0x1e >> 1,
@@ -224,7 +246,26 @@ struct tm6000_board tm6000_boards[] = {
                        .has_eeprom   = 1,
                        .has_remote   = 1,
                },
-               .gpio_addr_tun_reset = TM6010_GPIO_2,
+               .gpio = {
+                       .tuner_reset    = TM6010_GPIO_2,
+               },
+       },
+       [TM6010_BOARD_TWINHAN_TU501] = {
+               .name         = "Twinhan TU501(704D1)",
+               .tuner_type   = TUNER_XC2028, /* has a XC3028 */
+               .tuner_addr   = 0xc2 >> 1,
+               .demod_addr   = 0x1e >> 1,
+               .type         = TM6010,
+               .caps = {
+                       .has_tuner    = 1,
+                       .has_dvb      = 1,
+                       .has_zl10353  = 1,
+                       .has_eeprom   = 1,
+                       .has_remote   = 1,
+               },
+               .gpio = {
+                       .tuner_reset    = TM6010_GPIO_2,
+               },
        }
 };
 
@@ -236,9 +277,17 @@ struct usb_device_id tm6000_id_table [] = {
        { USB_DEVICE(0x14aa, 0x0620), .driver_info = TM6000_BOARD_FREECOM_AND_SIMILAR },
        { USB_DEVICE(0x06e1, 0xb339), .driver_info = TM6000_BOARD_ADSTECH_MINI_DUAL_TV },
        { USB_DEVICE(0x2040, 0x6600), .driver_info = TM6010_BOARD_HAUPPAUGE_900H },
+       { USB_DEVICE(0x2040, 0x6601), .driver_info = TM6010_BOARD_HAUPPAUGE_900H },
+       { USB_DEVICE(0x2040, 0x6610), .driver_info = TM6010_BOARD_HAUPPAUGE_900H },
+       { USB_DEVICE(0x2040, 0x6611), .driver_info = TM6010_BOARD_HAUPPAUGE_900H },
        { USB_DEVICE(0x6000, 0xdec0), .driver_info = TM6010_BOARD_BEHOLD_WANDER },
        { USB_DEVICE(0x6000, 0xdec1), .driver_info = TM6010_BOARD_BEHOLD_VOYAGER },
        { USB_DEVICE(0x0ccd, 0x0086), .driver_info = TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE },
+       { USB_DEVICE(0x0ccd, 0x00A5), .driver_info = TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE },
+       { USB_DEVICE(0x13d3, 0x3240), .driver_info = TM6010_BOARD_TWINHAN_TU501 },
+       { USB_DEVICE(0x13d3, 0x3241), .driver_info = TM6010_BOARD_TWINHAN_TU501 },
+       { USB_DEVICE(0x13d3, 0x3243), .driver_info = TM6010_BOARD_TWINHAN_TU501 },
+       { USB_DEVICE(0x13d3, 0x3264), .driver_info = TM6010_BOARD_TWINHAN_TU501 },
        { },
 };
 
@@ -269,12 +318,30 @@ int tm6000_tuner_callback(void *ptr, int component, int command, int arg)
                /* Reset codes during load firmware */
                switch (arg) {
                case 0:
-                       tm6000_set_reg (dev, REQ_03_SET_GET_MCU_PIN,
-                                       dev->tuner_reset_gpio, 0x00);
-                       msleep(130);
-                       tm6000_set_reg (dev, REQ_03_SET_GET_MCU_PIN,
-                                       dev->tuner_reset_gpio, 0x01);
-                       msleep(130);
+                       /* newer tuner can faster reset */
+                       switch (dev->model) {
+                       case TM6010_BOARD_HAUPPAUGE_900H:
+                       case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE:
+                       case TM6010_BOARD_TWINHAN_TU501:
+                               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
+                                              dev->gpio.tuner_reset, 0x01);
+                               msleep(60);
+                               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
+                                              dev->gpio.tuner_reset, 0x00);
+                               msleep(75);
+                               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
+                                              dev->gpio.tuner_reset, 0x01);
+                               msleep(60);
+                               break;
+                       default:
+                               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
+                                              dev->gpio.tuner_reset, 0x00);
+                               msleep(130);
+                               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
+                                              dev->gpio.tuner_reset, 0x01);
+                               msleep(130);
+                               break;
+                       }
                        break;
                case 1:
                        tm6000_set_reg (dev, REQ_04_EN_DISABLE_MCU_INT,
@@ -312,9 +379,34 @@ int tm6000_cards_setup(struct tm6000_core *dev)
         */
        switch (dev->model) {
        case TM6010_BOARD_HAUPPAUGE_900H:
+       case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE:
+       case TM6010_BOARD_TWINHAN_TU501:
                /* Turn xceive 3028 on */
                tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6010_GPIO_3, 0x01);
-               msleep(11);
+               msleep(15);
+               /* Turn zarlink zl10353 on */
+               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6010_GPIO_4, 0x00);
+               msleep(15);
+               /* Reset zarlink zl10353 */
+               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6010_GPIO_1, 0x00);
+               msleep(50);
+               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6010_GPIO_1, 0x01);
+               msleep(15);
+               /* Turn zarlink zl10353 off */
+               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6010_GPIO_4, 0x01);
+               msleep(15);
+               /* ir ? */
+               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6010_GPIO_0, 0x01);
+               msleep(15);
+               /* Power led on (blue) */
+               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6010_GPIO_7, 0x00);
+               msleep(15);
+               /* DVB led off (orange) */
+               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6010_GPIO_5, 0x01);
+               msleep(15);
+               /* Turn zarlink zl10353 on */
+               tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6010_GPIO_4, 0x00);
+               msleep(15);
                break;
        default:
                break;
@@ -329,7 +421,7 @@ int tm6000_cards_setup(struct tm6000_core *dev)
         */
        for (i = 0; i < 2; i++) {
                rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-                                       dev->tuner_reset_gpio, 0x00);
+                                       dev->gpio.tuner_reset, 0x00);
                if (rc < 0) {
                        printk(KERN_ERR "Error %i doing GPIO1 reset\n", rc);
                        return rc;
@@ -337,7 +429,7 @@ int tm6000_cards_setup(struct tm6000_core *dev)
 
                msleep(10); /* Just to be conservative */
                rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-                                       dev->tuner_reset_gpio, 0x01);
+                                       dev->gpio.tuner_reset, 0x01);
                if (rc < 0) {
                        printk(KERN_ERR "Error %i doing GPIO1 reset\n", rc);
                        return rc;
@@ -404,6 +496,7 @@ static void tm6000_config_tuner (struct tm6000_core *dev)
                switch(dev->model) {
                case TM6010_BOARD_HAUPPAUGE_900H:
                case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE:
+               case TM6010_BOARD_TWINHAN_TU501:
                        ctl.fname = "xc3028L-v36.fw";
                        break;
                default:
@@ -433,7 +526,8 @@ static int tm6000_init_dev(struct tm6000_core *dev)
        dev->dev_type   = tm6000_boards[dev->model].type;
        dev->tuner_type = tm6000_boards[dev->model].tuner_type;
        dev->tuner_addr = tm6000_boards[dev->model].tuner_addr;
-       dev->tuner_reset_gpio = tm6000_boards[dev->model].gpio_addr_tun_reset;
+
+       dev->gpio = tm6000_boards[dev->model].gpio;
 
        dev->demod_addr = tm6000_boards[dev->model].demod_addr;
 
@@ -453,11 +547,6 @@ static int tm6000_init_dev(struct tm6000_core *dev)
        if (rc<0)
                goto err;
 
-       /* register and initialize V4L2 */
-       rc=tm6000_v4l2_register(dev);
-       if (rc<0)
-               goto err;
-
        /* Default values for STD and resolutions */
        dev->width = 720;
        dev->height = 480;
@@ -480,12 +569,18 @@ static int tm6000_init_dev(struct tm6000_core *dev)
                v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
                        "tvaudio", "tvaudio", I2C_ADDR_TDA9874, NULL);
 
+       /* register and initialize V4L2 */
+       rc=tm6000_v4l2_register(dev);
+       if (rc<0)
+               goto err;
+
        if(dev->caps.has_dvb) {
                dev->dvb = kzalloc(sizeof(*(dev->dvb)), GFP_KERNEL);
                if(!dev->dvb) {
                        rc = -ENOMEM;
                        goto err2;
                }
+
 #ifdef CONFIG_VIDEO_TM6000_DVB
                rc = tm6000_dvb_register(dev);
                if(rc < 0) {
@@ -495,6 +590,7 @@ static int tm6000_init_dev(struct tm6000_core *dev)
                }
 #endif
        }
+       mutex_unlock(&dev->lock);
        return 0;
 
 err2:
@@ -752,6 +848,6 @@ static void __exit tm6000_module_exit(void)
 module_init(tm6000_module_init);
 module_exit(tm6000_module_exit);
 
-MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000 USB2 adapter");
+MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000/TM6010 USB2 adapter");
 MODULE_AUTHOR("Mauro Carvalho Chehab");
 MODULE_LICENSE("GPL");