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

Commit 206313db authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (12740): em28xx: better describe vinctrl registers 



Properly document the video input control register, in preparation for the
addition of VBI support.  Note this patch makes no functional changes.

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent df72f32a

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

+2 −1
Original line number Diff line number Diff line
@@ -2570,7 +2570,8 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, 
	 * Default format, used for tvp5150 or saa711x output formats

	 */

	dev->vinmode = 0x10;

	dev->vinctl  = 0x11;

	dev->vinctl  = EM28XX_VINCTRL_INTERLACED |

		       EM28XX_VINCTRL_CCIR656_ENABLE;



	/* Do board specific init and eeprom reading */

	em28xx_card_setup(dev);

drivers/media/video/em28xx/em28xx-reg.h

+12 −0
Original line number Diff line number Diff line
@@ -86,7 +86,19 @@ 
#define EM28XX_XCLK_FREQUENCY_24MHZ	0x0b



#define EM28XX_R10_VINMODE	0x10



#define EM28XX_R11_VINCTRL	0x11



/* em28xx Video Input Control Register 0x11 */

#define EM28XX_VINCTRL_VBI_SLICED	0x80

#define EM28XX_VINCTRL_VBI_RAW		0x40

#define EM28XX_VINCTRL_VOUT_MODE_IN	0x20 /* HREF,VREF,VACT in output */

#define EM28XX_VINCTRL_CCIR656_ENABLE	0x10

#define EM28XX_VINCTRL_VBI_16BIT_RAW	0x08 /* otherwise 8-bit raw */

#define EM28XX_VINCTRL_FID_ON_HREF	0x04

#define EM28XX_VINCTRL_DUAL_EDGE_STROBE	0x02

#define EM28XX_VINCTRL_INTERLACED	0x01



#define EM28XX_R12_VINENABLE	0x12	/* */



#define EM28XX_R14_GAMMA	0x14