---

yaml --- r: 13394 b: refs/heads/master c: fe2e36c h: refs/heads/master v: v3
git-mirror · Nov 9, 2005 · f21313a · f21313a
1 parent 028565e
commit f21313a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28f0224170c4d8115383f56985575a42ed8b4dc1
+refs/heads/master: fe2e36c8cdc81bea8edf7d0408a1f49da01e16ee
diff --git a/trunk/Documentation/video4linux/CARDLIST.saa7134 b/trunk/Documentation/video4linux/CARDLIST.saa7134
@@ -77,3 +77,4 @@
  76 -> SKNet MonsterTV Mobile                   [1131:4ee9]
  77 -> Pinnacle PCTV 110i (saa7133)             [11bd:002e]
  78 -> ASUSTeK P7131 Dual                       [1043:4862]
+ 79 -> PCTV Cardbus TV/Radio (ITO25 Rev:2B)
diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c
@@ -2446,6 +2446,21 @@ struct saa7134_board saa7134_boards[] = {
 			.gpio = 0x0200000,
 		},
 	},
+	[SAA7134_BOARD_PCTV_CARDBUS] = {
+		/* Paul Tom Zalac <pzalac@gmail.com> */
+		/* tda8275a tuner doesnt work yet */
+		.name           = "PCTV Cardbus TV/Radio (ITO25 Rev:2B)",
+		.audio_clock    = 0x00187de7,
+		.tuner_type     = TUNER_ABSENT,
+		.radio_type     = UNSET,
+		.tuner_addr     = ADDR_UNSET,
+		.radio_addr     = ADDR_UNSET,
+		.inputs         = {{
+			.name = name_comp1,
+			.vmux = 1,
+			.amux = LINE2,
+		}},
+	},
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2973,6 +2988,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
 	case SAA7134_BOARD_AVACSSMARTTV:
 	case SAA7134_BOARD_GOTVIEW_7135:
 	case SAA7134_BOARD_KWORLD_TERMINATOR:
+	case SAA7134_BOARD_PCTV_CARDBUS:
 		dev->has_remote = 1;
 		break;
 	case SAA7134_BOARD_MD5044:

diff --git a/trunk/drivers/media/video/saa7134/saa7134.h b/trunk/drivers/media/video/saa7134/saa7134.h
@@ -206,6 +206,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_MONSTERTV_MOBILE 76
 #define SAA7134_BOARD_PINNACLE_PCTV_110i 77
 #define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78
+#define SAA7134_BOARD_PCTV_CARDBUS     79
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8