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

Commit 30556b23 authored by Markus Rechberger's avatar Markus Rechberger Committed by Linus Torvalds
Browse files

[PATCH] v4l: 840: fixed settings for msi vox usb 2.0 saa7114 is missing atm 



- Fixed settings for MSI Vox USB 2.0 (saa7114 is missing atm)

Signed-off-by: default avatarMarkus Rechberger <mrechberger@gmail.com>
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 08eca13d

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

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ struct em2820_board em2820_boards[] = { 
		.decoder        = EM2820_SAA7114,

		.input          = {{

			.type     = EM2820_VMUX_TELEVISION,

			.vmux     = 2,

			.vmux     = 4,

			.amux     = 0,

		},{

			.type     = EM2820_VMUX_COMPOSITE1,

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

+3 −0
Original line number Diff line number Diff line
@@ -437,6 +437,9 @@ static int attach_inform(struct i2c_client *client) 
		case 0x86:

			em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);

			break;

		case 0x42:

			dprintk1(1,"attach_inform: saa7114 detected.\n");

			break;

		case 0x4a:

			dprintk1(1,"attach_inform: saa7113 detected.\n");

			break;

drivers/media/video/em28xx/em28xx.h

+12 −2
Original line number Diff line number Diff line
@@ -493,10 +493,20 @@ inline static int em2820_gamma_set(struct em2820 *dev, s32 val) 
}



/*FIXME: maxw should be dependent of alt mode */

#define norm_maxw(dev) 720

inline static unsigned int norm_maxw(struct em2820 *dev)

{

	switch(dev->model){

		case (EM2820_BOARD_MSI_VOX_USB_2): return(640);

		default: return(720);

	}

}



inline static unsigned int norm_maxh(struct em2820 *dev)

{

	return (dev->tvnorm->id & V4L2_STD_625_50) ? 576 : 480;

	switch(dev->model){

		case (EM2820_BOARD_MSI_VOX_USB_2): return(480);

		default: return (dev->tvnorm->id & V4L2_STD_625_50) ? 576 : 480;

	}

}



#endif