Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / media / video / cx88 / cx88-tvaudio.c
index f2a9475..641a0c5 100644 (file)
@@ -1,5 +1,4 @@
 /*
-    $Id: cx88-tvaudio.c,v 1.34 2005/03/07 16:10:51 kraxel Exp $
 
     cx88x-audio.c - Conexant CX23880/23881 audio downstream driver driver
 
 #include "cx88.h"
 
 static unsigned int audio_debug = 0;
-module_param(audio_debug,int,0644);
-MODULE_PARM_DESC(audio_debug,"enable debug messages [audio]");
+module_param(audio_debug, int, 0644);
+MODULE_PARM_DESC(audio_debug, "enable debug messages [audio]");
+
+static unsigned int always_analog = 0;
+module_param(always_analog,int,0644);
+MODULE_PARM_DESC(always_analog,"force analog audio out");
+
 
 #define dprintk(fmt, arg...)   if (audio_debug) \
        printk(KERN_DEBUG "%s/0: " fmt, core->name , ## arg)
 
 /* ----------------------------------------------------------- */
 
-static char *aud_ctl_names[64] =
-{
-       [ EN_BTSC_FORCE_MONO       ] = "BTSC_FORCE_MONO",
-       [ EN_BTSC_FORCE_STEREO     ] = "BTSC_FORCE_STEREO",
-       [ EN_BTSC_FORCE_SAP        ] = "BTSC_FORCE_SAP",
-       [ EN_BTSC_AUTO_STEREO      ] = "BTSC_AUTO_STEREO",
-       [ EN_BTSC_AUTO_SAP         ] = "BTSC_AUTO_SAP",
-       [ EN_A2_FORCE_MONO1        ] = "A2_FORCE_MONO1",
-       [ EN_A2_FORCE_MONO2        ] = "A2_FORCE_MONO2",
-       [ EN_A2_FORCE_STEREO       ] = "A2_FORCE_STEREO",
-       [ EN_A2_AUTO_MONO2         ] = "A2_AUTO_MONO2",
-       [ EN_A2_AUTO_STEREO        ] = "A2_AUTO_STEREO",
-       [ EN_EIAJ_FORCE_MONO1      ] = "EIAJ_FORCE_MONO1",
-       [ EN_EIAJ_FORCE_MONO2      ] = "EIAJ_FORCE_MONO2",
-       [ EN_EIAJ_FORCE_STEREO     ] = "EIAJ_FORCE_STEREO",
-       [ EN_EIAJ_AUTO_MONO2       ] = "EIAJ_AUTO_MONO2",
-       [ EN_EIAJ_AUTO_STEREO      ] = "EIAJ_AUTO_STEREO",
-       [ EN_NICAM_FORCE_MONO1     ] = "NICAM_FORCE_MONO1",
-       [ EN_NICAM_FORCE_MONO2     ] = "NICAM_FORCE_MONO2",
-       [ EN_NICAM_FORCE_STEREO    ] = "NICAM_FORCE_STEREO",
-       [ EN_NICAM_AUTO_MONO2      ] = "NICAM_AUTO_MONO2",
-       [ EN_NICAM_AUTO_STEREO     ] = "NICAM_AUTO_STEREO",
-       [ EN_FMRADIO_FORCE_MONO    ] = "FMRADIO_FORCE_MONO",
-       [ EN_FMRADIO_FORCE_STEREO  ] = "FMRADIO_FORCE_STEREO",
-       [ EN_FMRADIO_AUTO_STEREO   ] = "FMRADIO_AUTO_STEREO",
+static char *aud_ctl_names[64] = {
+       [EN_BTSC_FORCE_MONO] = "BTSC_FORCE_MONO",
+       [EN_BTSC_FORCE_STEREO] = "BTSC_FORCE_STEREO",
+       [EN_BTSC_FORCE_SAP] = "BTSC_FORCE_SAP",
+       [EN_BTSC_AUTO_STEREO] = "BTSC_AUTO_STEREO",
+       [EN_BTSC_AUTO_SAP] = "BTSC_AUTO_SAP",
+       [EN_A2_FORCE_MONO1] = "A2_FORCE_MONO1",
+       [EN_A2_FORCE_MONO2] = "A2_FORCE_MONO2",
+       [EN_A2_FORCE_STEREO] = "A2_FORCE_STEREO",
+       [EN_A2_AUTO_MONO2] = "A2_AUTO_MONO2",
+       [EN_A2_AUTO_STEREO] = "A2_AUTO_STEREO",
+       [EN_EIAJ_FORCE_MONO1] = "EIAJ_FORCE_MONO1",
+       [EN_EIAJ_FORCE_MONO2] = "EIAJ_FORCE_MONO2",
+       [EN_EIAJ_FORCE_STEREO] = "EIAJ_FORCE_STEREO",
+       [EN_EIAJ_AUTO_MONO2] = "EIAJ_AUTO_MONO2",
+       [EN_EIAJ_AUTO_STEREO] = "EIAJ_AUTO_STEREO",
+       [EN_NICAM_FORCE_MONO1] = "NICAM_FORCE_MONO1",
+       [EN_NICAM_FORCE_MONO2] = "NICAM_FORCE_MONO2",
+       [EN_NICAM_FORCE_STEREO] = "NICAM_FORCE_STEREO",
+       [EN_NICAM_AUTO_MONO2] = "NICAM_AUTO_MONO2",
+       [EN_NICAM_AUTO_STEREO] = "NICAM_AUTO_STEREO",
+       [EN_FMRADIO_FORCE_MONO] = "FMRADIO_FORCE_MONO",
+       [EN_FMRADIO_FORCE_STEREO] = "FMRADIO_FORCE_STEREO",
+       [EN_FMRADIO_AUTO_STEREO] = "FMRADIO_AUTO_STEREO",
 };
 
 struct rlist {
@@ -98,8 +101,7 @@ struct rlist {
        u32 val;
 };
 
-static void set_audio_registers(struct cx88_core *core,
-                               const struct rlist *l)
+static void set_audio_registers(struct cx88_core *core, const struct rlist *l)
 {
        int i;
 
@@ -120,577 +122,521 @@ static void set_audio_registers(struct cx88_core *core,
        }
 }
 
-static void set_audio_start(struct cx88_core *core,
-                           u32 mode, u32 ctl)
+static void set_audio_start(struct cx88_core *core, u32 mode)
 {
-       // mute
-       cx_write(AUD_VOL_CTL,       (1 << 6));
-
-       //  increase level of input by 12dB
-       cx_write(AUD_AFE_12DB_EN,   0x0001);
-
-       // start programming
-       cx_write(AUD_CTL,           0x0000);
-       cx_write(AUD_INIT,          mode);
-       cx_write(AUD_INIT_LD,       0x0001);
-       cx_write(AUD_SOFT_RESET,    0x0001);
+       /* mute */
+       cx_write(AUD_VOL_CTL, (1 << 6));
 
-       cx_write(AUD_CTL,           ctl);
+       /* start programming */
+       cx_write(AUD_INIT, mode);
+       cx_write(AUD_INIT_LD, 0x0001);
+       cx_write(AUD_SOFT_RESET, 0x0001);
 }
 
-static void set_audio_finish(struct cx88_core *core)
+static void set_audio_finish(struct cx88_core *core, u32 ctl)
 {
        u32 volume;
 
+#ifndef USING_CX88_ALSA
+       /* restart dma; This avoids buzz in NICAM and is good in others  */
+       cx88_stop_audio_dma(core);
+#endif
+       cx_write(AUD_RATE_THRES_DMD, 0x000000C0);
+#ifndef USING_CX88_ALSA
+       cx88_start_audio_dma(core);
+#endif
+
        if (cx88_boards[core->board].blackbird) {
-               // 'pass-thru mode': this enables the i2s output to the mpeg encoder
-               cx_set(AUD_CTL, 0x2000);
+               /* sets sound input from external adc */
+               if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN)
+                       cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
+               else
+                       cx_set(AUD_CTL, EN_I2SIN_ENABLE);
+
+               cx_write(AUD_I2SINPUTCNTL, 4);
+               cx_write(AUD_BAUDRATE, 1);
+               /* 'pass-thru mode': this enables the i2s output to the mpeg encoder */
+               cx_set(AUD_CTL, EN_I2SOUT_ENABLE);
                cx_write(AUD_I2SOUTPUTCNTL, 1);
-               //cx_write(AUD_APB_IN_RATE_ADJ, 0);
+               cx_write(AUD_I2SCNTL, 0);
+               /* cx_write(AUD_APB_IN_RATE_ADJ, 0); */
+       }
+       if ((always_analog) || (!cx88_boards[core->board].blackbird)) {
+               ctl |= EN_DAC_ENABLE;
+               cx_write(AUD_CTL, ctl);
        }
 
-       // finish programming
+       /* finish programming */
        cx_write(AUD_SOFT_RESET, 0x0000);
 
-       // start audio processing
-       cx_set(AUD_CTL, EN_DAC_ENABLE);
-
-       // unmute
+       /* unmute */
        volume = cx_sread(SHADOW_AUD_VOL_CTL);
        cx_swrite(SHADOW_AUD_VOL_CTL, AUD_VOL_CTL, volume);
 }
 
 /* ----------------------------------------------------------- */
 
-static void set_audio_standard_BTSC(struct cx88_core *core, unsigned int sap)
+static void set_audio_standard_BTSC(struct cx88_core *core, unsigned int sap,
+                                   u32 mode)
 {
        static const struct rlist btsc[] = {
-               /* from dscaler */
-               { AUD_OUT1_SEL,                0x00000013 },
-               { AUD_OUT1_SHIFT,              0x00000000 },
-               { AUD_POLY0_DDS_CONSTANT,      0x0012010c },
-               { AUD_DMD_RA_DDS,              0x00c3e7aa },
-               { AUD_DBX_IN_GAIN,             0x00004734 },
-               { AUD_DBX_WBE_GAIN,            0x00004640 },
-               { AUD_DBX_SE_GAIN,             0x00008d31 },
-               { AUD_DCOC_0_SRC,              0x0000001a },
-               { AUD_IIR1_4_SEL,              0x00000021 },
-               { AUD_DCOC_PASS_IN,            0x00000003 },
-               { AUD_DCOC_0_SHIFT_IN0,        0x0000000a },
-               { AUD_DCOC_0_SHIFT_IN1,        0x00000008 },
-               { AUD_DCOC_1_SHIFT_IN0,        0x0000000a },
-               { AUD_DCOC_1_SHIFT_IN1,        0x00000008 },
-               { AUD_DN0_FREQ,                0x0000283b },
-               { AUD_DN2_SRC_SEL,             0x00000008 },
-               { AUD_DN2_FREQ,                0x00003000 },
-               { AUD_DN2_AFC,                 0x00000002 },
-               { AUD_DN2_SHFT,                0x00000000 },
-               { AUD_IIR2_2_SEL,              0x00000020 },
-               { AUD_IIR2_2_SHIFT,            0x00000000 },
-               { AUD_IIR2_3_SEL,              0x0000001f },
-               { AUD_IIR2_3_SHIFT,            0x00000000 },
-               { AUD_CRDC1_SRC_SEL,           0x000003ce },
-               { AUD_CRDC1_SHIFT,             0x00000000 },
-               { AUD_CORDIC_SHIFT_1,          0x00000007 },
-               { AUD_DCOC_1_SRC,              0x0000001b },
-               { AUD_DCOC1_SHIFT,             0x00000000 },
-               { AUD_RDSI_SEL,                0x00000008 },
-               { AUD_RDSQ_SEL,                0x00000008 },
-               { AUD_RDSI_SHIFT,              0x00000000 },
-               { AUD_RDSQ_SHIFT,              0x00000000 },
-               { AUD_POLYPH80SCALEFAC,        0x00000003 },
-                { /* end of list */ },
+               {AUD_AFE_12DB_EN, 0x00000001},
+               {AUD_OUT1_SEL, 0x00000013},
+               {AUD_OUT1_SHIFT, 0x00000000},
+               {AUD_POLY0_DDS_CONSTANT, 0x0012010c},
+               {AUD_DMD_RA_DDS, 0x00c3e7aa},
+               {AUD_DBX_IN_GAIN, 0x00004734},
+               {AUD_DBX_WBE_GAIN, 0x00004640},
+               {AUD_DBX_SE_GAIN, 0x00008d31},
+               {AUD_DCOC_0_SRC, 0x0000001a},
+               {AUD_IIR1_4_SEL, 0x00000021},
+               {AUD_DCOC_PASS_IN, 0x00000003},
+               {AUD_DCOC_0_SHIFT_IN0, 0x0000000a},
+               {AUD_DCOC_0_SHIFT_IN1, 0x00000008},
+               {AUD_DCOC_1_SHIFT_IN0, 0x0000000a},
+               {AUD_DCOC_1_SHIFT_IN1, 0x00000008},
+               {AUD_DN0_FREQ, 0x0000283b},
+               {AUD_DN2_SRC_SEL, 0x00000008},
+               {AUD_DN2_FREQ, 0x00003000},
+               {AUD_DN2_AFC, 0x00000002},
+               {AUD_DN2_SHFT, 0x00000000},
+               {AUD_IIR2_2_SEL, 0x00000020},
+               {AUD_IIR2_2_SHIFT, 0x00000000},
+               {AUD_IIR2_3_SEL, 0x0000001f},
+               {AUD_IIR2_3_SHIFT, 0x00000000},
+               {AUD_CRDC1_SRC_SEL, 0x000003ce},
+               {AUD_CRDC1_SHIFT, 0x00000000},
+               {AUD_CORDIC_SHIFT_1, 0x00000007},
+               {AUD_DCOC_1_SRC, 0x0000001b},
+               {AUD_DCOC1_SHIFT, 0x00000000},
+               {AUD_RDSI_SEL, 0x00000008},
+               {AUD_RDSQ_SEL, 0x00000008},
+               {AUD_RDSI_SHIFT, 0x00000000},
+               {AUD_RDSQ_SHIFT, 0x00000000},
+               {AUD_POLYPH80SCALEFAC, 0x00000003},
+               { /* end of list */ },
        };
        static const struct rlist btsc_sap[] = {
-               { AUD_DBX_IN_GAIN,             0x00007200 },
-               { AUD_DBX_WBE_GAIN,            0x00006200 },
-               { AUD_DBX_SE_GAIN,             0x00006200 },
-               { AUD_IIR1_1_SEL,              0x00000000 },
-               { AUD_IIR1_3_SEL,              0x00000001 },
-               { AUD_DN1_SRC_SEL,             0x00000007 },
-               { AUD_IIR1_4_SHIFT,            0x00000006 },
-               { AUD_IIR2_1_SHIFT,            0x00000000 },
-               { AUD_IIR2_2_SHIFT,            0x00000000 },
-               { AUD_IIR3_0_SHIFT,            0x00000000 },
-               { AUD_IIR3_1_SHIFT,            0x00000000 },
-               { AUD_IIR3_0_SEL,              0x0000000d },
-               { AUD_IIR3_1_SEL,              0x0000000e },
-               { AUD_DEEMPH1_SRC_SEL,         0x00000014 },
-               { AUD_DEEMPH1_SHIFT,           0x00000000 },
-               { AUD_DEEMPH1_G0,              0x00004000 },
-               { AUD_DEEMPH1_A0,              0x00000000 },
-               { AUD_DEEMPH1_B0,              0x00000000 },
-               { AUD_DEEMPH1_A1,              0x00000000 },
-               { AUD_DEEMPH1_B1,              0x00000000 },
-               { AUD_OUT0_SEL,                0x0000003f },
-               { AUD_OUT1_SEL,                0x0000003f },
-               { AUD_DN1_AFC,                 0x00000002 },
-               { AUD_DCOC_0_SHIFT_IN0,        0x0000000a },
-               { AUD_DCOC_0_SHIFT_IN1,        0x00000008 },
-               { AUD_DCOC_1_SHIFT_IN0,        0x0000000a },
-               { AUD_DCOC_1_SHIFT_IN1,        0x00000008 },
-               { AUD_IIR1_0_SEL,              0x0000001d },
-               { AUD_IIR1_2_SEL,              0x0000001e },
-               { AUD_IIR2_1_SEL,              0x00000002 },
-               { AUD_IIR2_2_SEL,              0x00000004 },
-               { AUD_IIR3_2_SEL,              0x0000000f },
-               { AUD_DCOC2_SHIFT,             0x00000001 },
-               { AUD_IIR3_2_SHIFT,            0x00000001 },
-               { AUD_DEEMPH0_SRC_SEL,         0x00000014 },
-               { AUD_CORDIC_SHIFT_1,          0x00000006 },
-               { AUD_POLY0_DDS_CONSTANT,      0x000e4db2 },
-               { AUD_DMD_RA_DDS,              0x00f696e6 },
-               { AUD_IIR2_3_SEL,              0x00000025 },
-               { AUD_IIR1_4_SEL,              0x00000021 },
-               { AUD_DN1_FREQ,                0x0000c965 },
-               { AUD_DCOC_PASS_IN,            0x00000003 },
-               { AUD_DCOC_0_SRC,              0x0000001a },
-               { AUD_DCOC_1_SRC,              0x0000001b },
-               { AUD_DCOC1_SHIFT,             0x00000000 },
-               { AUD_RDSI_SEL,                0x00000009 },
-               { AUD_RDSQ_SEL,                0x00000009 },
-               { AUD_RDSI_SHIFT,              0x00000000 },
-               { AUD_RDSQ_SHIFT,              0x00000000 },
-               { AUD_POLYPH80SCALEFAC,        0x00000003 },
-                { /* end of list */ },
+               {AUD_AFE_12DB_EN, 0x00000001},
+               {AUD_DBX_IN_GAIN, 0x00007200},
+               {AUD_DBX_WBE_GAIN, 0x00006200},
+               {AUD_DBX_SE_GAIN, 0x00006200},
+               {AUD_IIR1_1_SEL, 0x00000000},
+               {AUD_IIR1_3_SEL, 0x00000001},
+               {AUD_DN1_SRC_SEL, 0x00000007},
+               {AUD_IIR1_4_SHIFT, 0x00000006},
+               {AUD_IIR2_1_SHIFT, 0x00000000},
+               {AUD_IIR2_2_SHIFT, 0x00000000},
+               {AUD_IIR3_0_SHIFT, 0x00000000},
+               {AUD_IIR3_1_SHIFT, 0x00000000},
+               {AUD_IIR3_0_SEL, 0x0000000d},
+               {AUD_IIR3_1_SEL, 0x0000000e},
+               {AUD_DEEMPH1_SRC_SEL, 0x00000014},
+               {AUD_DEEMPH1_SHIFT, 0x00000000},
+               {AUD_DEEMPH1_G0, 0x00004000},
+               {AUD_DEEMPH1_A0, 0x00000000},
+               {AUD_DEEMPH1_B0, 0x00000000},
+               {AUD_DEEMPH1_A1, 0x00000000},
+               {AUD_DEEMPH1_B1, 0x00000000},
+               {AUD_OUT0_SEL, 0x0000003f},
+               {AUD_OUT1_SEL, 0x0000003f},
+               {AUD_DN1_AFC, 0x00000002},
+               {AUD_DCOC_0_SHIFT_IN0, 0x0000000a},
+               {AUD_DCOC_0_SHIFT_IN1, 0x00000008},
+               {AUD_DCOC_1_SHIFT_IN0, 0x0000000a},
+               {AUD_DCOC_1_SHIFT_IN1, 0x00000008},
+               {AUD_IIR1_0_SEL, 0x0000001d},
+               {AUD_IIR1_2_SEL, 0x0000001e},
+               {AUD_IIR2_1_SEL, 0x00000002},
+               {AUD_IIR2_2_SEL, 0x00000004},
+               {AUD_IIR3_2_SEL, 0x0000000f},
+               {AUD_DCOC2_SHIFT, 0x00000001},
+               {AUD_IIR3_2_SHIFT, 0x00000001},
+               {AUD_DEEMPH0_SRC_SEL, 0x00000014},
+               {AUD_CORDIC_SHIFT_1, 0x00000006},
+               {AUD_POLY0_DDS_CONSTANT, 0x000e4db2},
+               {AUD_DMD_RA_DDS, 0x00f696e6},
+               {AUD_IIR2_3_SEL, 0x00000025},
+               {AUD_IIR1_4_SEL, 0x00000021},
+               {AUD_DN1_FREQ, 0x0000c965},
+               {AUD_DCOC_PASS_IN, 0x00000003},
+               {AUD_DCOC_0_SRC, 0x0000001a},
+               {AUD_DCOC_1_SRC, 0x0000001b},
+               {AUD_DCOC1_SHIFT, 0x00000000},
+               {AUD_RDSI_SEL, 0x00000009},
+               {AUD_RDSQ_SEL, 0x00000009},
+               {AUD_RDSI_SHIFT, 0x00000000},
+               {AUD_RDSQ_SHIFT, 0x00000000},
+               {AUD_POLYPH80SCALEFAC, 0x00000003},
+               { /* end of list */ },
        };
 
-       // dscaler: exactly taken from driver,
-       // dscaler: don't know why to set EN_FMRADIO_EN_RDS
+       mode |= EN_FMRADIO_EN_RDS;
+
        if (sap) {
-               dprintk("%s SAP (status: unknown)\n",__FUNCTION__);
-               set_audio_start(core, 0x0001,
-                               EN_FMRADIO_EN_RDS | EN_BTSC_FORCE_SAP);
+               dprintk("%s SAP (status: unknown)\n", __FUNCTION__);
+               set_audio_start(core, SEL_SAP);
                set_audio_registers(core, btsc_sap);
+               set_audio_finish(core, mode);
        } else {
-               dprintk("%s (status: known-good)\n",__FUNCTION__);
-               set_audio_start(core, 0x0001,
-                               EN_FMRADIO_EN_RDS | EN_BTSC_AUTO_STEREO);
+               dprintk("%s (status: known-good)\n", __FUNCTION__);
+               set_audio_start(core, SEL_BTSC);
                set_audio_registers(core, btsc);
+               set_audio_finish(core, mode);
        }
-       set_audio_finish(core);
 }
 
-#if 0
-static void set_audio_standard_NICAM(struct cx88_core *core)
+static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode)
 {
-       static const struct rlist nicam_common[] = {
-               /* from dscaler */
-               { AUD_RATE_ADJ1,           0x00000010 },
-               { AUD_RATE_ADJ2,           0x00000040 },
-               { AUD_RATE_ADJ3,           0x00000100 },
-               { AUD_RATE_ADJ4,           0x00000400 },
-               { AUD_RATE_ADJ5,           0x00001000 },
-    //         { AUD_DMD_RA_DDS,          0x00c0d5ce },
-
-               // Deemphasis 1:
-               { AUD_DEEMPHGAIN_R,        0x000023c2 },
-               { AUD_DEEMPHNUMER1_R,      0x0002a7bc },
-               { AUD_DEEMPHNUMER2_R,      0x0003023e },
-               { AUD_DEEMPHDENOM1_R,      0x0000f3d0 },
-               { AUD_DEEMPHDENOM2_R,      0x00000000 },
-
-#if 0
-               // Deemphasis 2: (other tv norm?)
-               { AUD_DEEMPHGAIN_R,        0x0000c600 },
-               { AUD_DEEMPHNUMER1_R,      0x00066738 },
-               { AUD_DEEMPHNUMER2_R,      0x00066739 },
-               { AUD_DEEMPHDENOM1_R,      0x0001e88c },
-               { AUD_DEEMPHDENOM2_R,      0x0001e88c },
-#endif
+       static const struct rlist nicam_l[] = {
+               {AUD_AFE_12DB_EN, 0x00000001},
+               {AUD_RATE_ADJ1, 0x00000060},
+               {AUD_RATE_ADJ2, 0x000000F9},
+               {AUD_RATE_ADJ3, 0x000001CC},
+               {AUD_RATE_ADJ4, 0x000002B3},
+               {AUD_RATE_ADJ5, 0x00000726},
+               {AUD_DEEMPHDENOM1_R, 0x0000F3D0},
+               {AUD_DEEMPHDENOM2_R, 0x00000000},
+               {AUD_ERRLOGPERIOD_R, 0x00000064},
+               {AUD_ERRINTRPTTHSHLD1_R, 0x00000FFF},
+               {AUD_ERRINTRPTTHSHLD2_R, 0x0000001F},
+               {AUD_ERRINTRPTTHSHLD3_R, 0x0000000F},
+               {AUD_POLYPH80SCALEFAC, 0x00000003},
+               {AUD_DMD_RA_DDS, 0x00C00000},
+               {AUD_PLL_INT, 0x0000001E},
+               {AUD_PLL_DDS, 0x00000000},
+               {AUD_PLL_FRAC, 0x0000E542},
+               {AUD_START_TIMER, 0x00000000},
+               {AUD_DEEMPHNUMER1_R, 0x000353DE},
+               {AUD_DEEMPHNUMER2_R, 0x000001B1},
+               {AUD_PDF_DDS_CNST_BYTE2, 0x06},
+               {AUD_PDF_DDS_CNST_BYTE1, 0x82},
+               {AUD_PDF_DDS_CNST_BYTE0, 0x12},
+               {AUD_QAM_MODE, 0x05},
+               {AUD_PHACC_FREQ_8MSB, 0x34},
+               {AUD_PHACC_FREQ_8LSB, 0x4C},
+               {AUD_DEEMPHGAIN_R, 0x00006680},
+               {AUD_RATE_THRES_DMD, 0x000000C0},
+               { /* end of list */ },
+       };
 
-               { AUD_DEEMPHDENOM2_R,      0x00000000 },
-               { AUD_ERRLOGPERIOD_R,      0x00000fff },
-               { AUD_ERRINTRPTTHSHLD1_R,  0x000003ff },
-               { AUD_ERRINTRPTTHSHLD2_R,  0x000000ff },
-               { AUD_ERRINTRPTTHSHLD3_R,  0x0000003f },
-               { AUD_POLYPH80SCALEFAC,    0x00000003 },
-
-               // setup QAM registers
-               { AUD_PDF_DDS_CNST_BYTE2,  0x06 },
-               { AUD_PDF_DDS_CNST_BYTE1,  0x82 },
-               { AUD_PDF_DDS_CNST_BYTE0,  0x16 },
-               { AUD_QAM_MODE,            0x05 },
-
-                { /* end of list */ },
-        };
-       static const struct rlist nicam_pal_i[] = {
-               { AUD_PDF_DDS_CNST_BYTE0,  0x12 },
-               { AUD_PHACC_FREQ_8MSB,     0x3a },
-               { AUD_PHACC_FREQ_8LSB,     0x93 },
-
-                { /* end of list */ },
+       static const struct rlist nicam_bgdki_common[] = {
+               {AUD_AFE_12DB_EN, 0x00000001},
+               {AUD_RATE_ADJ1, 0x00000010},
+               {AUD_RATE_ADJ2, 0x00000040},
+               {AUD_RATE_ADJ3, 0x00000100},
+               {AUD_RATE_ADJ4, 0x00000400},
+               {AUD_RATE_ADJ5, 0x00001000},
+               {AUD_ERRLOGPERIOD_R, 0x00000fff},
+               {AUD_ERRINTRPTTHSHLD1_R, 0x000003ff},
+               {AUD_ERRINTRPTTHSHLD2_R, 0x000000ff},
+               {AUD_ERRINTRPTTHSHLD3_R, 0x0000003f},
+               {AUD_POLYPH80SCALEFAC, 0x00000003},
+               {AUD_DEEMPHGAIN_R, 0x000023c2},
+               {AUD_DEEMPHNUMER1_R, 0x0002a7bc},
+               {AUD_DEEMPHNUMER2_R, 0x0003023e},
+               {AUD_DEEMPHDENOM1_R, 0x0000f3d0},
+               {AUD_DEEMPHDENOM2_R, 0x00000000},
+               {AUD_PDF_DDS_CNST_BYTE2, 0x06},
+               {AUD_PDF_DDS_CNST_BYTE1, 0x82},
+               {AUD_QAM_MODE, 0x05},
+               { /* end of list */ },
+       };
+
+       static const struct rlist nicam_i[] = {
+               {AUD_PDF_DDS_CNST_BYTE0, 0x12},
+               {AUD_PHACC_FREQ_8MSB, 0x3a},
+               {AUD_PHACC_FREQ_8LSB, 0x93},
+               { /* end of list */ },
        };
-       static const struct rlist nicam_default[] = {
-               { AUD_PDF_DDS_CNST_BYTE0,  0x16 },
-               { AUD_PHACC_FREQ_8MSB,     0x34 },
-               { AUD_PHACC_FREQ_8LSB,     0x4c },
 
-                { /* end of list */ },
+       static const struct rlist nicam_default[] = {
+               {AUD_PDF_DDS_CNST_BYTE0, 0x16},
+               {AUD_PHACC_FREQ_8MSB, 0x34},
+               {AUD_PHACC_FREQ_8LSB, 0x4c},
+               { /* end of list */ },
        };
 
-        set_audio_start(core, 0x0010,
-                       EN_DMTRX_LR | EN_DMTRX_BYPASS | EN_NICAM_AUTO_STEREO);
-        set_audio_registers(core, nicam_common);
+       set_audio_start(core,SEL_NICAM);
        switch (core->tvaudio) {
-       case WW_NICAM_I:
-               dprintk("%s PAL-I NICAM (status: unknown)\n",__FUNCTION__);
-               set_audio_registers(core, nicam_pal_i);
+       case WW_L:
+               dprintk("%s SECAM-L NICAM (status: devel)\n", __FUNCTION__);
+               set_audio_registers(core, nicam_l);
                break;
-       case WW_NICAM_BGDKL:
-               dprintk("%s PAL-BGDK NICAM (status: unknown)\n",__FUNCTION__);
+       case WW_I:
+               dprintk("%s PAL-I NICAM (status: known-good)\n", __FUNCTION__);
+               set_audio_registers(core, nicam_bgdki_common);
+               set_audio_registers(core, nicam_i);
+               break;
+       default:
+               dprintk("%s PAL-BGDK NICAM (status: known-good)\n", __FUNCTION__);
+               set_audio_registers(core, nicam_bgdki_common);
                set_audio_registers(core, nicam_default);
                break;
        };
-        set_audio_finish(core);
-}
-#endif
-
-static void set_audio_standard_NICAM_L(struct cx88_core *core, int stereo)
-{
-        /* This is probably weird..
-         * Let's operate and find out. */
-
-        static const struct rlist nicam_l_mono[] = {
-                { AUD_ERRLOGPERIOD_R,     0x00000064 },
-                { AUD_ERRINTRPTTHSHLD1_R, 0x00000FFF },
-                { AUD_ERRINTRPTTHSHLD2_R, 0x0000001F },
-                { AUD_ERRINTRPTTHSHLD3_R, 0x0000000F },
-
-                { AUD_PDF_DDS_CNST_BYTE2, 0x48 },
-                { AUD_PDF_DDS_CNST_BYTE1, 0x3D },
-                { AUD_QAM_MODE,           0x00 },
-                { AUD_PDF_DDS_CNST_BYTE0, 0xf5 },
-                { AUD_PHACC_FREQ_8MSB,    0x3a },
-                { AUD_PHACC_FREQ_8LSB,    0x4a },
-
-                { AUD_DEEMPHGAIN_R, 0x6680 },
-                { AUD_DEEMPHNUMER1_R, 0x353DE },
-                { AUD_DEEMPHNUMER2_R, 0x1B1 },
-                { AUD_DEEMPHDENOM1_R, 0x0F3D0 },
-                { AUD_DEEMPHDENOM2_R, 0x0 },
-                { AUD_FM_MODE_ENABLE, 0x7 },
-                { AUD_POLYPH80SCALEFAC, 0x3 },
-                { AUD_AFE_12DB_EN, 0x1 },
-                { AAGC_GAIN, 0x0 },
-                { AAGC_HYST, 0x18 },
-                { AAGC_DEF, 0x20 },
-                { AUD_DN0_FREQ, 0x0 },
-                { AUD_POLY0_DDS_CONSTANT, 0x0E4DB2 },
-                { AUD_DCOC_0_SRC, 0x21 },
-                { AUD_IIR1_0_SEL, 0x0 },
-                { AUD_IIR1_0_SHIFT, 0x7 },
-                { AUD_IIR1_1_SEL, 0x2 },
-                { AUD_IIR1_1_SHIFT, 0x0 },
-                { AUD_DCOC_1_SRC, 0x3 },
-                { AUD_DCOC1_SHIFT, 0x0 },
-                { AUD_DCOC_PASS_IN, 0x0 },
-                { AUD_IIR1_2_SEL, 0x23 },
-                { AUD_IIR1_2_SHIFT, 0x0 },
-                { AUD_IIR1_3_SEL, 0x4 },
-                { AUD_IIR1_3_SHIFT, 0x7 },
-                { AUD_IIR1_4_SEL, 0x5 },
-                { AUD_IIR1_4_SHIFT, 0x7 },
-                { AUD_IIR3_0_SEL, 0x7 },
-                { AUD_IIR3_0_SHIFT, 0x0 },
-                { AUD_DEEMPH0_SRC_SEL, 0x11 },
-                { AUD_DEEMPH0_SHIFT, 0x0 },
-                { AUD_DEEMPH0_G0, 0x7000 },
-                { AUD_DEEMPH0_A0, 0x0 },
-                { AUD_DEEMPH0_B0, 0x0 },
-                { AUD_DEEMPH0_A1, 0x0 },
-                { AUD_DEEMPH0_B1, 0x0 },
-                { AUD_DEEMPH1_SRC_SEL, 0x11 },
-                { AUD_DEEMPH1_SHIFT, 0x0 },
-                { AUD_DEEMPH1_G0, 0x7000 },
-                { AUD_DEEMPH1_A0, 0x0 },
-                { AUD_DEEMPH1_B0, 0x0 },
-                { AUD_DEEMPH1_A1, 0x0 },
-                { AUD_DEEMPH1_B1, 0x0 },
-                { AUD_OUT0_SEL, 0x3F },
-                { AUD_OUT1_SEL, 0x3F },
-                { AUD_DMD_RA_DDS, 0x0F5C285 },
-                { AUD_PLL_INT, 0x1E },
-                { AUD_PLL_DDS, 0x0 },
-                { AUD_PLL_FRAC, 0x0E542 },
-
-                // setup QAM registers
-                { AUD_RATE_ADJ1,      0x00000100 },
-                { AUD_RATE_ADJ2,      0x00000200 },
-                { AUD_RATE_ADJ3,      0x00000300 },
-                { AUD_RATE_ADJ4,      0x00000400 },
-                { AUD_RATE_ADJ5,      0x00000500 },
-                { AUD_RATE_THRES_DMD, 0x000000C0 },
-                { /* end of list */ },
-        };
-
-        static const struct rlist nicam_l[] = {
-                // setup QAM registers
-                { AUD_RATE_ADJ1, 0x00000060 },
-                { AUD_RATE_ADJ2, 0x000000F9 },
-                { AUD_RATE_ADJ3, 0x000001CC },
-                { AUD_RATE_ADJ4, 0x000002B3 },
-                { AUD_RATE_ADJ5, 0x00000726 },
-                { AUD_DEEMPHDENOM1_R, 0x0000F3D0 },
-                { AUD_DEEMPHDENOM2_R, 0x00000000 },
-                { AUD_ERRLOGPERIOD_R, 0x00000064 },
-                { AUD_ERRINTRPTTHSHLD1_R, 0x00000FFF },
-                { AUD_ERRINTRPTTHSHLD2_R, 0x0000001F },
-                { AUD_ERRINTRPTTHSHLD3_R, 0x0000000F },
-                { AUD_POLYPH80SCALEFAC, 0x00000003 },
-                { AUD_DMD_RA_DDS, 0x00C00000 },
-                { AUD_PLL_INT, 0x0000001E },
-                { AUD_PLL_DDS, 0x00000000 },
-                { AUD_PLL_FRAC, 0x0000E542 },
-                { AUD_START_TIMER, 0x00000000 },
-                { AUD_DEEMPHNUMER1_R, 0x000353DE },
-                { AUD_DEEMPHNUMER2_R, 0x000001B1 },
-                { AUD_PDF_DDS_CNST_BYTE2, 0x06 },
-                { AUD_PDF_DDS_CNST_BYTE1, 0x82 },
-                { AUD_QAM_MODE, 0x05 },
-                { AUD_PDF_DDS_CNST_BYTE0, 0x12 },
-                { AUD_PHACC_FREQ_8MSB, 0x34 },
-                { AUD_PHACC_FREQ_8LSB, 0x4C },
-                { AUD_DEEMPHGAIN_R, 0x00006680 },
-                { AUD_RATE_THRES_DMD, 0x000000C0  },
-                { /* end of list */ },
-        } ;
-        dprintk("%s (status: devel), stereo : %d\n",__FUNCTION__,stereo);
-
-        if (!stereo) {
-               /* AM mono sound */
-                set_audio_start(core, 0x0004,
-                               0x100c /* FIXME again */);
-                set_audio_registers(core, nicam_l_mono);
-        } else {
-                set_audio_start(core, 0x0010,
-                               0x1924 /* FIXME again */);
-                set_audio_registers(core, nicam_l);
-        }
-        set_audio_finish(core);
 
+       mode |= EN_DMTRX_LR | EN_DMTRX_BYPASS;
+       set_audio_finish(core, mode);
 }
 
-static void set_audio_standard_PAL_I(struct cx88_core *core, int stereo)
+static void set_audio_standard_A2(struct cx88_core *core, u32 mode)
 {
-       static const struct rlist pal_i_fm_mono[] = {
-            {AUD_ERRLOGPERIOD_R,       0x00000064},
-            {AUD_ERRINTRPTTHSHLD1_R,   0x00000fff},
-            {AUD_ERRINTRPTTHSHLD2_R,   0x0000001f},
-            {AUD_ERRINTRPTTHSHLD3_R,   0x0000000f},
-            {AUD_PDF_DDS_CNST_BYTE2,   0x06},
-            {AUD_PDF_DDS_CNST_BYTE1,   0x82},
-            {AUD_PDF_DDS_CNST_BYTE0,   0x12},
-            {AUD_QAM_MODE,             0x05},
-            {AUD_PHACC_FREQ_8MSB,      0x3a},
-            {AUD_PHACC_FREQ_8LSB,      0x93},
-            {AUD_DMD_RA_DDS,           0x002a4f2f},
-            {AUD_PLL_INT,              0x0000001e},
-            {AUD_PLL_DDS,              0x00000004},
-            {AUD_PLL_FRAC,             0x0000e542},
-            {AUD_RATE_ADJ1,            0x00000100},
-            {AUD_RATE_ADJ2,            0x00000200},
-            {AUD_RATE_ADJ3,            0x00000300},
-            {AUD_RATE_ADJ4,            0x00000400},
-            {AUD_RATE_ADJ5,            0x00000500},
-            {AUD_THR_FR,               0x00000000},
-            {AUD_PILOT_BQD_1_K0,       0x0000755b},
-            {AUD_PILOT_BQD_1_K1,       0x00551340},
-            {AUD_PILOT_BQD_1_K2,       0x006d30be},
-            {AUD_PILOT_BQD_1_K3,       0xffd394af},
-            {AUD_PILOT_BQD_1_K4,       0x00400000},
-            {AUD_PILOT_BQD_2_K0,       0x00040000},
-            {AUD_PILOT_BQD_2_K1,       0x002a4841},
-            {AUD_PILOT_BQD_2_K2,       0x00400000},
-            {AUD_PILOT_BQD_2_K3,       0x00000000},
-            {AUD_PILOT_BQD_2_K4,       0x00000000},
-            {AUD_MODE_CHG_TIMER,       0x00000060},
-            {AUD_AFE_12DB_EN,          0x00000001},
-            {AAGC_HYST,                0x0000000a},
-            {AUD_CORDIC_SHIFT_0,       0x00000007},
-            {AUD_CORDIC_SHIFT_1,       0x00000007},
-            {AUD_C1_UP_THR,            0x00007000},
-            {AUD_C1_LO_THR,            0x00005400},
-            {AUD_C2_UP_THR,            0x00005400},
-            {AUD_C2_LO_THR,            0x00003000},
-            {AUD_DCOC_0_SRC,           0x0000001a},
-            {AUD_DCOC0_SHIFT,          0x00000000},
-            {AUD_DCOC_0_SHIFT_IN0,     0x0000000a},
-            {AUD_DCOC_0_SHIFT_IN1,     0x00000008},
-            {AUD_DCOC_PASS_IN,         0x00000003},
-            {AUD_IIR3_0_SEL,           0x00000021},
-            {AUD_DN2_AFC,              0x00000002},
-            {AUD_DCOC_1_SRC,           0x0000001b},
-            {AUD_DCOC1_SHIFT,          0x00000000},
-            {AUD_DCOC_1_SHIFT_IN0,     0x0000000a},
-            {AUD_DCOC_1_SHIFT_IN1,     0x00000008},
-            {AUD_IIR3_1_SEL,           0x00000023},
-            {AUD_DN0_FREQ,             0x000035a3},
-            {AUD_DN2_FREQ,             0x000029c7},
-            {AUD_CRDC0_SRC_SEL,        0x00000511},
-            {AUD_IIR1_0_SEL,           0x00000001},
-            {AUD_IIR1_1_SEL,           0x00000000},
-            {AUD_IIR3_2_SEL,           0x00000003},
-            {AUD_IIR3_2_SHIFT,         0x00000000},
-            {AUD_IIR3_0_SEL,           0x00000002},
-            {AUD_IIR2_0_SEL,           0x00000021},
-            {AUD_IIR2_0_SHIFT,         0x00000002},
-            {AUD_DEEMPH0_SRC_SEL,      0x0000000b},
-            {AUD_DEEMPH1_SRC_SEL,      0x0000000b},
-            {AUD_POLYPH80SCALEFAC,     0x00000001},
-            {AUD_START_TIMER,          0x00000000},
-            { /* end of list */ },
-       };
-
-       static const struct rlist pal_i_nicam[] = {
-           { AUD_RATE_ADJ1,           0x00000010 },
-           { AUD_RATE_ADJ2,           0x00000040 },
-           { AUD_RATE_ADJ3,           0x00000100 },
-           { AUD_RATE_ADJ4,           0x00000400 },
-           { AUD_RATE_ADJ5,           0x00001000 },
-          //     { AUD_DMD_RA_DDS,          0x00c0d5ce },
-          { AUD_DEEMPHGAIN_R,        0x000023c2 },
-          { AUD_DEEMPHNUMER1_R,      0x0002a7bc },
-          { AUD_DEEMPHNUMER2_R,      0x0003023e },
-          { AUD_DEEMPHDENOM1_R,      0x0000f3d0 },
-          { AUD_DEEMPHDENOM2_R,      0x00000000 },
-          { AUD_DEEMPHDENOM2_R,      0x00000000 },
-          { AUD_ERRLOGPERIOD_R,      0x00000fff },
-          { AUD_ERRINTRPTTHSHLD1_R,  0x000003ff },
-          { AUD_ERRINTRPTTHSHLD2_R,  0x000000ff },
-          { AUD_ERRINTRPTTHSHLD3_R,  0x0000003f },
-          { AUD_POLYPH80SCALEFAC,    0x00000003 },
-          { AUD_PDF_DDS_CNST_BYTE2,  0x06 },
-          { AUD_PDF_DDS_CNST_BYTE1,  0x82 },
-          { AUD_PDF_DDS_CNST_BYTE0,  0x16 },
-          { AUD_QAM_MODE,            0x05 },
-          { AUD_PDF_DDS_CNST_BYTE0,  0x12 },
-          { AUD_PHACC_FREQ_8MSB,     0x3a },
-          { AUD_PHACC_FREQ_8LSB,     0x93 },
-            { /* end of list */ },
-        };
-
-        dprintk("%s (status: devel), stereo : %d\n",__FUNCTION__,stereo);
-
-        if (!stereo) {
-               // FM mono
-               set_audio_start(core, 0x0004, EN_DMTRX_SUMDIFF | EN_A2_FORCE_MONO1);
-               set_audio_registers(core, pal_i_fm_mono);
-        } else {
-               // Nicam Stereo
-               set_audio_start(core, 0x0010, EN_DMTRX_LR | EN_DMTRX_BYPASS | EN_NICAM_AUTO_STEREO);
-               set_audio_registers(core, pal_i_nicam);
-        }
-        set_audio_finish(core);
-}
+       static const struct rlist a2_bgdk_common[] = {
+               {AUD_ERRLOGPERIOD_R, 0x00000064},
+               {AUD_ERRINTRPTTHSHLD1_R, 0x00000fff},
+               {AUD_ERRINTRPTTHSHLD2_R, 0x0000001f},
+               {AUD_ERRINTRPTTHSHLD3_R, 0x0000000f},
+               {AUD_PDF_DDS_CNST_BYTE2, 0x06},
+               {AUD_PDF_DDS_CNST_BYTE1, 0x82},
+               {AUD_PDF_DDS_CNST_BYTE0, 0x12},
+               {AUD_QAM_MODE, 0x05},
+               {AUD_PHACC_FREQ_8MSB, 0x34},
+               {AUD_PHACC_FREQ_8LSB, 0x4c},
+               {AUD_RATE_ADJ1, 0x00000100},
+               {AUD_RATE_ADJ2, 0x00000200},
+               {AUD_RATE_ADJ3, 0x00000300},
+               {AUD_RATE_ADJ4, 0x00000400},
+               {AUD_RATE_ADJ5, 0x00000500},
+               {AUD_THR_FR, 0x00000000},
+               {AAGC_HYST, 0x0000001a},
+               {AUD_PILOT_BQD_1_K0, 0x0000755b},
+               {AUD_PILOT_BQD_1_K1, 0x00551340},
+               {AUD_PILOT_BQD_1_K2, 0x006d30be},
+               {AUD_PILOT_BQD_1_K3, 0xffd394af},
+               {AUD_PILOT_BQD_1_K4, 0x00400000},
+               {AUD_PILOT_BQD_2_K0, 0x00040000},
+               {AUD_PILOT_BQD_2_K1, 0x002a4841},
+               {AUD_PILOT_BQD_2_K2, 0x00400000},
+               {AUD_PILOT_BQD_2_K3, 0x00000000},
+               {AUD_PILOT_BQD_2_K4, 0x00000000},
+               {AUD_MODE_CHG_TIMER, 0x00000040},
+               {AUD_AFE_12DB_EN, 0x00000001},
+               {AUD_CORDIC_SHIFT_0, 0x00000007},
+               {AUD_CORDIC_SHIFT_1, 0x00000007},
+               {AUD_DEEMPH0_G0, 0x00000380},
+               {AUD_DEEMPH1_G0, 0x00000380},
+               {AUD_DCOC_0_SRC, 0x0000001a},
+               {AUD_DCOC0_SHIFT, 0x00000000},
+               {AUD_DCOC_0_SHIFT_IN0, 0x0000000a},
+               {AUD_DCOC_0_SHIFT_IN1, 0x00000008},
+               {AUD_DCOC_PASS_IN, 0x00000003},
+               {AUD_IIR3_0_SEL, 0x00000021},
+               {AUD_DN2_AFC, 0x00000002},
+               {AUD_DCOC_1_SRC, 0x0000001b},
+               {AUD_DCOC1_SHIFT, 0x00000000},
+               {AUD_DCOC_1_SHIFT_IN0, 0x0000000a},
+               {AUD_DCOC_1_SHIFT_IN1, 0x00000008},
+               {AUD_IIR3_1_SEL, 0x00000023},
+               {AUD_RDSI_SEL, 0x00000017},
+               {AUD_RDSI_SHIFT, 0x00000000},
+               {AUD_RDSQ_SEL, 0x00000017},
+               {AUD_RDSQ_SHIFT, 0x00000000},
+               {AUD_PLL_INT, 0x0000001e},
+               {AUD_PLL_DDS, 0x00000000},
+               {AUD_PLL_FRAC, 0x0000e542},
+               {AUD_POLYPH80SCALEFAC, 0x00000001},
+               {AUD_START_TIMER, 0x00000000},
+               { /* end of list */ },
+       };
 
-static void set_audio_standard_A2(struct cx88_core *core)
-{
-       /* from dscaler cvs */
-       static const struct rlist a2_common[] = {
-               { AUD_PDF_DDS_CNST_BYTE2,     0x06 },
-               { AUD_PDF_DDS_CNST_BYTE1,     0x82 },
-               { AUD_PDF_DDS_CNST_BYTE0,     0x12 },
-               { AUD_QAM_MODE,               0x05 },
-               { AUD_PHACC_FREQ_8MSB,        0x34 },
-               { AUD_PHACC_FREQ_8LSB,        0x4c },
-
-               { AUD_RATE_ADJ1,        0x00001000 },
-               { AUD_RATE_ADJ2,        0x00002000 },
-               { AUD_RATE_ADJ3,        0x00003000 },
-               { AUD_RATE_ADJ4,        0x00004000 },
-               { AUD_RATE_ADJ5,        0x00005000 },
-               { AUD_THR_FR,           0x00000000 },
-               { AAGC_HYST,            0x0000001a },
-               { AUD_PILOT_BQD_1_K0,   0x0000755b },
-               { AUD_PILOT_BQD_1_K1,   0x00551340 },
-               { AUD_PILOT_BQD_1_K2,   0x006d30be },
-               { AUD_PILOT_BQD_1_K3,   0xffd394af },
-               { AUD_PILOT_BQD_1_K4,   0x00400000 },
-               { AUD_PILOT_BQD_2_K0,   0x00040000 },
-               { AUD_PILOT_BQD_2_K1,   0x002a4841 },
-               { AUD_PILOT_BQD_2_K2,   0x00400000 },
-               { AUD_PILOT_BQD_2_K3,   0x00000000 },
-               { AUD_PILOT_BQD_2_K4,   0x00000000 },
-               { AUD_MODE_CHG_TIMER,   0x00000040 },
-               { AUD_START_TIMER,      0x00000200 },
-               { AUD_AFE_12DB_EN,      0x00000000 },
-               { AUD_CORDIC_SHIFT_0,   0x00000007 },
-               { AUD_CORDIC_SHIFT_1,   0x00000007 },
-               { AUD_DEEMPH0_G0,       0x00000380 },
-               { AUD_DEEMPH1_G0,       0x00000380 },
-               { AUD_DCOC_0_SRC,       0x0000001a },
-               { AUD_DCOC0_SHIFT,      0x00000000 },
-               { AUD_DCOC_0_SHIFT_IN0, 0x0000000a },
-               { AUD_DCOC_0_SHIFT_IN1, 0x00000008 },
-               { AUD_DCOC_PASS_IN,     0x00000003 },
-               { AUD_IIR3_0_SEL,       0x00000021 },
-               { AUD_DN2_AFC,          0x00000002 },
-               { AUD_DCOC_1_SRC,       0x0000001b },
-               { AUD_DCOC1_SHIFT,      0x00000000 },
-               { AUD_DCOC_1_SHIFT_IN0, 0x0000000a },
-               { AUD_DCOC_1_SHIFT_IN1, 0x00000008 },
-               { AUD_IIR3_1_SEL,       0x00000023 },
-               { AUD_RDSI_SEL,         0x00000017 },
-               { AUD_RDSI_SHIFT,       0x00000000 },
-               { AUD_RDSQ_SEL,         0x00000017 },
-               { AUD_RDSQ_SHIFT,       0x00000000 },
-               { AUD_POLYPH80SCALEFAC, 0x00000001 },
+       static const struct rlist a2_bg[] = {
+               {AUD_DMD_RA_DDS, 0x002a4f2f},
+               {AUD_C1_UP_THR, 0x00007000},
+               {AUD_C1_LO_THR, 0x00005400},
+               {AUD_C2_UP_THR, 0x00005400},
+               {AUD_C2_LO_THR, 0x00003000},
+               { /* end of list */ },
+       };
 
+       static const struct rlist a2_dk[] = {
+               {AUD_DMD_RA_DDS, 0x002a4f2f},
+               {AUD_C1_UP_THR, 0x00007000},
+               {AUD_C1_LO_THR, 0x00005400},
+               {AUD_C2_UP_THR, 0x00005400},
+               {AUD_C2_LO_THR, 0x00003000},
+               {AUD_DN0_FREQ, 0x00003a1c},
+               {AUD_DN2_FREQ, 0x0000d2e0},
                { /* end of list */ },
        };
 
-       static const struct rlist a2_table1[] = {
-               // PAL-BG
-               { AUD_DMD_RA_DDS,       0x002a73bd },
-               { AUD_C1_UP_THR,        0x00007000 },
-               { AUD_C1_LO_THR,        0x00005400 },
-               { AUD_C2_UP_THR,        0x00005400 },
-               { AUD_C2_LO_THR,        0x00003000 },
+       static const struct rlist a1_i[] = {
+               {AUD_ERRLOGPERIOD_R, 0x00000064},
+               {AUD_ERRINTRPTTHSHLD1_R, 0x00000fff},
+               {AUD_ERRINTRPTTHSHLD2_R, 0x0000001f},
+               {AUD_ERRINTRPTTHSHLD3_R, 0x0000000f},
+               {AUD_PDF_DDS_CNST_BYTE2, 0x06},
+               {AUD_PDF_DDS_CNST_BYTE1, 0x82},
+               {AUD_PDF_DDS_CNST_BYTE0, 0x12},
+               {AUD_QAM_MODE, 0x05},
+               {AUD_PHACC_FREQ_8MSB, 0x3a},
+               {AUD_PHACC_FREQ_8LSB, 0x93},
+               {AUD_DMD_RA_DDS, 0x002a4f2f},
+               {AUD_PLL_INT, 0x0000001e},
+               {AUD_PLL_DDS, 0x00000004},
+               {AUD_PLL_FRAC, 0x0000e542},
+               {AUD_RATE_ADJ1, 0x00000100},
+               {AUD_RATE_ADJ2, 0x00000200},
+               {AUD_RATE_ADJ3, 0x00000300},
+               {AUD_RATE_ADJ4, 0x00000400},
+               {AUD_RATE_ADJ5, 0x00000500},
+               {AUD_THR_FR, 0x00000000},
+               {AUD_PILOT_BQD_1_K0, 0x0000755b},
+               {AUD_PILOT_BQD_1_K1, 0x00551340},
+               {AUD_PILOT_BQD_1_K2, 0x006d30be},
+               {AUD_PILOT_BQD_1_K3, 0xffd394af},
+               {AUD_PILOT_BQD_1_K4, 0x00400000},
+               {AUD_PILOT_BQD_2_K0, 0x00040000},
+               {AUD_PILOT_BQD_2_K1, 0x002a4841},
+               {AUD_PILOT_BQD_2_K2, 0x00400000},
+               {AUD_PILOT_BQD_2_K3, 0x00000000},
+               {AUD_PILOT_BQD_2_K4, 0x00000000},
+               {AUD_MODE_CHG_TIMER, 0x00000060},
+               {AUD_AFE_12DB_EN, 0x00000001},
+               {AAGC_HYST, 0x0000000a},
+               {AUD_CORDIC_SHIFT_0, 0x00000007},
+               {AUD_CORDIC_SHIFT_1, 0x00000007},
+               {AUD_C1_UP_THR, 0x00007000},
+               {AUD_C1_LO_THR, 0x00005400},
+               {AUD_C2_UP_THR, 0x00005400},
+               {AUD_C2_LO_THR, 0x00003000},
+               {AUD_DCOC_0_SRC, 0x0000001a},
+               {AUD_DCOC0_SHIFT, 0x00000000},
+               {AUD_DCOC_0_SHIFT_IN0, 0x0000000a},
+               {AUD_DCOC_0_SHIFT_IN1, 0x00000008},
+               {AUD_DCOC_PASS_IN, 0x00000003},
+               {AUD_IIR3_0_SEL, 0x00000021},
+               {AUD_DN2_AFC, 0x00000002},
+               {AUD_DCOC_1_SRC, 0x0000001b},
+               {AUD_DCOC1_SHIFT, 0x00000000},
+               {AUD_DCOC_1_SHIFT_IN0, 0x0000000a},
+               {AUD_DCOC_1_SHIFT_IN1, 0x00000008},
+               {AUD_IIR3_1_SEL, 0x00000023},
+               {AUD_DN0_FREQ, 0x000035a3},
+               {AUD_DN2_FREQ, 0x000029c7},
+               {AUD_CRDC0_SRC_SEL, 0x00000511},
+               {AUD_IIR1_0_SEL, 0x00000001},
+               {AUD_IIR1_1_SEL, 0x00000000},
+               {AUD_IIR3_2_SEL, 0x00000003},
+               {AUD_IIR3_2_SHIFT, 0x00000000},
+               {AUD_IIR3_0_SEL, 0x00000002},
+               {AUD_IIR2_0_SEL, 0x00000021},
+               {AUD_IIR2_0_SHIFT, 0x00000002},
+               {AUD_DEEMPH0_SRC_SEL, 0x0000000b},
+               {AUD_DEEMPH1_SRC_SEL, 0x0000000b},
+               {AUD_POLYPH80SCALEFAC, 0x00000001},
+               {AUD_START_TIMER, 0x00000000},
                { /* end of list */ },
        };
-       static const struct rlist a2_table2[] = {
-               // PAL-DK
-               { AUD_DMD_RA_DDS,       0x002a73bd },
-               { AUD_C1_UP_THR,        0x00007000 },
-               { AUD_C1_LO_THR,        0x00005400 },
-               { AUD_C2_UP_THR,        0x00005400 },
-               { AUD_C2_LO_THR,        0x00003000 },
-               { AUD_DN0_FREQ,         0x00003a1c },
-               { AUD_DN2_FREQ,         0x0000d2e0 },
+
+       static const struct rlist am_l[] = {
+               {AUD_ERRLOGPERIOD_R, 0x00000064},
+               {AUD_ERRINTRPTTHSHLD1_R, 0x00000FFF},
+               {AUD_ERRINTRPTTHSHLD2_R, 0x0000001F},
+               {AUD_ERRINTRPTTHSHLD3_R, 0x0000000F},
+               {AUD_PDF_DDS_CNST_BYTE2, 0x48},
+               {AUD_PDF_DDS_CNST_BYTE1, 0x3D},
+               {AUD_QAM_MODE, 0x00},
+               {AUD_PDF_DDS_CNST_BYTE0, 0xf5},
+               {AUD_PHACC_FREQ_8MSB, 0x3a},
+               {AUD_PHACC_FREQ_8LSB, 0x4a},
+               {AUD_DEEMPHGAIN_R, 0x00006680},
+               {AUD_DEEMPHNUMER1_R, 0x000353DE},
+               {AUD_DEEMPHNUMER2_R, 0x000001B1},
+               {AUD_DEEMPHDENOM1_R, 0x0000F3D0},
+               {AUD_DEEMPHDENOM2_R, 0x00000000},
+               {AUD_FM_MODE_ENABLE, 0x00000007},
+               {AUD_POLYPH80SCALEFAC, 0x00000003},
+               {AUD_AFE_12DB_EN, 0x00000001},
+               {AAGC_GAIN, 0x00000000},
+               {AAGC_HYST, 0x00000018},
+               {AAGC_DEF, 0x00000020},
+               {AUD_DN0_FREQ, 0x00000000},
+               {AUD_POLY0_DDS_CONSTANT, 0x000E4DB2},
+               {AUD_DCOC_0_SRC, 0x00000021},
+               {AUD_IIR1_0_SEL, 0x00000000},
+               {AUD_IIR1_0_SHIFT, 0x00000007},
+               {AUD_IIR1_1_SEL, 0x00000002},
+               {AUD_IIR1_1_SHIFT, 0x00000000},
+               {AUD_DCOC_1_SRC, 0x00000003},
+               {AUD_DCOC1_SHIFT, 0x00000000},
+               {AUD_DCOC_PASS_IN, 0x00000000},
+               {AUD_IIR1_2_SEL, 0x00000023},
+               {AUD_IIR1_2_SHIFT, 0x00000000},
+               {AUD_IIR1_3_SEL, 0x00000004},
+               {AUD_IIR1_3_SHIFT, 0x00000007},
+               {AUD_IIR1_4_SEL, 0x00000005},
+               {AUD_IIR1_4_SHIFT, 0x00000007},
+               {AUD_IIR3_0_SEL, 0x00000007},
+               {AUD_IIR3_0_SHIFT, 0x00000000},
+               {AUD_DEEMPH0_SRC_SEL, 0x00000011},
+               {AUD_DEEMPH0_SHIFT, 0x00000000},
+               {AUD_DEEMPH0_G0, 0x00007000},
+               {AUD_DEEMPH0_A0, 0x00000000},
+               {AUD_DEEMPH0_B0, 0x00000000},
+               {AUD_DEEMPH0_A1, 0x00000000},
+               {AUD_DEEMPH0_B1, 0x00000000},
+               {AUD_DEEMPH1_SRC_SEL, 0x00000011},
+               {AUD_DEEMPH1_SHIFT, 0x00000000},
+               {AUD_DEEMPH1_G0, 0x00007000},
+               {AUD_DEEMPH1_A0, 0x00000000},
+               {AUD_DEEMPH1_B0, 0x00000000},
+               {AUD_DEEMPH1_A1, 0x00000000},
+               {AUD_DEEMPH1_B1, 0x00000000},
+               {AUD_OUT0_SEL, 0x0000003F},
+               {AUD_OUT1_SEL, 0x0000003F},
+               {AUD_DMD_RA_DDS, 0x00F5C285},
+               {AUD_PLL_INT, 0x0000001E},
+               {AUD_PLL_DDS, 0x00000000},
+               {AUD_PLL_FRAC, 0x0000E542},
+               {AUD_RATE_ADJ1, 0x00000100},
+               {AUD_RATE_ADJ2, 0x00000200},
+               {AUD_RATE_ADJ3, 0x00000300},
+               {AUD_RATE_ADJ4, 0x00000400},
+               {AUD_RATE_ADJ5, 0x00000500},
+               {AUD_RATE_THRES_DMD, 0x000000C0},
                { /* end of list */ },
        };
-       static const struct rlist a2_table3[] = {
-               // unknown, probably NTSC-M
-               { AUD_DMD_RA_DDS,       0x002a2873 },
-               { AUD_C1_UP_THR,        0x00003c00 },
-               { AUD_C1_LO_THR,        0x00003000 },
-               { AUD_C2_UP_THR,        0x00006000 },
-               { AUD_C2_LO_THR,        0x00003c00 },
-               { AUD_DN0_FREQ,         0x00002836 },
-               { AUD_DN1_FREQ,         0x00003418 },
-               { AUD_DN2_FREQ,         0x000029c7 },
-               { AUD_POLY0_DDS_CONSTANT, 0x000a7540 },
+
+       static const struct rlist a2_deemph50[] = {
+               {AUD_DEEMPH0_G0, 0x00000380},
+               {AUD_DEEMPH1_G0, 0x00000380},
+               {AUD_DEEMPHGAIN_R, 0x000011e1},
+               {AUD_DEEMPHNUMER1_R, 0x0002a7bc},
+               {AUD_DEEMPHNUMER2_R, 0x0003023c},
                { /* end of list */ },
        };
 
-       set_audio_start(core, 0x0004, EN_DMTRX_SUMDIFF | EN_A2_AUTO_STEREO);
-       set_audio_registers(core, a2_common);
+       set_audio_start(core, SEL_A2);
        switch (core->tvaudio) {
-       case WW_A2_BG:
-               dprintk("%s PAL-BG A2 (status: known-good)\n",__FUNCTION__);
-               set_audio_registers(core, a2_table1);
+       case WW_BG:
+               dprintk("%s PAL-BG A1/2 (status: known-good)\n", __FUNCTION__);
+               set_audio_registers(core, a2_bgdk_common);
+               set_audio_registers(core, a2_bg);
+               set_audio_registers(core, a2_deemph50);
                break;
-       case WW_A2_DK:
-               dprintk("%s PAL-DK A2 (status: known-good)\n",__FUNCTION__);
-               set_audio_registers(core, a2_table2);
+       case WW_DK:
+               dprintk("%s PAL-DK A1/2 (status: known-good)\n", __FUNCTION__);
+               set_audio_registers(core, a2_bgdk_common);
+               set_audio_registers(core, a2_dk);
+               set_audio_registers(core, a2_deemph50);
                break;
-       case WW_A2_M:
-               dprintk("%s NTSC-M A2 (status: unknown)\n",__FUNCTION__);
-               set_audio_registers(core, a2_table3);
+       case WW_I:
+               dprintk("%s PAL-I A1 (status: known-good)\n", __FUNCTION__);
+               set_audio_registers(core, a1_i);
+               set_audio_registers(core, a2_deemph50);
+               break;
+       case WW_L:
+               dprintk("%s AM-L (status: devel)\n", __FUNCTION__);
+               set_audio_registers(core, am_l);
+               break;
+       default:
+               dprintk("%s Warning: wrong value\n", __FUNCTION__);
+               return;
                break;
        };
-       set_audio_finish(core);
+
+       mode |= EN_FMRADIO_EN_RDS | EN_DMTRX_SUMDIFF;
+       set_audio_finish(core, mode);
 }
 
 static void set_audio_standard_EIAJ(struct cx88_core *core)
@@ -700,88 +646,130 @@ static void set_audio_standard_EIAJ(struct cx88_core *core)
 
                { /* end of list */ },
        };
-       dprintk("%s (status: unknown)\n",__FUNCTION__);
+       dprintk("%s (status: unknown)\n", __FUNCTION__);
 
-       set_audio_start(core, 0x0002, EN_EIAJ_AUTO_STEREO);
+       set_audio_start(core, SEL_EIAJ);
        set_audio_registers(core, eiaj);
-       set_audio_finish(core);
+       set_audio_finish(core, EN_EIAJ_AUTO_STEREO);
 }
 
-static void set_audio_standard_FM(struct cx88_core *core)
+static void set_audio_standard_FM(struct cx88_core *core,
+                                 enum cx88_deemph_type deemph)
 {
-#if 0 /* FIXME */
-       switch (dev->audio_properties.FM_deemphasis)
-       {
-               case WW_FM_DEEMPH_50:
-                       //Set De-emphasis filter coefficients for 50 usec
-                       cx_write(AUD_DEEMPH0_G0, 0x0C45);
-                       cx_write(AUD_DEEMPH0_A0, 0x6262);
-                       cx_write(AUD_DEEMPH0_B0, 0x1C29);
-                       cx_write(AUD_DEEMPH0_A1, 0x3FC66);
-                       cx_write(AUD_DEEMPH0_B1, 0x399A);
-
-                       cx_write(AUD_DEEMPH1_G0, 0x0D80);
-                       cx_write(AUD_DEEMPH1_A0, 0x6262);
-                       cx_write(AUD_DEEMPH1_B0, 0x1C29);
-                       cx_write(AUD_DEEMPH1_A1, 0x3FC66);
-                       cx_write(AUD_DEEMPH1_B1, 0x399A);
+       static const struct rlist fm_deemph_50[] = {
+               {AUD_DEEMPH0_G0, 0x0C45},
+               {AUD_DEEMPH0_A0, 0x6262},
+               {AUD_DEEMPH0_B0, 0x1C29},
+               {AUD_DEEMPH0_A1, 0x3FC66},
+               {AUD_DEEMPH0_B1, 0x399A},
+
+               {AUD_DEEMPH1_G0, 0x0D80},
+               {AUD_DEEMPH1_A0, 0x6262},
+               {AUD_DEEMPH1_B0, 0x1C29},
+               {AUD_DEEMPH1_A1, 0x3FC66},
+               {AUD_DEEMPH1_B1, 0x399A},
+
+               {AUD_POLYPH80SCALEFAC, 0x0003},
+               { /* end of list */ },
+       };
+       static const struct rlist fm_deemph_75[] = {
+               {AUD_DEEMPH0_G0, 0x091B},
+               {AUD_DEEMPH0_A0, 0x6B68},
+               {AUD_DEEMPH0_B0, 0x11EC},
+               {AUD_DEEMPH0_A1, 0x3FC66},
+               {AUD_DEEMPH0_B1, 0x399A},
+
+               {AUD_DEEMPH1_G0, 0x0AA0},
+               {AUD_DEEMPH1_A0, 0x6B68},
+               {AUD_DEEMPH1_B0, 0x11EC},
+               {AUD_DEEMPH1_A1, 0x3FC66},
+               {AUD_DEEMPH1_B1, 0x399A},
+
+               {AUD_POLYPH80SCALEFAC, 0x0003},
+               { /* end of list */ },
+       };
 
-                       break;
+       /* It is enough to leave default values? */
+       static const struct rlist fm_no_deemph[] = {
 
-               case WW_FM_DEEMPH_75:
-                       //Set De-emphasis filter coefficients for 75 usec
-                       cx_write(AUD_DEEMPH0_G0, 0x91B );
-                       cx_write(AUD_DEEMPH0_A0, 0x6B68);
-                       cx_write(AUD_DEEMPH0_B0, 0x11EC);
-                       cx_write(AUD_DEEMPH0_A1, 0x3FC66);
-                       cx_write(AUD_DEEMPH0_B1, 0x399A);
+               {AUD_POLYPH80SCALEFAC, 0x0003},
+               { /* end of list */ },
+       };
 
-                       cx_write(AUD_DEEMPH1_G0, 0xAA0 );
-                       cx_write(AUD_DEEMPH1_A0, 0x6B68);
-                       cx_write(AUD_DEEMPH1_B0, 0x11EC);
-                       cx_write(AUD_DEEMPH1_A1, 0x3FC66);
-                       cx_write(AUD_DEEMPH1_B1, 0x399A);
+       dprintk("%s (status: unknown)\n", __FUNCTION__);
+       set_audio_start(core, SEL_FMRADIO);
 
-                       break;
-       }
-#endif
+       switch (deemph) {
+       case FM_NO_DEEMPH:
+               set_audio_registers(core, fm_no_deemph);
+               break;
 
-       dprintk("%s (status: unknown)\n",__FUNCTION__);
-       set_audio_start(core, 0x0020, EN_FMRADIO_AUTO_STEREO);
+       case FM_DEEMPH_50:
+               set_audio_registers(core, fm_deemph_50);
+               break;
 
-       // AB: 10/2/01: this register is not being reset appropriately on occasion.
-       cx_write(AUD_POLYPH80SCALEFAC,3);
+       case FM_DEEMPH_75:
+               set_audio_registers(core, fm_deemph_75);
+               break;
+       }
 
-       set_audio_finish(core);
+       set_audio_finish(core, EN_FMRADIO_AUTO_STEREO);
 }
 
 /* ----------------------------------------------------------- */
 
+int cx88_detect_nicam(struct cx88_core *core)
+{
+       int i, j = 0;
+
+       dprintk("start nicam autodetect.\n");
+
+       for (i = 0; i < 6; i++) {
+               /* if bit1=1 then nicam is detected */
+               j += ((cx_read(AUD_NICAM_STATUS2) & 0x02) >> 1);
+
+               if (j == 1) {
+                       dprintk("nicam is detected.\n");
+                       return 1;
+               }
+
+               /* wait a little bit for next reading status */
+               msleep(10);
+       }
+
+       dprintk("nicam is not detected.\n");
+       return 0;
+}
+
 void cx88_set_tvaudio(struct cx88_core *core)
 {
        switch (core->tvaudio) {
        case WW_BTSC:
-               set_audio_standard_BTSC(core,0);
-               break;
-       case WW_NICAM_BGDKL:
-               set_audio_standard_NICAM_L(core,0);
-               break;
-       case WW_NICAM_I:
-               set_audio_standard_PAL_I(core,0);
+               set_audio_standard_BTSC(core, 0, EN_BTSC_AUTO_STEREO);
                break;
-       case WW_A2_BG:
-       case WW_A2_DK:
-       case WW_A2_M:
-               set_audio_standard_A2(core);
+       case WW_BG:
+       case WW_DK:
+       case WW_I:
+       case WW_L:
+               /* prepare all dsp registers */
+               set_audio_standard_A2(core, EN_A2_FORCE_MONO1);
+
+               /* set nicam mode - otherwise
+                  AUD_NICAM_STATUS2 contains wrong values */
+               set_audio_standard_NICAM(core, EN_NICAM_AUTO_STEREO);
+               if (0 == cx88_detect_nicam(core)) {
+                       /* fall back to fm / am mono */
+                       set_audio_standard_A2(core, EN_A2_FORCE_MONO1);
+                       core->use_nicam = 0;
+               } else {
+                       core->use_nicam = 1;
+               }
                break;
        case WW_EIAJ:
                set_audio_standard_EIAJ(core);
                break;
        case WW_FM:
-               set_audio_standard_FM(core);
-               break;
-       case WW_SYSTEM_L_AM:
-               set_audio_standard_NICAM_L(core, 1);
+               set_audio_standard_FM(core, FM_NO_DEEMPH);
                break;
        case WW_NONE:
        default:
@@ -795,24 +783,16 @@ void cx88_set_tvaudio(struct cx88_core *core)
 void cx88_newstation(struct cx88_core *core)
 {
        core->audiomode_manual = UNSET;
-
-       switch (core->tvaudio) {
-       case WW_SYSTEM_L_AM:
-               /* try nicam ... */
-               core->audiomode_current = V4L2_TUNER_MODE_STEREO;
-               set_audio_standard_NICAM_L(core, 1);
-               break;
-       }
 }
 
 void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
 {
-       static char *m[] = {"stereo", "dual mono", "mono", "sap"};
-       static char *p[] = {"no pilot", "pilot c1", "pilot c2", "?"};
-       u32 reg,mode,pilot;
+       static char *m[] = { "stereo", "dual mono", "mono", "sap" };
+       static char *p[] = { "no pilot", "pilot c1", "pilot c2", "?" };
+       u32 reg, mode, pilot;
 
-       reg   = cx_read(AUD_STATUS);
-       mode  = reg & 0x03;
+       reg = cx_read(AUD_STATUS);
+       mode = reg & 0x03;
        pilot = (reg >> 2) & 0x03;
 
        if (core->astat != reg)
@@ -821,17 +801,23 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
                        aud_ctl_names[cx_read(AUD_CTL) & 63]);
        core->astat = reg;
 
+/* TODO
+       Reading from AUD_STATUS is not enough
+       for auto-detecting sap/dual-fm/nicam.
+       Add some code here later.
+*/
+
+# if 0
        t->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_SAP |
-               V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
+           V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
        t->rxsubchans = V4L2_TUNER_SUB_MONO;
-       t->audmode    = V4L2_TUNER_MODE_MONO;
+       t->audmode = V4L2_TUNER_MODE_MONO;
 
        switch (core->tvaudio) {
        case WW_BTSC:
-               t->capability = V4L2_TUNER_CAP_STEREO |
-                       V4L2_TUNER_CAP_SAP;
+               t->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_SAP;
                t->rxsubchans = V4L2_TUNER_SUB_STEREO;
-               if (1 == pilot) {
+               if (1 == pilot) {
                        /* SAP */
                        t->rxsubchans |= V4L2_TUNER_SUB_SAP;
                }
@@ -839,15 +825,17 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
        case WW_A2_BG:
        case WW_A2_DK:
        case WW_A2_M:
-               if (1 == pilot) {
+               if (1 == pilot) {
                        /* stereo */
-                       t->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
+                       t->rxsubchans =
+                           V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
                        if (0 == mode)
                                t->audmode = V4L2_TUNER_MODE_STEREO;
                }
-               if (2 == pilot) {
+               if (2 == pilot) {
                        /* dual language -- FIXME */
-                       t->rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
+                       t->rxsubchans =
+                           V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
                        t->audmode = V4L2_TUNER_MODE_LANG1;
                }
                break;
@@ -857,22 +845,23 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
                        t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
                }
                break;
-        case WW_SYSTEM_L_AM:
-                if (0x0 == mode && !(cx_read(AUD_INIT) & 0x04)) {
-                        t->audmode = V4L2_TUNER_MODE_STEREO;
+       case WW_SYSTEM_L_AM:
+               if (0x0 == mode && !(cx_read(AUD_INIT) & 0x04)) {
+                       t->audmode = V4L2_TUNER_MODE_STEREO;
                        t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
                }
-                break ;
+               break;
        default:
                /* nothing */
                break;
        }
+# endif
        return;
 }
 
 void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
 {
-       u32 ctl  = UNSET;
+       u32 ctl = UNSET;
        u32 mask = UNSET;
 
        if (manual) {
@@ -887,84 +876,74 @@ void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
        case WW_BTSC:
                switch (mode) {
                case V4L2_TUNER_MODE_MONO:
-                       ctl  = EN_BTSC_FORCE_MONO;
-                       mask = 0x3f;
-                       break;
-               case V4L2_TUNER_MODE_SAP:
-                       ctl  = EN_BTSC_FORCE_SAP;
-                       mask = 0x3f;
-                       break;
-               case V4L2_TUNER_MODE_STEREO:
-                       ctl  = EN_BTSC_AUTO_STEREO;
-                       mask = 0x3f;
+                       set_audio_standard_BTSC(core, 0, EN_BTSC_FORCE_MONO);
                        break;
-               }
-               break;
-       case WW_A2_BG:
-       case WW_A2_DK:
-       case WW_A2_M:
-               switch (mode) {
-               case V4L2_TUNER_MODE_MONO:
                case V4L2_TUNER_MODE_LANG1:
-                       ctl  = EN_A2_FORCE_MONO1;
-                       mask = 0x3f;
+                       set_audio_standard_BTSC(core, 0, EN_BTSC_AUTO_STEREO);
                        break;
                case V4L2_TUNER_MODE_LANG2:
-                       ctl  = EN_A2_AUTO_MONO2;
-                       mask = 0x3f;
+                       set_audio_standard_BTSC(core, 1, EN_BTSC_FORCE_SAP);
                        break;
                case V4L2_TUNER_MODE_STEREO:
-                       ctl  = EN_A2_AUTO_STEREO | EN_DMTRX_SUMR;
-                       mask = 0x8bf;
+               case V4L2_TUNER_MODE_LANG1_LANG2:
+                       set_audio_standard_BTSC(core, 0, EN_BTSC_FORCE_STEREO);
                        break;
                }
                break;
-       case WW_NICAM_BGDKL:
-               switch (mode) {
-               case V4L2_TUNER_MODE_MONO:
-                       ctl  = EN_NICAM_FORCE_MONO1;
-                       mask = 0x3f;
-                       break;
-               case V4L2_TUNER_MODE_LANG1:
-                       ctl  = EN_NICAM_AUTO_MONO2;
-                       mask = 0x3f;
-                       break;
-               case V4L2_TUNER_MODE_STEREO:
-                       ctl  = EN_NICAM_FORCE_STEREO | EN_DMTRX_LR;
-                       mask = 0x93f;
-                       break;
-               }
-               break;
-       case WW_SYSTEM_L_AM:
-               switch (mode) {
-               case V4L2_TUNER_MODE_MONO:
-               case V4L2_TUNER_MODE_LANG1:  /* FIXME */
-                       set_audio_standard_NICAM_L(core, 0);
-                       break;
-               case V4L2_TUNER_MODE_STEREO:
-                       set_audio_standard_NICAM_L(core, 1);
-                       break;
-               }
-               break;
-       case WW_NICAM_I:
-               switch (mode) {
-               case V4L2_TUNER_MODE_MONO:
-               case V4L2_TUNER_MODE_LANG1:
-                       set_audio_standard_PAL_I(core, 0);
-                       break;
-               case V4L2_TUNER_MODE_STEREO:
-                       set_audio_standard_PAL_I(core, 1);
-                       break;
+       case WW_BG:
+       case WW_DK:
+       case WW_I:
+       case WW_L:
+               if (1 == core->use_nicam) {
+                       switch (mode) {
+                       case V4L2_TUNER_MODE_MONO:
+                       case V4L2_TUNER_MODE_LANG1:
+                               set_audio_standard_NICAM(core,
+                                                        EN_NICAM_FORCE_MONO1);
+                               break;
+                       case V4L2_TUNER_MODE_LANG2:
+                               set_audio_standard_NICAM(core,
+                                                        EN_NICAM_FORCE_MONO2);
+                               break;
+                       case V4L2_TUNER_MODE_STEREO:
+                       case V4L2_TUNER_MODE_LANG1_LANG2:
+                               set_audio_standard_NICAM(core,
+                                                        EN_NICAM_FORCE_STEREO);
+                               break;
+                       }
+               } else {
+                       if ((core->tvaudio == WW_I) || (core->tvaudio == WW_L)) {
+                               /* fall back to fm / am mono */
+                               set_audio_standard_A2(core, EN_A2_FORCE_MONO1);
+                       } else {
+                               /* TODO: Add A2 autodection */
+                               switch (mode) {
+                               case V4L2_TUNER_MODE_MONO:
+                               case V4L2_TUNER_MODE_LANG1:
+                                       set_audio_standard_A2(core,
+                                                             EN_A2_FORCE_MONO1);
+                                       break;
+                               case V4L2_TUNER_MODE_LANG2:
+                                       set_audio_standard_A2(core,
+                                                             EN_A2_FORCE_MONO2);
+                                       break;
+                               case V4L2_TUNER_MODE_STEREO:
+                               case V4L2_TUNER_MODE_LANG1_LANG2:
+                                       set_audio_standard_A2(core,
+                                                             EN_A2_FORCE_STEREO);
+                                       break;
+                               }
+                       }
                }
                break;
        case WW_FM:
                switch (mode) {
                case V4L2_TUNER_MODE_MONO:
-                       ctl  = EN_FMRADIO_FORCE_MONO;
+                       ctl = EN_FMRADIO_FORCE_MONO;
                        mask = 0x3f;
                        break;
                case V4L2_TUNER_MODE_STEREO:
-                       ctl  = EN_FMRADIO_AUTO_STEREO;
+                       ctl = EN_FMRADIO_AUTO_STEREO;
                        mask = 0x3f;
                        break;
                }
@@ -994,8 +973,8 @@ int cx88_audio_thread(void *data)
                        break;
 
                /* just monitor the audio status for now ... */
-               memset(&t,0,sizeof(t));
-               cx88_get_stereo(core,&t);
+               memset(&t, 0, sizeof(t));
+               cx88_get_stereo(core, &t);
 
                if (UNSET != core->audiomode_manual)
                        /* manually set, don't do anything. */
@@ -1029,4 +1008,5 @@ EXPORT_SYMBOL(cx88_audio_thread);
  * Local variables:
  * c-basic-offset: 8
  * End:
+ * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
  */