Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45632c4f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] v4l: 863: added pinnacle dazzle dvc 90 



- Added Pinnacle Dazzle DVC 90

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 07eef6ce

Documentation/video4linux/CARDLIST.em28xx

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ 
  6 -> Terratec Cinergy 200 USB                 (em2800)

  7 -> Leadtek Winfast USB II                   (em2800)

  8 -> Kworld USB2800                           (em2800)

  9 -> Pinnacle Dazzle DVC 90                   (em2820/em2840) [2304:0207]

drivers/media/video/em28xx/em28xx-cards.c

+20 −0
Original line number Diff line number Diff line
@@ -227,6 +227,22 @@ struct em2820_board em2820_boards[] = { 
			.amux     = 1,

		}},

	},

	[EM2820_BOARD_PINNACLE_DVC_90] = {

		.name         = "Pinnacle Dazzle DVC 90",

		.vchannels    = 3,

		.norm         = VIDEO_MODE_PAL,

		.has_tuner    = 0,

		.decoder      = EM2820_SAA7113,

		.input          = {{

			.type     = EM2820_VMUX_COMPOSITE1,

			.vmux     = 0,

			.amux     = 1,

		},{

			.type     = EM2820_VMUX_SVIDEO,

			.vmux     = 9,

			.amux     = 1,

		}},

	},

};

const unsigned int em2820_bcount = ARRAY_SIZE(em2820_boards);
@@ -237,6 +253,7 @@ struct usb_device_id em2820_id_table [] = { 
	{ USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 },

	{ USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 },

	{ USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },

	{ USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },

	{ },

};
@@ -258,6 +275,9 @@ void em2820_card_setup(struct em2820 *dev) 
		if (tv.audio_processor == AUDIO_CHIP_MSP34XX) {

			dev->has_msp34xx=1;

		} else dev->has_msp34xx=0;

		em2820_write_regs_req(dev,0x06,0x00,"\x40",1);// Serial Bus Frequency Select Register

		em2820_write_regs_req(dev,0x0f,0x00,"\x87",1);// XCLK Frequency Select Register

		em2820_write_regs_req(dev,0x88,0x0d,"\xd0",1);

	}

}

drivers/media/video/em28xx/em28xx.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#define EM2800_BOARD_TERRATEC_CINERGY_200       6

#define EM2800_BOARD_LEADTEK_WINFAST_USBII      7

#define EM2800_BOARD_KWORLD_USB2800             8

#define EM2820_BOARD_PINNACLE_DVC_90		9



#define UNSET -1