Add Terratec Grabster support to tm6000

Commit Message

Holger Nelson Jan. 4, 2011, 7:12 p.m. UTC

None

Patch

diff -urpN --exclude='*~' linux-2.6.37-rc8/drivers/staging/tm6000/tm6000-cards.c linux-lts-backport-natty-2.6.37/drivers/staging/tm6000/tm6000-cards.c
--- linux-2.6.37-rc8/drivers/staging/tm6000/tm6000-cards.c	2010-12-29 02:05:48.000000000 +0100
+++ linux-lts-backport-natty-2.6.37/drivers/staging/tm6000/tm6000-cards.c	2011-01-04 10:46:40.582497722 +0100
@@ -50,6 +50,7 @@ 
  #define TM6010_BOARD_BEHOLD_VOYAGER		11
  #define TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE	12
  #define TM6010_BOARD_TWINHAN_TU501		13
+#define TM5600_BOARD_TERRATEC_GRABSTER		14

  #define TM6000_MAXBOARDS        16
  static unsigned int card[]     = {[0 ... (TM6000_MAXBOARDS - 1)] = UNSET };
@@ -303,6 +304,19 @@  struct tm6000_board tm6000_boards[] = {
  			.dvb_led	= TM6010_GPIO_5,
  			.ir		= TM6010_GPIO_0,
  		},
+	},
+	[TM5600_BOARD_TERRATEC_GRABSTER] = {
+		.name         = "Terratec Grabster Series",
+		.type         = TM5600,
+		.caps = {
+			.has_tuner	= 0,
+			.has_dvb	= 0,
+			.has_zl10353	= 0,
+			.has_eeprom	= 0,
+			.has_remote	= 0,
+		},
+		.gpio = {
+		},
  	}
  };

@@ -325,6 +339,7 @@  struct usb_device_id tm6000_id_table[] =
  	{ 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 },
+	{ USB_DEVICE(0x0ccd, 0x0079), .driver_info = TM5600_BOARD_TERRATEC_GRABSTER },
  	{ },
  };

@@ -505,33 +520,35 @@  int tm6000_cards_setup(struct tm6000_cor
  	 * reset, just add the code at the board-specific part
  	 */

-	if (dev->gpio.tuner_reset) {
-		for (i = 0; i < 2; i++) {
-			rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-						dev->gpio.tuner_reset, 0x00);
-			if (rc < 0) {
-				printk(KERN_ERR "Error %i doing tuner reset\n", rc);
-				return rc;
-			}
+	if (dev->caps.has_tuner||dev->caps.has_dvb) {
+		if (dev->gpio.tuner_reset) {
+			for (i = 0; i < 2; i++) {
+				rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
+							dev->gpio.tuner_reset, 0x00);
+				if (rc < 0) {
+					printk(KERN_ERR "Error %i doing tuner reset\n", rc);
+					return rc;
+				}

-			msleep(10); /* Just to be conservative */
-			rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
-						dev->gpio.tuner_reset, 0x01);
-			if (rc < 0) {
-				printk(KERN_ERR "Error %i doing tuner reset\n", rc);
-				return rc;
-			}
-			msleep(10);
+				msleep(10); /* Just to be conservative */
+				rc = tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN,
+							dev->gpio.tuner_reset, 0x01);
+				if (rc < 0) {
+					printk(KERN_ERR "Error %i doing tuner reset\n", rc);
+					return rc;
+				}
+				msleep(10);

-			if (!i) {
-				rc = tm6000_get_reg32(dev, REQ_40_GET_VERSION, 0, 0);
-				if (rc >= 0)
-					printk(KERN_DEBUG "board=0x%08x\n", rc);
+				if (!i) {
+					rc = tm6000_get_reg32(dev, REQ_40_GET_VERSION, 0, 0);
+					if (rc >= 0)
+						printk(KERN_DEBUG "board=0x%08x\n", rc);
+				}
  			}
+		} else {
+			printk(KERN_ERR "Tuner reset is not configured\n");
+			return -1;
  		}
-	} else {
-		printk(KERN_ERR "Tuner reset is not configured\n");
-		return -1;
  	}

  	msleep(50);