From 9511f228692db84c8b8e3099c9d415933c385de3 Mon Sep 17 00:00:00 2001
From: Angelo Marconi <am@massalombarda.net>
Date: Tue, 9 May 2006 18:27:48 -0300
Subject: [PATCH] --- yaml --- r: 29965 b: refs/heads/master c:
 a31246220c4681387799d435ee1d48e65db6d5f6 h: refs/heads/master i:   29963:
 b65ffdaabb528a7893488827546ebd42ab997fe3 v: v3

---
 [refs]                                        |  2 +-
 trunk/Documentation/video4linux/CARDLIST.cx88 |  1 +
 trunk/drivers/media/video/cx88/cx88-cards.c   | 20 +++++++++++++++++++
 trunk/drivers/media/video/cx88/cx88-tvaudio.c |  1 +
 trunk/drivers/media/video/cx88/cx88.h         |  1 +
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 065adac4c7f5..5da606608257 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8397703ee0cc9ca27df5c058f60c4d4f1dc69595
+refs/heads/master: a31246220c4681387799d435ee1d48e65db6d5f6
diff --git a/trunk/Documentation/video4linux/CARDLIST.cx88 b/trunk/Documentation/video4linux/CARDLIST.cx88
index db091e817227..249885c6c662 100644
--- a/trunk/Documentation/video4linux/CARDLIST.cx88
+++ b/trunk/Documentation/video4linux/CARDLIST.cx88
@@ -47,3 +47,4 @@
  46 -> DViCO FusionHDTV DVB-T Hybrid                       [18ac:db40,18ac:db44]
  47 -> pcHDTV HD5500 HDTV                                  [7063:5500]
  48 -> Kworld MCE 200 Deluxe                               [17de:0841]
+ 49 -> PixelView PlayTV P7000                              [1554:4813]
diff --git a/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c
index 7199169cd14f..16cd6434f2b1 100644
--- a/trunk/drivers/media/video/cx88/cx88-cards.c
+++ b/trunk/drivers/media/video/cx88/cx88-cards.c
@@ -1132,6 +1132,22 @@ struct cx88_board cx88_boards[] = {
 		}},
 		.blackbird = 1,
 	},
+	[CX88_BOARD_PIXELVIEW_PLAYTV_P7000] = {
+		/* FIXME: SVideo, Composite and FM inputs are untested */
+		.name           = "PixelView PlayTV P7000",
+		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+		.radio_type     = UNSET,
+		.tuner_addr	= ADDR_UNSET,
+		.radio_addr	= ADDR_UNSET,
+		.tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE |
+				  TDA9887_PORT2_ACTIVE,
+		.input          = {{
+			.type   = CX88_VMUX_TELEVISION,
+			.vmux   = 0,
+			.gpio0  = 0x5da6,
+		}},
+		.blackbird = 1,
+	},
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -1361,6 +1377,10 @@ struct cx88_subid cx88_subids[] = {
 		.subvendor = 0x1822,
 		.subdevice = 0x0019,
 		.card      = CX88_BOARD_DNTV_LIVE_DVB_T_PRO,
+	},{
+		.subvendor = 0x1554,
+		.subdevice = 0x4813,
+		.card      = CX88_BOARD_PIXELVIEW_PLAYTV_P7000,
 	},
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/trunk/drivers/media/video/cx88/cx88-tvaudio.c b/trunk/drivers/media/video/cx88/cx88-tvaudio.c
index 04d0635695d7..256ae8515d2b 100644
--- a/trunk/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/trunk/drivers/media/video/cx88/cx88-tvaudio.c
@@ -152,6 +152,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
 		case CX88_BOARD_HAUPPAUGE_ROSLYN:
 		case CX88_BOARD_KWORLD_MCE200_DELUXE:
 		case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
+		case CX88_BOARD_PIXELVIEW_PLAYTV_P7000:
 			cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
 			break;
 		default:
diff --git a/trunk/drivers/media/video/cx88/cx88.h b/trunk/drivers/media/video/cx88/cx88.h
index 411bb9f39c77..663def46f67c 100644
--- a/trunk/drivers/media/video/cx88/cx88.h
+++ b/trunk/drivers/media/video/cx88/cx88.h
@@ -191,6 +191,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID 46
 #define CX88_BOARD_PCHDTV_HD5500           47
 #define CX88_BOARD_KWORLD_MCE200_DELUXE    48
+#define CX88_BOARD_PIXELVIEW_PLAYTV_P7000  49
 
 enum cx88_itype {
 	CX88_VMUX_COMPOSITE1 = 1,