summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHartmut Hackmann <devnull@localhost>2006-01-14 23:26:44 +0000
committerHartmut Hackmann <devnull@localhost>2006-01-14 23:26:44 +0000
commitd275de67253bfee8f43b7c99af63455bd50c6f0b (patch)
tree944b32d492f6c1a346e3c1a383f96d17ec1d3ee8
parent53e2a0e11ea790e0466ae6358e2f293584155611 (diff)
downloadmediapointer-dvb-s2-d275de67253bfee8f43b7c99af63455bd50c6f0b.tar.gz
mediapointer-dvb-s2-d275de67253bfee8f43b7c99af63455bd50c6f0b.tar.bz2
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: Hartmut Hackmann <hartmut.hackmann@t-online.de>
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c8
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-tvaudio.c13
-rw-r--r--v4l/ChangeLog11
3 files changed, 27 insertions, 5 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 465c69543..270e893d0 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-cards.c,v 1.122 2006/01/10 19:57:26 rmcc Exp $
+ * $Id: saa7134-cards.c,v 1.123 2006/01/14 23:26:44 hhackmann Exp $
*
* device driver for philips saa7134 based TV cards
* card-specific stuff.
@@ -2517,6 +2517,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,
@@ -2531,6 +2532,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",
diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
index e99aecb11..bbf145b74 100644
--- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-tvaudio.c,v 1.36 2005/11/07 02:33:06 rmcc Exp $
+ * $Id: saa7134-tvaudio.c,v 1.37 2006/01/14 23:26:44 hhackmann Exp $
*
* device driver for philips saa7134 based TV cards
* tv audio decoder (fm stereo, nicam, ...)
@@ -182,8 +182,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);
@@ -867,7 +867,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");
- norms = (0x0f << 2) | 0x01;
+ 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;
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 22e3d879c..4860253d2 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-14 23:50 hhackmann
+ * linux/drivers/media/video/saa7134/saa7134-tvaudio.c:
+ - enabled audio PLL. This is mandatory for NICAM sound
+ - modify FM IF frequency to 5.5MHz for SAA7133/35 if tuner is tda8290
+
+ * linux/drivers/media/video/saa7134/saa7134-cards.c:
+ - enable radio mode for Philips Tiger Board
+ - added GPIO settigs for Philips Tiger Board
+
+ Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
+
2006-01-14 22:06 mcisely
* v4l_experimental/pvrusb2/pvrusb2-debug.h: