[PATCH] V4L: 919: improves the audio handling for nicam on cx88-audio
[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / media / video / cx88 / cx88-tvaudio.c
index 2765acee0285f7fe216a2d0718731abde310aa59..6d9bec1c583b0ecfb03f28ae70af9c94fb01a238 100644 (file)
 #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]");
 
 #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 {
@@ -97,8 +96,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;
 
@@ -119,17 +117,18 @@ static void set_audio_registers(struct cx88_core *core,
        }
 }
 
-static void set_audio_start(struct cx88_core *core,
-                       u32 mode)
+static void set_audio_start(struct cx88_core *core, u32 mode)
 {
        // mute
-       cx_write(AUD_VOL_CTL,       (1 << 6));
+       cx_write(AUD_VOL_CTL, (1 << 6));
 
        // start programming
-       cx_write(AUD_CTL,           0x0000);
-       cx_write(AUD_INIT,          mode);
-       cx_write(AUD_INIT_LD,       0x0001);
-       cx_write(AUD_SOFT_RESET,    0x0001);
+       cx_write(MO_AUD_DMACNTRL, 0x0000);
+       msleep(100);
+       //cx_write(AUD_CTL, 0x0000);
+       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, u32 ctl)
@@ -148,12 +147,13 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
                cx_write(AUD_I2SCNTL, 0);
                //cx_write(AUD_APB_IN_RATE_ADJ, 0);
        } else {
-       ctl |= EN_DAC_ENABLE;
-       cx_write(AUD_CTL, ctl);
+               ctl |= EN_DAC_ENABLE;
+               cx_write(AUD_CTL, ctl);
        }
 
        /* finish programming */
        cx_write(AUD_SOFT_RESET, 0x0000);
+       cx_write(MO_AUD_DMACNTRL, 0x0003);
 
        /* unmute */
        volume = cx_sread(SHADOW_AUD_VOL_CTL);
@@ -162,486 +162,463 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
 
 /* ----------------------------------------------------------- */
 
-static void set_audio_standard_BTSC(struct cx88_core *core, unsigned int sap, u32 mode)
+static void set_audio_standard_BTSC(struct cx88_core *core, unsigned int sap,
+                                   u32 mode)
 {
        static const struct rlist btsc[] = {
-       { 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 },
+               {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_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 },
+               {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 */ },
        };
 
        mode |= EN_FMRADIO_EN_RDS;
 
        if (sap) {
-               dprintk("%s SAP (status: unknown)\n",__FUNCTION__);
-       set_audio_start(core, SEL_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, SEL_BTSC);
+               dprintk("%s (status: known-good)\n", __FUNCTION__);
+               set_audio_start(core, SEL_BTSC);
                set_audio_registers(core, btsc);
                set_audio_finish(core, mode);
        }
 }
 
-
-static void set_audio_standard_NICAM_L(struct cx88_core *core, int stereo)
+static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode)
 {
-       /* 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 },
+       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 */ },
        };
 
-       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  },
+       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_DMD_RA_DDS,        0x00c0d5ce },
+               {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 */ },
-       } ;
-       dprintk("%s (status: devel), stereo : %d\n",__FUNCTION__,stereo);
-
-       if (!stereo) {
-       /* AM Mono */
-               set_audio_start(core, SEL_A2);
-               set_audio_registers(core, nicam_l_mono);
-       set_audio_finish(core, EN_A2_FORCE_MONO1);
-       } else {
-       /* Nicam Stereo */
-               set_audio_start(core, SEL_NICAM);
-               set_audio_registers(core, nicam_l);
-       set_audio_finish(core, 0x1924); /* FIXME */
-       }
-}
+       };
 
-static void set_audio_standard_PAL_I(struct cx88_core *core, int stereo)
-{
-       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 */ },
+       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 */ },
        };
 
-       dprintk("%s (status: devel), stereo : %d\n",__FUNCTION__,stereo);
+       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 */ },
+       };
 
-       if (!stereo) {
-       /* FM Mono */
-       set_audio_start(core, SEL_A2);
-               set_audio_registers(core, pal_i_fm_mono);
-               set_audio_finish(core, EN_DMTRX_SUMDIFF | EN_A2_FORCE_MONO1);
-       } else {
-       /* Nicam Stereo */
-       set_audio_start(core, SEL_NICAM);
-               set_audio_registers(core, pal_i_nicam);
-               set_audio_finish(core, EN_DMTRX_LR | EN_DMTRX_BYPASS | EN_NICAM_AUTO_STEREO);
-       }
+       set_audio_start(core,SEL_NICAM);
+       switch (core->tvaudio) {
+       case WW_L:
+               dprintk("%s SECAM-L NICAM (status: devel)\n", __FUNCTION__);
+               set_audio_registers(core, nicam_l);
+               break;
+       case WW_I:
+               dprintk("%s PAL-I NICAM (status: devel)\n", __FUNCTION__);
+               set_audio_registers(core, nicam_bgdki_common);
+               set_audio_registers(core, nicam_i);
+               break;
+       default:
+               dprintk("%s PAL-BGDK NICAM (status: unknown)\n", __FUNCTION__);
+               set_audio_registers(core, nicam_bgdki_common);
+               set_audio_registers(core, nicam_default);
+               break;
+       };
+
+       mode |= EN_DMTRX_LR | EN_DMTRX_BYPASS;
+       set_audio_finish(core, mode);
 }
 
 static void set_audio_standard_A2(struct cx88_core *core, u32 mode)
 {
-       static const struct rlist a2_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 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 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},
+               {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},
+               {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 */ },
        };
