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

Commit 0f79c363 authored by Hartmut Hackmann's avatar Hartmut Hackmann Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3371): Turn frame locked sound on, basic support for FM radio with TDA8275(a) 



- Enabled audio PLL. This is mandatory for NICAM sound
- modify FM IF frequency to 5.5MHz for SAA7133/35 if tuner is tda8290

Signed-off-by: default avatarHartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 436eddd0

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

+6 −0
Original line number Diff line number Diff line
@@ -2515,6 +2515,7 @@ struct saa7134_board saa7134_boards[] = { 
		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.mpeg           = SAA7134_MPEG_DVB,

		.gpiomask       = 1 << 21,

		.inputs = {{

			.name   = name_tv,

			.vmux   = 1,
@@ -2529,6 +2530,11 @@ struct saa7134_board saa7134_boards[] = { 
			.vmux   = 8,

			.amux   = LINE1,

		}},

		.radio = {

			.name   = name_radio,

			.amux   = TV,

			.gpio   = 0x0200000,

		},

	},

	[SAA7134_BOARD_MSI_TVATANYWHERE_PLUS] = {

		.name           = "MSI TV@Anywhere plus",

drivers/media/video/saa7134/saa7134-tvaudio.c

+8 −3
Original line number Diff line number Diff line
@@ -180,8 +180,8 @@ static void tvaudio_init(struct saa7134_dev *dev) 
	saa_writeb(SAA7134_AUDIO_CLOCK0,      clock        & 0xff);

	saa_writeb(SAA7134_AUDIO_CLOCK1,     (clock >>  8) & 0xff);

	saa_writeb(SAA7134_AUDIO_CLOCK2,     (clock >> 16) & 0xff);

	// frame locked audio was reported not to be reliable

	saa_writeb(SAA7134_AUDIO_PLL_CTRL,   0x02);

	/* frame locked audio is mandatory for NICAM */

	saa_writeb(SAA7134_AUDIO_PLL_CTRL,   0x01);



	saa_writeb(SAA7134_NICAM_ERROR_LOW,  0x14);

	saa_writeb(SAA7134_NICAM_ERROR_HIGH, 0x50);
@@ -809,7 +809,12 @@ static int tvaudio_thread_ddep(void *data) 
			dprintk("ddep override: %s\n",stdres[audio_ddep]);

		} else if (&card(dev).radio == dev->input) {

			dprintk("FM Radio\n");

			if (dev->tuner_type == TUNER_PHILIPS_TDA8290) {

				norms = (0x11 << 2) | 0x01;

				saa_dsp_writel(dev, 0x42c >> 2, 0x729555);

			} else {

				norms = (0x0f << 2) | 0x01;

			}

		} else {

			/* (let chip) scan for sound carrier */

			norms = 0;