3 files changed, 25 insertions, 13 deletions

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 275d06af69d2..c64718aec9cb 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -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",
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 3983a6524cac..028904bd94a2 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -31,6 +31,7 @@
 #include <linux/sound.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/mutex.h>
 
 #include "saa7134-reg.h"
 #include "saa7134.h"
@@ -84,7 +85,7 @@ MODULE_PARM_DESC(radio_nr, "radio device number");
 MODULE_PARM_DESC(tuner,    "tuner type");
 MODULE_PARM_DESC(card,     "card type");
 
-static DECLARE_MUTEX(devlist_lock);
+static DEFINE_MUTEX(devlist_lock);
 LIST_HEAD(saa7134_devlist);
 static LIST_HEAD(mops_list);
 static unsigned int saa7134_devcount;
@@ -140,7 +141,7 @@ static int pending_call(struct notifier_block *self, unsigned long state,
         return NOTIFY_DONE;
 }
 
-static int pending_registered=0;
+static int pending_registered;
 static struct notifier_block pending_notifier = {
         .notifier_call = pending_call,
 };
@@ -969,13 +970,13 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         pci_set_drvdata(pci_dev,dev);
         saa7134_devcount++;
 
-        down(&devlist_lock);
+        mutex_lock(&devlist_lock);
         list_for_each(item,&mops_list) {
                 mops = list_entry(item, struct saa7134_mpeg_ops, next);
                 mpeg_ops_attach(mops, dev);
         }
         list_add_tail(&dev->devlist,&saa7134_devlist);
-        up(&devlist_lock);
+        mutex_unlock(&devlist_lock);
 
         /* check for signal */
         saa7134_irq_video_intl(dev);
@@ -1031,13 +1032,13 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
         saa7134_hwfini(dev);
 
         /* unregister */
-        down(&devlist_lock);
+        mutex_lock(&devlist_lock);
         list_del(&dev->devlist);
         list_for_each(item,&mops_list) {
                 mops = list_entry(item, struct saa7134_mpeg_ops, next);
                 mpeg_ops_detach(mops, dev);
         }
-        up(&devlist_lock);
+        mutex_unlock(&devlist_lock);
         saa7134_devcount--;
 
         saa7134_i2c_unregister(dev);
@@ -1071,13 +1072,13 @@ int saa7134_ts_register(struct saa7134_mpeg_ops *ops)
         struct list_head *item;
         struct saa7134_dev *dev;
 
-        down(&devlist_lock);
+        mutex_lock(&devlist_lock);
         list_for_each(item,&saa7134_devlist) {
                 dev = list_entry(item, struct saa7134_dev, devlist);
                 mpeg_ops_attach(ops, dev);
         }
         list_add_tail(&ops->next,&mops_list);
-        up(&devlist_lock);
+        mutex_unlock(&devlist_lock);
         return 0;
 }
 
@@ -1086,13 +1087,13 @@ void saa7134_ts_unregister(struct saa7134_mpeg_ops *ops)
         struct list_head *item;
         struct saa7134_dev *dev;
 
-        down(&devlist_lock);
+        mutex_lock(&devlist_lock);
         list_del(&ops->next);
         list_for_each(item,&saa7134_devlist) {
                 dev = list_entry(item, struct saa7134_dev, devlist);
                 mpeg_ops_detach(ops, dev);
         }
-        up(&devlist_lock);
+        mutex_unlock(&devlist_lock);
 }
 
 EXPORT_SYMBOL(saa7134_ts_register);
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 93268427750d..afa4dcb3f96d 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -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");
-                        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;