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>

diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index b72706c58a442bdb744fb34f74340b1de0337b29..b8dde0fb9be7e2d3f53eeba069aefacfd1d0c38b 100644 (file)
--- 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 e358e91143d77b0a9de6cfe29e8fcbf7dcc3b700..671f92b1df18b094cfeaa03d5824e9ca2871ce86 100644 (file)
--- 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);