diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-05-26 02:13:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 02:05:03 -0300 |
| commit | 52398efcfa77aeb7e95ef99c9edadd909eb562a5 (patch) | |
| tree | 3f9e7aa81030587f6fad5516705150452afdbbbf | |
| parent | 2de873e630b9385c6cd5896753335c5bf4829f0c (diff) | |
| download | op-kernel-dev-52398efcfa77aeb7e95ef99c9edadd909eb562a5.zip op-kernel-dev-52398efcfa77aeb7e95ef99c9edadd909eb562a5.tar.gz | |
V4L/DVB (4058): Bttv: add autodetection support for Osprey 230
- use eeprom data to detect Osprey 230
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | Documentation/video4linux/CARDLIST.bttv | 2 | ||||
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv index b72706c..b8dde0f 100644 --- a/Documentation/video4linux/CARDLIST.bttv +++ b/Documentation/video4linux/CARDLIST.bttv @@ -87,7 +87,7 @@ 86 -> Osprey 101/151 w/ svid 87 -> Osprey 200/201/250/251 88 -> Osprey 200/250 [0070:ff01] - 89 -> Osprey 210/220 + 89 -> Osprey 210/220/230 90 -> Osprey 500 [0070:ff02] 91 -> Osprey 540 [0070:ff04] 92 -> Osprey 2000 [0070:ff03] diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index e358e91..671f92b 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c @@ -1903,7 +1903,7 @@ struct tvcard bttv_tvcards[] = { .no_tda7432 = 1, }, [BTTV_BOARD_OSPREY2x0] = { - .name = "Osprey 210/220", /* 0x1(A|B)-04C0-C1 */ + .name = "Osprey 210/220/230", /* 0x1(A|B)-04C0-C1 */ .video_inputs = 2, .audio_inputs = 1, .tuner = -1, @@ -3790,6 +3790,7 @@ static void __devinit osprey_eeprom(struct bttv *btv) break; case 0x0060: case 0x0070: + case 0x00A0: btv->c.type = BTTV_BOARD_OSPREY2x0; /* enable output on select control lines */ gpio_inout(0xffffff,0x000303); |
