---

yaml --- r: 192983 b: refs/heads/master c: b57f432 h: refs/heads/master i: 192981: 79b1886 192979: bad95fc 192975: fe15175 v: v3
git-mirror · May 19, 2010 · b67f1b7 · b67f1b7
1 parent 507c1f9
commit b67f1b7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2edab1ee86e5aff83404d6a42b6c54d40981faae
+refs/heads/master: b57f432c28403b53a298803272b874c1c333f22e
diff --git a/trunk/drivers/staging/tm6000/tm6000-cards.c b/trunk/drivers/staging/tm6000/tm6000-cards.c
@@ -109,12 +109,22 @@ struct tm6000_board tm6000_boards[] = {
 		.type         = TM6010,
 		.tuner_type   = TUNER_XC2028,
 		.tuner_addr   = 0xc2 >> 1,
+		.demod_addr   = 0x1e >> 1,
 		.caps = {
 			.has_tuner	= 1,
 			.has_dvb	= 1,
+			.has_zl10353	= 1,
+			.has_eeprom	= 1,
+			.has_remote	= 1,
 		},
 		.gpio = {
-			.tuner_reset	= TM6010_GPIO_4,
+			.tuner_reset	= TM6010_GPIO_2,
+			.tuner_on	= TM6010_GPIO_3,
+			.demod_reset	= TM6010_GPIO_1,
+			.demod_on	= TM6010_GPIO_4,
+			.power_led	= TM6010_GPIO_7,
+			.dvb_led	= TM6010_GPIO_5,
+			.ir		= TM6010_GPIO_0,
 		},
 	},
 	[TM5600_BOARD_10MOONS_UT821] = {
@@ -400,6 +410,7 @@ int tm6000_cards_setup(struct tm6000_core *dev)
 	case TM6010_BOARD_HAUPPAUGE_900H:
 	case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE:
 	case TM6010_BOARD_TWINHAN_TU501:
+	case TM6010_BOARD_GENERIC:
 		/* Turn xceive 3028 on */
 		tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, dev->gpio.tuner_on, 0x01);
 		msleep(15);