aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/bttv-cards.c19
-rw-r--r--drivers/media/video/bttv.h1
2 files changed, 19 insertions, 1 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index adccbbf63dc0..85f19426892b 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -153,6 +153,7 @@ static struct CARD {
153 { 0xff020070, BTTV_BOARD_OSPREY500, "Osprey-500" }, 153 { 0xff020070, BTTV_BOARD_OSPREY500, "Osprey-500" },
154 { 0xff030070, BTTV_BOARD_OSPREY2000, "Osprey-2000" }, 154 { 0xff030070, BTTV_BOARD_OSPREY2000, "Osprey-2000" },
155 { 0xff040070, BTTV_BOARD_OSPREY540, "Osprey-540" }, 155 { 0xff040070, BTTV_BOARD_OSPREY540, "Osprey-540" },
156 { 0xff070070, BTTV_BOARD_OSPREY440, "Osprey-440" },
156 157
157 { 0x00011002, BTTV_BOARD_ATI_TVWONDER, "ATI TV Wonder" }, 158 { 0x00011002, BTTV_BOARD_ATI_TVWONDER, "ATI TV Wonder" },
158 { 0x00031002, BTTV_BOARD_ATI_TVWONDERVE,"ATI TV Wonder/VE" }, 159 { 0x00031002, BTTV_BOARD_ATI_TVWONDERVE,"ATI TV Wonder/VE" },
@@ -2763,7 +2764,23 @@ struct tvcard bttv_tvcards[] = {
2763 .radio_addr = ADDR_UNSET, 2764 .radio_addr = ADDR_UNSET,
2764 .has_radio = 1, 2765 .has_radio = 1,
2765 .has_remote = 1, 2766 .has_remote = 1,
2766 } 2767 },
2768 /* ---- card 0x8c ---------------------------------- */
2769 [BTTV_BOARD_OSPREY440] = {
2770 .name = "Osprey 440",
2771 .video_inputs = 1,
2772 .audio_inputs = 1,
2773 .tuner = -1,
2774 .svhs = 1,
2775 .muxsel = { 2 },
2776 .pll = PLL_28,
2777 .tuner_type = UNSET,
2778 .tuner_addr = ADDR_UNSET,
2779 .radio_addr = ADDR_UNSET,
2780 .no_msp34xx = 1,
2781 .no_tda9875 = 1,
2782 .no_tda7432 = 1,
2783 },
2767}; 2784};
2768 2785
2769static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); 2786static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
diff --git a/drivers/media/video/bttv.h b/drivers/media/video/bttv.h
index a4194e1ea905..75d08a33b107 100644
--- a/drivers/media/video/bttv.h
+++ b/drivers/media/video/bttv.h
@@ -160,6 +160,7 @@
160#define BTTV_BOARD_CONCEPTRONIC_CTVFMI2 0x89 160#define BTTV_BOARD_CONCEPTRONIC_CTVFMI2 0x89
161#define BTTV_BOARD_PV_BT878P_2E 0x8a 161#define BTTV_BOARD_PV_BT878P_2E 0x8a
162#define BTTV_BOARD_PV_M4900 0x8b 162#define BTTV_BOARD_PV_M4900 0x8b
163#define BTTV_BOARD_OSPREY440 0x8c
163 164
164/* i2c address list */ 165/* i2c address list */
165#define I2C_TSA5522 0xc2 166#define I2C_TSA5522 0xc2