aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorAlexander Wold <awold@bigfoot.com>2005-11-09 00:36:58 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:13 -0500
commit0bcc37c328ac66ede45a6672f85795eee0b05b87 (patch)
tree1544e4691b291a7c95252a329593470e2f7b0d3a /drivers/media/video
parentafce892f66c196989fe7d938150201d337c553e5 (diff)
[PATCH] v4l: 705: added kworld vstream expertdvd
- Added Kworld Vstream ExpertDVD. Signed-off-by: Alexander Wold <awold@bigfoot.com> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx88/cx88-cards.c20
-rw-r--r--drivers/media/video/cx88/cx88.h1
2 files changed, 21 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 5a85802047f9..888d25d48416 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -803,6 +803,26 @@ struct cx88_board cx88_boards[] = {
803 .gpio0 = 0x0000cdf3, 803 .gpio0 = 0x0000cdf3,
804 }, 804 },
805 }, 805 },
806 [CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD] = {
807 /* Alexander Wold <awold@bigfoot.com> */
808 .name = "Kworld V-Stream Xpert DVD",
809 .tuner_type = UNSET,
810 .input = {{
811 .type = CX88_VMUX_COMPOSITE1,
812 .vmux = 1,
813 .gpio0 = 0x03000000,
814 .gpio1 = 0x01000000,
815 .gpio2 = 0x02000000,
816 .gpio3 = 0x00100000,
817 },{
818 .type = CX88_VMUX_SVIDEO,
819 .vmux = 2,
820 .gpio0 = 0x03000000,
821 .gpio1 = 0x01000000,
822 .gpio2 = 0x02000000,
823 .gpio3 = 0x00100000,
824 }},
825 },
806}; 826};
807const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); 827const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
808 828
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index bd27b56ace26..9b629221e799 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -175,6 +175,7 @@ extern struct sram_channel cx88_sram_channels[];
175#define CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1 30 175#define CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1 30
176#define CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD 31 176#define CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD 31
177#define CX88_BOARD_AVERMEDIA_ULTRATV_MC_550 32 177#define CX88_BOARD_AVERMEDIA_ULTRATV_MC_550 32
178#define CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD 33
178 179
179enum cx88_itype { 180enum cx88_itype {
180 CX88_VMUX_COMPOSITE1 = 1, 181 CX88_VMUX_COMPOSITE1 = 1,