tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[media] bttv: adding Sensoray 611 board to driver

commit affebd4db94b459f676a14d9bb696c3c2b73643d

[media] bttv: adding Sensoray 611 board to bttv driver

Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

sensoray-dev and committed by
Mauro Carvalho Chehab 57437c1d a61f96bc

+7 -6
+1 -1
Documentation/video4linux/CARDLIST.bttv
··· 71 71 70 -> Prolink Pixelview PV-BT878P+ (Rev.4C,8E) 72 72 71 -> Lifeview FlyVideo 98EZ (capture only) LR51 [1851:1851] 73 73 72 -> Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM) [1554:4011] 74 - 73 -> Sensoray 311 [6000:0311] 74 + 73 -> Sensoray 311/611 [6000:0311,6000:0611] 75 75 74 -> RemoteVision MX (RV605) 76 76 75 -> Powercolor MTV878/ MTV878R/ MTV878F 77 77 76 -> Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP) [0e11:0079]
+5 -4
drivers/media/video/bt8xx/bttv-cards.c
··· 284 284 { 0x10b42636, BTTV_BOARD_HAUPPAUGE878, "STB ???" }, 285 285 { 0x217d6606, BTTV_BOARD_WINFAST2000, "Leadtek WinFast TV 2000" }, 286 286 { 0xfff6f6ff, BTTV_BOARD_WINFAST2000, "Leadtek WinFast TV 2000" }, 287 - { 0x03116000, BTTV_BOARD_SENSORAY311, "Sensoray 311" }, 287 + { 0x03116000, BTTV_BOARD_SENSORAY311_611, "Sensoray 311" }, 288 + { 0x06116000, BTTV_BOARD_SENSORAY311_611, "Sensoray 611" }, 288 289 { 0x00790e11, BTTV_BOARD_WINDVR, "Canopus WinDVR PCI" }, 289 290 { 0xa0fca1a0, BTTV_BOARD_ZOLTRIX, "Face to Face Tvmax" }, 290 291 { 0x82b2aa6a, BTTV_BOARD_SIMUS_GVC1100, "SIMUS GVC1100" }, ··· 1527 1526 GPIO20,22,23: R30,R29,R28 1528 1527 */ 1529 1528 }, 1530 - [BTTV_BOARD_SENSORAY311] = { 1529 + [BTTV_BOARD_SENSORAY311_611] = { 1531 1530 /* Clay Kunz <ckunz@mail.arc.nasa.gov> */ 1532 - /* you must jumper JP5 for the card to work */ 1533 - .name = "Sensoray 311", 1531 + /* you must jumper JP5 for the 311 card (PC/104+) to work */ 1532 + .name = "Sensoray 311/611", 1534 1533 .video_inputs = 5, 1535 1534 /* .audio_inputs= 0, */ 1536 1535 .svhs = 4,
+1 -1
drivers/media/video/bt8xx/bttv.h
··· 96 96 #define BTTV_BOARD_PV_BT878P_PLUS 0x46 97 97 #define BTTV_BOARD_FLYVIDEO98EZ 0x47 98 98 #define BTTV_BOARD_PV_BT878P_9B 0x48 99 - #define BTTV_BOARD_SENSORAY311 0x49 99 + #define BTTV_BOARD_SENSORAY311_611 0x49 100 100 #define BTTV_BOARD_RV605 0x4a 101 101 #define BTTV_BOARD_POWERCLR_MTV878 0x4b 102 102 #define BTTV_BOARD_WINDVR 0x4c