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

Commit 8b77dfdd authored by Jon Arne Jørgensen's avatar Jon Arne Jørgensen Committed by Mauro Carvalho Chehab
Browse files

[media] saa7115: Fix saa711x_set_v4lstd for gm7113c 



saa711x_set_v4lstd would toggle several bits that should not be touched
when changing std. This patch fixes this.

Signed-off-by: default avatarJon Arne Jørgensen <jonarne@jonarne.no>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 04164904

drivers/media/i2c/saa7115.c

+13 −24
Original line number Diff line number Diff line
@@ -462,24 +462,6 @@ static const unsigned char saa7115_cfg_50hz_video[] = { 


/* ============== SAA7715 VIDEO templates (end) =======  */



/* ============== GM7113C VIDEO templates =============  */

static const unsigned char gm7113c_cfg_60hz_video[] = {

	R_08_SYNC_CNTL, 0x68,			/* 0xBO: auto detection, 0x68 = NTSC */

	R_0E_CHROMA_CNTL_1, 0x07,		/* video autodetection is on */



	0x00, 0x00

};



static const unsigned char gm7113c_cfg_50hz_video[] = {

	R_08_SYNC_CNTL, 0x28,			/* 0x28 = PAL */

	R_0E_CHROMA_CNTL_1, 0x07,



	0x00, 0x00

};



/* ============== GM7113C VIDEO templates (end) =======  */





static const unsigned char saa7115_cfg_vbi_on[] = {

	R_80_GLOBAL_CNTL_1, 0x00,			/* reset tasks */

	R_88_POWER_SAVE_ADC_PORT_CNTL, 0xd0,		/* reset scaler */
@@ -964,17 +946,24 @@ static void saa711x_set_v4lstd(struct v4l2_subdev *sd, v4l2_std_id std) 
	// This works for NTSC-M, SECAM-L and the 50Hz PAL variants.

	if (std & V4L2_STD_525_60) {

		v4l2_dbg(1, debug, sd, "decoder set standard 60 Hz\n");

		if (state->ident == GM7113C)

			saa711x_writeregs(sd, gm7113c_cfg_60hz_video);

		else

		if (state->ident == GM7113C) {

			u8 reg = saa711x_read(sd, R_08_SYNC_CNTL);

			reg &= ~(SAA7113_R_08_FSEL | SAA7113_R_08_AUFD);

			reg |= SAA7113_R_08_FSEL;

			saa711x_write(sd, R_08_SYNC_CNTL, reg);

		} else {

			saa711x_writeregs(sd, saa7115_cfg_60hz_video);

		}

		saa711x_set_size(sd, 720, 480);

	} else {

		v4l2_dbg(1, debug, sd, "decoder set standard 50 Hz\n");

		if (state->ident == GM7113C)

			saa711x_writeregs(sd, gm7113c_cfg_50hz_video);

		else

		if (state->ident == GM7113C) {

			u8 reg = saa711x_read(sd, R_08_SYNC_CNTL);

			reg &= ~(SAA7113_R_08_FSEL | SAA7113_R_08_AUFD);

			saa711x_write(sd, R_08_SYNC_CNTL, reg);

		} else {

			saa711x_writeregs(sd, saa7115_cfg_50hz_video);

		}

		saa711x_set_size(sd, 720, 576);

	}

drivers/media/i2c/saa711x_regs.h

+4 −0
Original line number Diff line number Diff line
@@ -201,6 +201,10 @@ 
#define R_FB_PULSE_C_POS_MSB                          0xfb

#define R_FF_S_PLL_MAX_PHASE_ERR_THRESH_NUM_LINES     0xff



/* SAA7113 bit-masks */

#define SAA7113_R_08_FSEL 0x40

#define SAA7113_R_08_AUFD 0x80



#if 0

/* Those structs will be used in the future for debug purposes */

struct saa711x_reg_descr {