-/* unknown, probably NTSC-M */
-       static const struct rlist a2_m[] = {
-       {AUD_DMD_RA_DDS,                0x002a0425},
-       {AUD_C1_UP_THR,                 0x00003c00},
-       {AUD_C1_LO_THR,                 0x00003000},
-       {AUD_C2_UP_THR,                 0x00006000},
-       {AUD_C2_LO_THR,                 0x00003c00},
-       {AUD_DEEMPH0_A0,                0x00007a80},
-       {AUD_DEEMPH1_A0,                0x00007a80},
-       {AUD_DEEMPH0_G0,                0x00001200},
-       {AUD_DEEMPH1_G0,                0x00001200},
-       {AUD_DN0_FREQ,                  0x0000283b},
-       {AUD_DN1_FREQ,                  0x00003418},
-       {AUD_DN2_FREQ,                  0x000029c7},
-       {AUD_POLY0_DDS_CONSTANT,        0x000a7540},
+
+       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_deemph50[] = {
-       {AUD_DEEMPH0_G0,                0x00000380},
-       {AUD_DEEMPH1_G0,                0x00000380},
-       {AUD_DEEMPHGAIN_R,              0x000011e1},
-       {AUD_DEEMPHNUMER1_R,            0x0002a7bc},
-       {AUD_DEEMPHNUMER2_R,            0x0003023c},
-       { /* end of list */ },
+       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_deemph75[] = {
-       {AUD_DEEMPH0_G0,                0x00000480},
-       {AUD_DEEMPH1_G0,                0x00000480},
-       {AUD_DEEMPHGAIN_R,              0x00009000},
-       {AUD_DEEMPHNUMER1_R,            0x000353de},
-       {AUD_DEEMPHNUMER2_R,            0x000001b1},
+       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, SEL_A2);
-       set_audio_registers(core, a2_common);
        switch (core->tvaudio) {
-       case WW_A2_BG:
-               dprintk("%s PAL-BG A2 (status: known-good)\n",__FUNCTION__);
-       set_audio_registers(core, a2_bg);
-       set_audio_registers(core, a2_deemph50);
+       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_dk);
-       set_audio_registers(core, a2_deemph50);
+       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_m);
-       set_audio_registers(core, a2_deemph75);
+       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;
        };
 
@@ -656,71 +633,71 @@ 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, SEL_EIAJ);
        set_audio_registers(core, eiaj);
        set_audio_finish(core, EN_EIAJ_AUTO_STEREO);
 }
 
-static void set_audio_standard_FM(struct cx88_core *core, enum cx88_deemph_type deemph)
+static void set_audio_standard_FM(struct cx88_core *core,
+                                 enum cx88_deemph_type deemph)
 {
        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},
+               {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},
+               {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 */ },
        };
 
        /* It is enough to leave default values? */
        static const struct rlist fm_no_deemph[] = {
 
-               { AUD_POLYPH80SCALEFAC, 0x0003},
+               {AUD_POLYPH80SCALEFAC, 0x0003},
                { /* end of list */ },
        };
 
-       dprintk("%s (status: unknown)\n",__FUNCTION__);
+       dprintk("%s (status: unknown)\n", __FUNCTION__);
        set_audio_start(core, SEL_FMRADIO);
 
-       switch (deemph)
-       {
-               case FM_NO_DEEMPH:
-                       set_audio_registers(core, fm_no_deemph);
-                       break;
+       switch (deemph) {
+       case FM_NO_DEEMPH:
+               set_audio_registers(core, fm_no_deemph);
+               break;
 
-               case FM_DEEMPH_50:
-                       set_audio_registers(core, fm_deemph_50);
-                       break;
+       case FM_DEEMPH_50:
+               set_audio_registers(core, fm_deemph_50);
+               break;
 
-               case FM_DEEMPH_75:
-                       set_audio_registers(core, fm_deemph_75);
-                       break;
+       case FM_DEEMPH_75:
+               set_audio_registers(core, fm_deemph_75);
+               break;
        }
 
        set_audio_finish(core, EN_FMRADIO_AUTO_STEREO);
@@ -728,36 +705,64 @@ static void set_audio_standard_FM(struct cx88_core *core, enum cx88_deemph_type
 
 /* ----------------------------------------------------------- */
 
+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);
+
+               /* 3x detected: absolutly sure now */
+               if (j == 3) {
+                       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, EN_BTSC_AUTO_STEREO);
                break;
-       case WW_NICAM_BGDKL:
-               set_audio_standard_NICAM_L(core,0);
-               break;
-       case WW_NICAM_I:
-               set_audio_standard_PAL_I(core,0);
-               break;
-       case WW_A2_BG:
-       case WW_A2_DK:
-       case WW_A2_M:
-       set_audio_standard_A2(core, EN_A2_FORCE_MONO1);
+       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,FM_NO_DEEMPH);
-               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:
                printk("%s/0: unknown tv audio mode [%d]\n",
-               core->name, core->tvaudio);
+                      core->name, core->tvaudio);
                break;
        }
        return;
@@ -766,24 +771,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)
@@ -800,14 +797,13 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
 
 # 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) {
                        /* SAP */
@@ -819,13 +815,15 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
        case WW_A2_M:
                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) {
                        /* 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;
@@ -840,7 +838,7 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
                        t->audmode = V4L2_TUNER_MODE_STEREO;
                        t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
                }
-               break ;
+               break;
        default:
                /* nothing */
                break;
@@ -851,7 +849,7 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
 
 void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
 {
-       u32 ctl  = UNSET;
+       u32 ctl = UNSET;
        u32 mask = UNSET;
 
        if (manual) {
@@ -879,68 +877,58 @@ void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual)
                        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:
-               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:
-               set_audio_standard_A2(core, EN_A2_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:
+                               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:
+                                       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;
                }
@@ -970,8 +958,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. */