Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 13365
b: refs/heads/master
c: 71633c0
h: refs/heads/master
i:
  13363: b43b26f
v: v3
  • Loading branch information
nshmyrev@yandex.ru authored and Linus Torvalds committed Nov 9, 2005
1 parent 37678fc commit c60cb36
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 16f2e6229f6f7b89cb42f4942cb46dc645faae2a
refs/heads/master: 71633c05724d85f1afb87629bb96fdf2ef18b41f
1 change: 1 addition & 0 deletions trunk/Documentation/video4linux/CARDLIST.bttv
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,4 @@
138 -> Prolink Pixelview PV-BT878P+ (Rev.2E)
139 -> Prolink PixelView PlayTV MPEG2 PV-M4900
140 -> Osprey 440 [0070:ff07]
141 -> Asound Skyeye PCTV
17 changes: 17 additions & 0 deletions trunk/drivers/media/video/bttv-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -2781,6 +2781,23 @@ struct tvcard bttv_tvcards[] = {
.no_tda9875 = 1,
.no_tda7432 = 1,
},
/* ---- card 0x8d ---------------------------------- */
[BTTV_BOARD_ASOUND_SKYEYE] = {
.name = "Asound Skyeye PCTV",
.video_inputs = 3,
.audio_inputs = 1,
.tuner = 0,
.svhs = 2,
.gpiomask = 15,
.muxsel = { 2, 3, 1, 1},
.audiomux = {2,0,0,0,1},
.needs_tvaudio = 1,
.pll = PLL_28,
.tuner_type = 2,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
},

};

static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/media/video/bttv.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
#define BTTV_BOARD_PV_BT878P_2E 0x8a
#define BTTV_BOARD_PV_M4900 0x8b
#define BTTV_BOARD_OSPREY440 0x8c
#define BTTV_BOARD_ASOUND_SKYEYE 0x8d

/* i2c address list */
#define I2C_TSA5522 0xc2
Expand Down

0 comments on commit c60cb36

Please sign in to comment.