Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (244 commits)
  V4L/DVB (4210b): git-dvb: tea575x-tuner build fix
  V4L/DVB (4210a): git-dvb versus matroxfb
  V4L/DVB (4209): Added some BTTV PCI IDs for newer boards
  Fixes some sync issues between V4L/DVB development and GIT
  V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id
  V4L/DVB (4205): Merge tda9887 module into tuner.
  V4L/DVB (4203): Explicitly set the enum values.
  V4L/DVB (4202): allow selecting CX2341x port mode
  V4L/DVB (4200): Disable bitrate_mode when encoding mpeg-1.
  V4L/DVB (4199): Add cx2341x-specific control array to cx2341x.c
  V4L/DVB (4198): Avoid newer usages of obsoleted experimental MPEGCOMP API
  V4L/DVB (4197): Port new MPEG API to saa7134-empress with saa6752hs
  V4L/DVB (4196): Port cx88-blackbird to the new MPEG API.
  V4L/DVB (4193): Update cx2341x fw encoding API doc.
  V4L/DVB (4192): Use control helpers for saa7115, cx25840, msp3400.
  V4L/DVB (4191): Add CX2341X MPEG encoder module.
  V4L/DVB (4190): Add helper functions for control processing to v4l2-common.
  V4L/DVB (4189): Add videodev support for VIDIOC_S/G/TRY_EXT_CTRLS.
  V4L/DVB (4188): Add new MPEG control/ioctl definitions to videodev2.h
  V4L/DVB (4186): Add support for the DNTV Live! mini DVB-T card.
  ...

1 files changed, 28 insertions, 12 deletions

diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index 633a10213789..f2fd9195b3ac 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -244,19 +244,21 @@ static void msp3400c_set_audmode(struct i2c_client *client)
            the hardware does not support SAP. So the rxsubchans combination
            of STEREO | LANG2 does not occur. */
 
-        /* switch to mono if only mono is available */
-        if (state->rxsubchans == V4L2_TUNER_SUB_MONO)
-                audmode = V4L2_TUNER_MODE_MONO;
-        /* if bilingual */
-        else if (state->rxsubchans & V4L2_TUNER_SUB_LANG2) {
-                /* and mono or stereo, then fallback to lang1 */
-                if (audmode == V4L2_TUNER_MODE_MONO ||
-                    audmode == V4L2_TUNER_MODE_STEREO)
-                        audmode = V4L2_TUNER_MODE_LANG1;
+        if (state->mode != MSP_MODE_EXTERN) {
+                /* switch to mono if only mono is available */
+                if (state->rxsubchans == V4L2_TUNER_SUB_MONO)
+                        audmode = V4L2_TUNER_MODE_MONO;
+                /* if bilingual */
+                else if (state->rxsubchans & V4L2_TUNER_SUB_LANG2) {
+                        /* and mono or stereo, then fallback to lang1 */
+                        if (audmode == V4L2_TUNER_MODE_MONO ||
+                            audmode == V4L2_TUNER_MODE_STEREO)
+                                audmode = V4L2_TUNER_MODE_LANG1;
+                }
+                /* if stereo, and audmode is not mono, then switch to stereo */
+                else if (audmode != V4L2_TUNER_MODE_MONO)
+                        audmode = V4L2_TUNER_MODE_STEREO;
         }
-        /* if stereo, and audmode is not mono, then switch to stereo */
-        else if (audmode != V4L2_TUNER_MODE_MONO)
-                audmode = V4L2_TUNER_MODE_STEREO;
 
         /* switch demodulator */
         switch (state->mode) {
@@ -481,6 +483,7 @@ int msp3400c_thread(void *data)
                         /* no carrier scan, just unmute */
                         v4l_dbg(1, msp_debug, client, "thread: no carrier scan\n");
                         state->scan_in_progress = 0;
+                        state->rxsubchans = V4L2_TUNER_SUB_STEREO;
                         msp_set_audio(client);
                         continue;
                 }
@@ -947,6 +950,14 @@ int msp34xxg_thread(void *data)
                 if (kthread_should_stop())
                         break;
 
+                if (state->mode == MSP_MODE_EXTERN) {
+                        /* no carrier scan needed, just unmute */
+                        v4l_dbg(1, msp_debug, client, "thread: no carrier scan\n");
+                        state->scan_in_progress = 0;
+                        msp_set_audio(client);
+                        continue;
+                }
+
                 /* setup the chip*/
                 msp34xxg_reset(client);
                 state->std = state->radio ? 0x40 : msp_standard;
@@ -978,6 +989,11 @@ int msp34xxg_thread(void *data)
                 v4l_dbg(1, msp_debug, client, "detected standard: %s (0x%04x)\n",
                         msp_standard_std_name(state->std), state->std);
 
+                if (state->std == 9) {
+                        /* AM NICAM mode */
+                        msp_write_dsp(client, 0x0e, 0x7c00);
+                }
+
                 /* unmute: dispatch sound to scart output, set scart volume */
                 msp_set_audio(client);