---

yaml --- r: 13323 b: refs/heads/master c: f718e6e h: refs/heads/master i: 13321: 54a1afa 13319: fd5c936 v: v3
git-mirror · Nov 9, 2005 · e91e7c2 · e91e7c2
1 parent 18f0944
commit e91e7c2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1eaad5b113811db7fdb6d02e1c8d9ff7c8ba6919
+refs/heads/master: f718e6e7a2c402195f3d2944605ef4b01e8e3347
diff --git a/trunk/drivers/media/video/bttv-cards.c b/trunk/drivers/media/video/bttv-cards.c
@@ -153,6 +153,7 @@ static struct CARD {
 	{ 0xff020070, BTTV_BOARD_OSPREY500,     "Osprey-500" },
 	{ 0xff030070, BTTV_BOARD_OSPREY2000,    "Osprey-2000" },
 	{ 0xff040070, BTTV_BOARD_OSPREY540,     "Osprey-540" },
+	{ 0xff070070, BTTV_BOARD_OSPREY440,     "Osprey-440" },
 
 	{ 0x00011002, BTTV_BOARD_ATI_TVWONDER,  "ATI TV Wonder" },
 	{ 0x00031002, BTTV_BOARD_ATI_TVWONDERVE,"ATI TV Wonder/VE" },
@@ -2763,7 +2764,23 @@ struct tvcard bttv_tvcards[] = {
 		.radio_addr     = ADDR_UNSET,
 		.has_radio      = 1,
 		.has_remote     = 1,
-	}
+	},
+    	    /* ---- card 0x8c ---------------------------------- */
+	[BTTV_BOARD_OSPREY440]  = {
+		.name           = "Osprey 440",
+		.video_inputs   = 1,
+		.audio_inputs   = 1,
+		.tuner          = -1,
+		.svhs           = 1,
+		.muxsel         = { 2 },
+		.pll            = PLL_28,
+		.tuner_type     = UNSET,
+		.tuner_addr     = ADDR_UNSET,
+		.radio_addr     = ADDR_UNSET,
+		.no_msp34xx     = 1,
+		.no_tda9875     = 1,
+		.no_tda7432     = 1,
+	},
 };
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);

diff --git a/trunk/drivers/media/video/bttv.h b/trunk/drivers/media/video/bttv.h
@@ -160,6 +160,7 @@
 #define BTTV_BOARD_CONCEPTRONIC_CTVFMI2 0x89
 #define BTTV_BOARD_PV_BT878P_2E   0x8a
 #define BTTV_BOARD_PV_M4900       0x8b
+#define BTTV_BOARD_OSPREY440     0x8c
 
 /* i2c address list */
 #define I2C_TSA5522        0xc2