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

Commit 3ae1adc6 authored by Nickolay's avatar Nickolay Committed by Linus Torvalds
Browse files

[PATCH] v4l: 795: new config option for tda9887 to specifically set intercarrier 



- New config option for tda9887 to specifically set intercarrier

Signed-off-by: default avatarNickolay V. Shmyrev <nshmyrev@yandex.ru>
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 71633c05

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

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ struct cx88_board cx88_boards[] = { 
		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.tda9887_conf	= TDA9887_PRESENT,

		.tda9887_conf	= TDA9887_PRESENT | TDA9887_INTERCARRIER_NTSC,

		.input          = {{

			.type   = CX88_VMUX_TELEVISION,

			.vmux   = 0,

drivers/media/video/tda9887.c

+2 −0
Original line number Diff line number Diff line
@@ -464,6 +464,8 @@ static int tda9887_set_config(struct tda9887 *t, char *buf) 
			break;

		}

	}

	if ((t->config & TDA9887_INTERCARRIER_NTSC) && (t->std & V4L2_STD_NTSC))

		buf[1] &= ~cQSS;

	return 0;

}

include/media/tuner.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 
# define TDA9887_INTERCARRIER        (1<<4)

# define TDA9887_PORT1_ACTIVE        (1<<5)

# define TDA9887_PORT2_ACTIVE        (1<<6)

# define TDA9887_INTERCARRIER_NTSC   (1<<7)

/* config options */

# define TDA9887_DEEMPHASIS_MASK     (3<<16)

# define TDA9887_DEEMPHASIS_NONE     (1<<16)