projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 709944e)
[media] tm6000: Improve audio standards handling and add SECAM-DK
authorDmitry Belimov <d.belimov@gmail.com>
Tue, 12 Oct 2010 14:39:37 +0000 (11:39 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:17:52 +0000 (01:17 -0200)
Rework audio. Add SECAM-DK, move SECAM to SECAM-B | SECAM-G.

Add some new audio standards and tricks for future, see
tm6000_set_audio_std.

For SECAM-DK it works.

Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/tm6000/tm6000-stds.c patch | blob | blame | history

diff --git a/drivers/staging/tm6000/tm6000-stds.c b/drivers/staging/tm6000/tm6000-stds.c
index 506670282875b1a7aff61e7d649395ad1dc16098..6a571f0856b1173661831112e0e955593424d3da 100644 (file)
--- a/drivers/staging/tm6000/tm6000-stds.c
+++ b/drivers/staging/tm6000/tm6000-stds.c
@@ -112,6 +112,7 @@ static struct tm6000_std_tv_settings tv_stds[] = {
 
                        {TM6010_REQ07_R04_LUMA_HAGC_CONTROL, 0xdc},
                        {TM6010_REQ07_R0D_CHROMA_KILL_LEVEL, 0x07},
+
                        {TM6010_REQ07_R3F_RESET, 0x00},
 
                        {0, 0, 0},
@@ -172,8 +173,9 @@ static struct tm6000_std_tv_settings tv_stds[] = {
 
                        {TM6010_REQ07_R04_LUMA_HAGC_CONTROL, 0xdc},
                        {TM6010_REQ07_R0D_CHROMA_KILL_LEVEL, 0x07},
-                       {TM6010_REQ08_R05_A_STANDARD_MOD, 0x21}, /* FIXME */
+
                        {TM6010_REQ07_R3F_RESET, 0x00},
+
                        {0, 0, 0},
                },
        }, {
@@ -232,12 +234,13 @@ static struct tm6000_std_tv_settings tv_stds[] = {
 
                        {TM6010_REQ07_R04_LUMA_HAGC_CONTROL, 0xdc},
                        {TM6010_REQ07_R0D_CHROMA_KILL_LEVEL, 0x07},
-                       {TM6010_REQ08_R05_A_STANDARD_MOD, 0x76}, /* FIXME */
+
                        {TM6010_REQ07_R3F_RESET, 0x00},
+
                        {0, 0, 0},
                },
        }, {
-               .id = V4L2_STD_SECAM,
+               .id = V4L2_STD_SECAM_B | V4L2_STD_SECAM_G,
                .audio_default_std = BG_NICAM,
                .sif = {
                        {TM6010_REQ08_RE2_POWER_DOWN_CTRL1, 0xf2},
@@ -291,7 +294,66 @@ static struct tm6000_std_tv_settings tv_stds[] = {
                        {TM6010_REQ07_R83_CHROMA_LOCK_CONFIG, 0xFF},
 
                        {TM6010_REQ07_R0D_CHROMA_KILL_LEVEL, 0x07},
-                       {TM6010_REQ08_R05_A_STANDARD_MOD, 0x79},
+
+                       {TM6010_REQ07_R3F_RESET, 0x00},
+                       {0, 0, 0},
+               },
+       }, {
+               .id = V4L2_STD_SECAM_DK,
+               .audio_default_std = DK_NICAM,
+               .sif = {
+                       {TM6010_REQ08_RE2_POWER_DOWN_CTRL1, 0xf2},
+                       {TM6010_REQ08_RE3_ADC_IN1_SEL, 0xf8},
+                       {TM6010_REQ08_RE4_ADC_IN2_SEL, 0xf3},
+                       {TM6010_REQ08_RE6_POWER_DOWN_CTRL2, 0x08},
+                       {TM6010_REQ08_REA_BUFF_DRV_CTRL, 0xf1},
+                       {TM6010_REQ08_REB_SIF_GAIN_CTRL, 0xe0},
+                       {TM6010_REQ08_REC_REVERSE_YC_CTRL, 0xc2},
+                       {TM6010_REQ08_RED_GAIN_SEL, 0xe8},
+                       {TM6010_REQ08_RF0_DAUDIO_INPUT_CONFIG, 0x62},
+                       {TM6010_REQ08_RF1_AADC_POWER_DOWN, 0xfe},
+                       {TM6010_REQ07_RFE_POWER_DOWN, 0xcb},
+                       {0, 0, 0},
+               },
+               .nosif = {
+                       {TM6010_REQ08_RE2_POWER_DOWN_CTRL1, 0xf0},
+                       {TM6010_REQ08_RE3_ADC_IN1_SEL, 0xf8},
+                       {TM6010_REQ08_RE4_ADC_IN2_SEL, 0xf3},
+                       {TM6010_REQ08_RE6_POWER_DOWN_CTRL2, 0x0f},
+                       {TM6010_REQ08_REA_BUFF_DRV_CTRL, 0xf1},
+                       {TM6010_REQ08_REB_SIF_GAIN_CTRL, 0xe0},
+                       {TM6010_REQ08_REC_REVERSE_YC_CTRL, 0xc2},
+                       {TM6010_REQ08_RED_GAIN_SEL, 0xe8},
+                       {TM6010_REQ08_RF0_DAUDIO_INPUT_CONFIG, 0x60},
+                       {TM6010_REQ08_RF1_AADC_POWER_DOWN, 0xfc},
+                       {TM6010_REQ07_RFE_POWER_DOWN, 0x8b},
+                       {0, 0, 0},
+               },
+               .common = {
+                       {TM6010_REQ07_R3F_RESET, 0x01},
+                       {TM6010_REQ07_R00_VIDEO_CONTROL0, 0x38},
+                       {TM6010_REQ07_R01_VIDEO_CONTROL1, 0x0e},
+                       {TM6010_REQ07_R02_VIDEO_CONTROL2, 0x5f},
+                       {TM6010_REQ07_R03_YC_SEP_CONTROL, 0x02},
+                       {TM6010_REQ07_R07_OUTPUT_CONTROL, 0x31},
+                       {TM6010_REQ07_R18_CHROMA_DTO_INCREMENT3, 0x24},
+                       {TM6010_REQ07_R19_CHROMA_DTO_INCREMENT2, 0x92},
+                       {TM6010_REQ07_R1A_CHROMA_DTO_INCREMENT1, 0xe8},
+                       {TM6010_REQ07_R1B_CHROMA_DTO_INCREMENT0, 0xed},
+                       {TM6010_REQ07_R1C_HSYNC_DTO_INCREMENT3, 0x1c},
+                       {TM6010_REQ07_R1D_HSYNC_DTO_INCREMENT2, 0xcc},
+                       {TM6010_REQ07_R1E_HSYNC_DTO_INCREMENT1, 0xcc},
+                       {TM6010_REQ07_R1F_HSYNC_DTO_INCREMENT0, 0xcd},
+                       {TM6010_REQ07_R2E_ACTIVE_VIDEO_HSTART, 0x8c},
+                       {TM6010_REQ07_R30_ACTIVE_VIDEO_VSTART, 0x2c},
+                       {TM6010_REQ07_R31_ACTIVE_VIDEO_VHIGHT, 0xc1},
+                       {TM6010_REQ07_R33_VSYNC_HLOCK_MAX, 0x2c},
+                       {TM6010_REQ07_R35_VSYNC_AGC_MAX, 0x18},
+                       {TM6010_REQ07_R82_COMB_FILTER_CONFIG, 0x42},
+                       {TM6010_REQ07_R83_CHROMA_LOCK_CONFIG, 0xFF},
+
+                       {TM6010_REQ07_R0D_CHROMA_KILL_LEVEL, 0x07},
+
                        {TM6010_REQ07_R3F_RESET, 0x00},
                        {0, 0, 0},
                },
@@ -351,8 +413,9 @@ static struct tm6000_std_tv_settings tv_stds[] = {
 
                        {TM6010_REQ07_R04_LUMA_HAGC_CONTROL, 0xdd},
                        {TM6010_REQ07_R0D_CHROMA_KILL_LEVEL, 0x07},
-                       {TM6010_REQ08_R05_A_STANDARD_MOD, 0x22}, /* FIXME */
+
                        {TM6010_REQ07_R3F_RESET, 0x00},
+
                        {0, 0, 0},
                },
        },
@@ -531,6 +594,48 @@ static struct tm6000_std_settings composite_stds[] = {
                        {0, 0, 0},
                },
        }, {
+               .id = V4L2_STD_SECAM_DK,
+               .audio_default_std = DK_NICAM,
+               .common = {
+                       {TM6010_REQ08_RE2_POWER_DOWN_CTRL1, 0xf0},
+                       {TM6010_REQ08_RE3_ADC_IN1_SEL, 0xf4},
+                       {TM6010_REQ08_RE4_ADC_IN2_SEL, 0xf3},
+                       {TM6010_REQ08_RE6_POWER_DOWN_CTRL2, 0x0f},
+                       {TM6010_REQ08_REA_BUFF_DRV_CTRL, 0xf1},
+                       {TM6010_REQ08_REB_SIF_GAIN_CTRL, 0xe0},
+                       {TM6010_REQ08_REC_REVERSE_YC_CTRL, 0xc2},
+                       {TM6010_REQ08_RED_GAIN_SEL, 0xe8},
+                       {TM6010_REQ08_RF0_DAUDIO_INPUT_CONFIG, 0x68},
+                       {TM6010_REQ08_RF1_AADC_POWER_DOWN, 0xfc},
+                       {TM6010_REQ07_RFE_POWER_DOWN, 0x8b},
+
+                       {TM6010_REQ07_R3F_RESET, 0x01},
+                       {TM6010_REQ07_R00_VIDEO_CONTROL0, 0x38},
+                       {TM6010_REQ07_R01_VIDEO_CONTROL1, 0x0e},
+                       {TM6010_REQ07_R02_VIDEO_CONTROL2, 0x5f},
+                       {TM6010_REQ07_R03_YC_SEP_CONTROL, 0x02},
+                       {TM6010_REQ07_R07_OUTPUT_CONTROL, 0x31},
+                       {TM6010_REQ07_R18_CHROMA_DTO_INCREMENT3, 0x24},
+                       {TM6010_REQ07_R19_CHROMA_DTO_INCREMENT2, 0x92},
+                       {TM6010_REQ07_R1A_CHROMA_DTO_INCREMENT1, 0xe8},
+                       {TM6010_REQ07_R1B_CHROMA_DTO_INCREMENT0, 0xed},
+                       {TM6010_REQ07_R1C_HSYNC_DTO_INCREMENT3, 0x1c},
+                       {TM6010_REQ07_R1D_HSYNC_DTO_INCREMENT2, 0xcc},
+                       {TM6010_REQ07_R1E_HSYNC_DTO_INCREMENT1, 0xcc},
+                       {TM6010_REQ07_R1F_HSYNC_DTO_INCREMENT0, 0xcd},
+                       {TM6010_REQ07_R2E_ACTIVE_VIDEO_HSTART, 0x8c},
+                       {TM6010_REQ07_R30_ACTIVE_VIDEO_VSTART, 0x2c},
+                       {TM6010_REQ07_R31_ACTIVE_VIDEO_VHIGHT, 0xc1},
+                       {TM6010_REQ07_R33_VSYNC_HLOCK_MAX, 0x2c},
+                       {TM6010_REQ07_R35_VSYNC_AGC_MAX, 0x18},
+                       {TM6010_REQ07_R82_COMB_FILTER_CONFIG, 0x42},
+                       {TM6010_REQ07_R83_CHROMA_LOCK_CONFIG, 0xFF},
+
+                       {TM6010_REQ07_R0D_CHROMA_KILL_LEVEL, 0x07},
+                       {TM6010_REQ07_R3F_RESET, 0x00},
+                       {0, 0, 0},
+               },
+       }, {
                .id = V4L2_STD_NTSC,
                .audio_default_std = BTSC,
                .common = {
@@ -749,6 +854,48 @@ static struct tm6000_std_settings svideo_stds[] = {
                        {0, 0, 0},
                },
        }, {
+               .id = V4L2_STD_SECAM_DK,
+               .audio_default_std = DK_NICAM,
+               .common = {
+                       {TM6010_REQ08_RE2_POWER_DOWN_CTRL1, 0xf0},
+                       {TM6010_REQ08_RE3_ADC_IN1_SEL, 0xfc},
+                       {TM6010_REQ08_RE4_ADC_IN2_SEL, 0xf8},
+                       {TM6010_REQ08_RE6_POWER_DOWN_CTRL2, 0x00},
+                       {TM6010_REQ08_REA_BUFF_DRV_CTRL, 0xf2},
+                       {TM6010_REQ08_REB_SIF_GAIN_CTRL, 0xf0},
+                       {TM6010_REQ08_REC_REVERSE_YC_CTRL, 0xc2},
+                       {TM6010_REQ08_RED_GAIN_SEL, 0xe0},
+                       {TM6010_REQ08_RF0_DAUDIO_INPUT_CONFIG, 0x68},
+                       {TM6010_REQ08_RF1_AADC_POWER_DOWN, 0xfc},
+                       {TM6010_REQ07_RFE_POWER_DOWN, 0x8a},
+
+                       {TM6010_REQ07_R3F_RESET, 0x01},
+                       {TM6010_REQ07_R00_VIDEO_CONTROL0, 0x39},
+                       {TM6010_REQ07_R01_VIDEO_CONTROL1, 0x0e},
+                       {TM6010_REQ07_R02_VIDEO_CONTROL2, 0x5f},
+                       {TM6010_REQ07_R03_YC_SEP_CONTROL, 0x03},
+                       {TM6010_REQ07_R07_OUTPUT_CONTROL, 0x31},
+                       {TM6010_REQ07_R18_CHROMA_DTO_INCREMENT3, 0x24},
+                       {TM6010_REQ07_R19_CHROMA_DTO_INCREMENT2, 0x92},
+                       {TM6010_REQ07_R1A_CHROMA_DTO_INCREMENT1, 0xe8},
+                       {TM6010_REQ07_R1B_CHROMA_DTO_INCREMENT0, 0xed},
+                       {TM6010_REQ07_R1C_HSYNC_DTO_INCREMENT3, 0x1c},
+                       {TM6010_REQ07_R1D_HSYNC_DTO_INCREMENT2, 0xcc},
+                       {TM6010_REQ07_R1E_HSYNC_DTO_INCREMENT1, 0xcc},
+                       {TM6010_REQ07_R1F_HSYNC_DTO_INCREMENT0, 0xcd},
+                       {TM6010_REQ07_R2E_ACTIVE_VIDEO_HSTART, 0x8c},
+                       {TM6010_REQ07_R30_ACTIVE_VIDEO_VSTART, 0x2a},
+                       {TM6010_REQ07_R31_ACTIVE_VIDEO_VHIGHT, 0xc1},
+                       {TM6010_REQ07_R33_VSYNC_HLOCK_MAX, 0x2c},
+                       {TM6010_REQ07_R35_VSYNC_AGC_MAX, 0x18},
+                       {TM6010_REQ07_R82_COMB_FILTER_CONFIG, 0x42},
+                       {TM6010_REQ07_R83_CHROMA_LOCK_CONFIG, 0xFF},
+
+                       {TM6010_REQ07_R0D_CHROMA_KILL_LEVEL, 0x07},
+                       {TM6010_REQ07_R3F_RESET, 0x00},
+                       {0, 0, 0},
+               },
+       }, {
                .id = V4L2_STD_NTSC,
                .audio_default_std = BTSC,
                .common = {
@@ -799,129 +946,126 @@ static struct tm6000_std_settings svideo_stds[] = {
 static int tm6000_set_audio_std(struct tm6000_core *dev,
                                enum tm6000_audio_std std)
 {
+       uint8_t areg_02 = 0x04; /* GC1 Fixed gain 0dB */
+       uint8_t areg_05 = 0x09; /* Auto 4.5 = M Japan, Auto 6.5 = DK */
+       uint8_t areg_06 = 0x02; /* Auto de-emphasis, mannual channel mode */
+       uint8_t mono_flag = 0;  /* No mono */
+       uint8_t nicam_flag = 0; /* No NICAM */
+
        switch (std) {
+#if 0
+       case DK_MONO:
+               mono_flag = 1;
+               break;
+       case DK_A2_1:
+               break;
+       case DK_A2_3:
+               areg_05 = 0x0b;
+               break;
+       case BG_MONO:
+               mono_flag = 1;
+               areg_05 = 0x05;
+               break;
+#endif
        case BG_NICAM:
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R02_A_FIX_GAIN_CTRL, 0x11);
-               tm6000_set_reg(dev, TM6010_REQ08_R03_A_AUTO_GAIN_CTRL, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R05_A_STANDARD_MOD, 0x01);
-               tm6000_set_reg(dev, TM6010_REQ08_R06_A_SOUND_MOD, 0x06);
-               tm6000_set_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, 0x91);
-               tm6000_set_reg(dev, TM6010_REQ08_R16_A_AGC_GAIN_MAX, 0xfe);
-               tm6000_set_reg(dev, TM6010_REQ08_R17_A_AGC_GAIN_MIN, 0x01);
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x80);
+               areg_05 = 0x07;
+               nicam_flag = 1;
                break;
        case BTSC:
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R02_A_FIX_GAIN_CTRL, 0x04);
-               tm6000_set_reg(dev, TM6010_REQ08_R03_A_AUTO_GAIN_CTRL, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R05_A_STANDARD_MOD, 0x02);
-               tm6000_set_reg(dev, TM6010_REQ08_R06_A_SOUND_MOD, 0x06);
-               tm6000_set_reg(dev, TM6010_REQ08_R09_A_MAIN_VOL, 0x08);
-               tm6000_set_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, 0x91);
-               tm6000_set_reg(dev, TM6010_REQ08_R0E_A_MONO_THRES1, 0xf0);
-               tm6000_set_reg(dev, TM6010_REQ08_R0F_A_MONO_THRES2, 0x80);
-               tm6000_set_reg(dev, TM6010_REQ08_R10_A_MUTE_THRES1, 0xc0);
-               tm6000_set_reg(dev, TM6010_REQ08_R11_A_MUTE_THRES2, 0x80);
-               tm6000_set_reg(dev, TM6010_REQ08_R16_A_AGC_GAIN_MAX, 0xfe);
-               tm6000_set_reg(dev, TM6010_REQ08_R17_A_AGC_GAIN_MIN, 0x01);
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x80);
+               areg_05 = 0x02;
                break;
        case BG_A2:
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R02_A_FIX_GAIN_CTRL, 0x04);
-               tm6000_set_reg(dev, TM6010_REQ08_R03_A_AUTO_GAIN_CTRL, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R05_A_STANDARD_MOD, 0x05);
-               tm6000_set_reg(dev, TM6010_REQ08_R06_A_SOUND_MOD, 0x06);
-               tm6000_set_reg(dev, TM6010_REQ08_R09_A_MAIN_VOL, 0x08);
-               tm6000_set_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, 0x91);
-               tm6000_set_reg(dev, TM6010_REQ08_R0E_A_MONO_THRES1, 0xf0);
-               tm6000_set_reg(dev, TM6010_REQ08_R0F_A_MONO_THRES2, 0x80);
-               tm6000_set_reg(dev, TM6010_REQ08_R10_A_MUTE_THRES1, 0xc0);
-               tm6000_set_reg(dev, TM6010_REQ08_R11_A_MUTE_THRES2, 0x80);
-               tm6000_set_reg(dev, TM6010_REQ08_R16_A_AGC_GAIN_MAX, 0xfe);
-               tm6000_set_reg(dev, TM6010_REQ08_R17_A_AGC_GAIN_MIN, 0x01);
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x80);
+               areg_05 = 0x05;
                break;
        case DK_NICAM:
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R02_A_FIX_GAIN_CTRL, 0x04);
-               tm6000_set_reg(dev, TM6010_REQ08_R03_A_AUTO_GAIN_CTRL, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R05_A_STANDARD_MOD, 0x06);
-               tm6000_set_reg(dev, TM6010_REQ08_R06_A_SOUND_MOD, 0x06);
-               tm6000_set_reg(dev, TM6010_REQ08_R09_A_MAIN_VOL, 0x08);
-               tm6000_set_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, 0x91);
-               tm6000_set_reg(dev, TM6010_REQ08_R0C_A_ASD_THRES2, 0x0a);
-               tm6000_set_reg(dev, TM6010_REQ08_R16_A_AGC_GAIN_MAX, 0xfe);
-               tm6000_set_reg(dev, TM6010_REQ08_R17_A_AGC_GAIN_MIN, 0x01);
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x80);
+               areg_05 = 0x06;
+               nicam_flag = 1;
                break;
        case EIAJ:
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R02_A_FIX_GAIN_CTRL, 0x04);
-               tm6000_set_reg(dev, TM6010_REQ08_R03_A_AUTO_GAIN_CTRL, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R05_A_STANDARD_MOD, 0x03);
-               tm6000_set_reg(dev, TM6010_REQ08_R06_A_SOUND_MOD, 0x06);
-               tm6000_set_reg(dev, TM6010_REQ08_R09_A_MAIN_VOL, 0x08);
-               tm6000_set_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, 0x91);
-               tm6000_set_reg(dev, TM6010_REQ08_R16_A_AGC_GAIN_MAX, 0xfe);
-               tm6000_set_reg(dev, TM6010_REQ08_R17_A_AGC_GAIN_MIN, 0x01);
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x80);
+               areg_05 = 0x02;
                break;
        case FM_RADIO:
                tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R02_A_FIX_GAIN_CTRL, 0x01);
+               tm6000_set_reg(dev, TM6010_REQ08_R02_A_FIX_GAIN_CTRL, 0x04);
                tm6000_set_reg(dev, TM6010_REQ08_R03_A_AUTO_GAIN_CTRL, 0x00);
                tm6000_set_reg(dev, TM6010_REQ08_R05_A_STANDARD_MOD, 0x0c);
                tm6000_set_reg(dev, TM6010_REQ08_R06_A_SOUND_MOD, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R09_A_MAIN_VOL, 0x10);
+               tm6000_set_reg(dev, TM6010_REQ08_R09_A_MAIN_VOL, 0x18);
                tm6000_set_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, 0x91);
                tm6000_set_reg(dev, TM6010_REQ08_R16_A_AGC_GAIN_MAX, 0xfe);
                tm6000_set_reg(dev, TM6010_REQ08_R17_A_AGC_GAIN_MIN, 0x01);
+               tm6000_set_reg(dev, TM6010_REQ08_R1E_A_GAIN_DEEMPH_OUT, 0x13);
                tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x80);
+               return 0;
                break;
        case I_NICAM:
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R02_A_FIX_GAIN_CTRL, 0x04);
-               tm6000_set_reg(dev, TM6010_REQ08_R03_A_AUTO_GAIN_CTRL, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R05_A_STANDARD_MOD, 0x01);
-               tm6000_set_reg(dev, TM6010_REQ08_R06_A_SOUND_MOD, 0x06);
-               tm6000_set_reg(dev, TM6010_REQ08_R09_A_MAIN_VOL, 0x08);
-               tm6000_set_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, 0x91);
-               tm6000_set_reg(dev, TM6010_REQ08_R0C_A_ASD_THRES2, 0x0a);
-               tm6000_set_reg(dev, TM6010_REQ08_R16_A_AGC_GAIN_MAX, 0xfe);
-               tm6000_set_reg(dev, TM6010_REQ08_R17_A_AGC_GAIN_MIN, 0x01);
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x80);
+               areg_05 = 0x08;
+               nicam_flag = 1;
                break;
        case KOREA_A2:
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R02_A_FIX_GAIN_CTRL, 0x04);
-               tm6000_set_reg(dev, TM6010_REQ08_R03_A_AUTO_GAIN_CTRL, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R05_A_STANDARD_MOD, 0x04);
-               tm6000_set_reg(dev, TM6010_REQ08_R06_A_SOUND_MOD, 0x06);
-               tm6000_set_reg(dev, TM6010_REQ08_R09_A_MAIN_VOL, 0x08);
-               tm6000_set_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, 0x91);
-               tm6000_set_reg(dev, TM6010_REQ08_R0E_A_MONO_THRES1, 0xf0);
-               tm6000_set_reg(dev, TM6010_REQ08_R0F_A_MONO_THRES2, 0x80);
-               tm6000_set_reg(dev, TM6010_REQ08_R10_A_MUTE_THRES1, 0xc0);
-               tm6000_set_reg(dev, TM6010_REQ08_R11_A_MUTE_THRES2, 0xf0);
-               tm6000_set_reg(dev, TM6010_REQ08_R16_A_AGC_GAIN_MAX, 0xfe);
-               tm6000_set_reg(dev, TM6010_REQ08_R17_A_AGC_GAIN_MIN, 0x01);
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x80);
+               areg_05 = 0x04;
                break;
        case L_NICAM:
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R02_A_FIX_GAIN_CTRL, 0x02);
-               tm6000_set_reg(dev, TM6010_REQ08_R03_A_AUTO_GAIN_CTRL, 0x00);
-               tm6000_set_reg(dev, TM6010_REQ08_R05_A_STANDARD_MOD, 0x0a);
-               tm6000_set_reg(dev, TM6010_REQ08_R06_A_SOUND_MOD, 0x06);
-               tm6000_set_reg(dev, TM6010_REQ08_R09_A_MAIN_VOL, 0x08);
-               tm6000_set_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, 0x91);
-               tm6000_set_reg(dev, TM6010_REQ08_R16_A_AGC_GAIN_MAX, 0xfe);
-               tm6000_set_reg(dev, TM6010_REQ08_R17_A_AGC_GAIN_MIN, 0x01);
-               tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x80);
+               areg_02 = 0x02; /* GC1 Fixed gain +12dB */
+               areg_05 = 0x0a;
+               nicam_flag = 1;
                break;
        }
+
+#if 0
+       switch (tv_audio_mode) {
+       case TV_MONO:
+               areg_06 = (nicam_flag) ? 0x03 : 0x00;
+               break;
+       case TV_LANG_A:
+               areg_06 = 0x00;
+               break;
+       case TV_LANG_B:
+               areg_06 = 0x01;
+               break;
+       }
+#endif
+
+       if (mono_flag)
+               areg_06 = 0x00;
+
+       tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x00);
+       tm6000_set_reg(dev, TM6010_REQ08_R02_A_FIX_GAIN_CTRL, areg_02);
+       tm6000_set_reg(dev, TM6010_REQ08_R03_A_AUTO_GAIN_CTRL, 0x00);
+       tm6000_set_reg(dev, TM6010_REQ08_R04_A_SIF_AMP_CTRL, 0xa0);
+       tm6000_set_reg(dev, TM6010_REQ08_R05_A_STANDARD_MOD, areg_05);
+       tm6000_set_reg(dev, TM6010_REQ08_R06_A_SOUND_MOD, areg_06);
+       tm6000_set_reg(dev, TM6010_REQ08_R07_A_LEFT_VOL, 0x00);
+       tm6000_set_reg(dev, TM6010_REQ08_R08_A_RIGHT_VOL, 0x00);
+       tm6000_set_reg(dev, TM6010_REQ08_R09_A_MAIN_VOL, 0x08);
+       tm6000_set_reg(dev, TM6010_REQ08_R0A_A_I2S_MOD, 0x91);
+       tm6000_set_reg(dev, TM6010_REQ08_R0B_A_ASD_THRES1, 0x20);
+       tm6000_set_reg(dev, TM6010_REQ08_R0C_A_ASD_THRES2, 0x12);
+       tm6000_set_reg(dev, TM6010_REQ08_R0D_A_AMD_THRES, 0x20);
+       tm6000_set_reg(dev, TM6010_REQ08_R0E_A_MONO_THRES1, 0xf0);
+       tm6000_set_reg(dev, TM6010_REQ08_R0F_A_MONO_THRES2, 0x80);
+       tm6000_set_reg(dev, TM6010_REQ08_R10_A_MUTE_THRES1, 0xc0);
+       tm6000_set_reg(dev, TM6010_REQ08_R11_A_MUTE_THRES2, 0x80);
+       tm6000_set_reg(dev, TM6010_REQ08_R12_A_AGC_U, 0x12);
+       tm6000_set_reg(dev, TM6010_REQ08_R13_A_AGC_ERR_T, 0xfe);
+       tm6000_set_reg(dev, TM6010_REQ08_R14_A_AGC_GAIN_INIT, 0x20);
+       tm6000_set_reg(dev, TM6010_REQ08_R15_A_AGC_STEP_THR, 0x14);
+       tm6000_set_reg(dev, TM6010_REQ08_R16_A_AGC_GAIN_MAX, 0xfe);
+       tm6000_set_reg(dev, TM6010_REQ08_R17_A_AGC_GAIN_MIN, 0x01);
+       tm6000_set_reg(dev, TM6010_REQ08_R18_A_TR_CTRL, 0xa0);
+       tm6000_set_reg(dev, TM6010_REQ08_R19_A_FH_2FH_GAIN, 0x32);
+       tm6000_set_reg(dev, TM6010_REQ08_R1A_A_NICAM_SER_MAX, 0x64);
+       tm6000_set_reg(dev, TM6010_REQ08_R1B_A_NICAM_SER_MIN, 0x20);
+       tm6000_set_reg(dev, REQ_08_SET_GET_AVREG_BIT, 0x1c, 0x00);
+       tm6000_set_reg(dev, REQ_08_SET_GET_AVREG_BIT, 0x1d, 0x00);
+       tm6000_set_reg(dev, TM6010_REQ08_R1E_A_GAIN_DEEMPH_OUT, 0x13);
+       tm6000_set_reg(dev, TM6010_REQ08_R1F_A_TEST_INTF_SEL, 0x00);
+       tm6000_set_reg(dev, TM6010_REQ08_R20_A_TEST_PIN_SEL, 0x00);
+       tm6000_set_reg(dev, TM6010_REQ08_RE4_ADC_IN2_SEL, 0xf3);
+       tm6000_set_reg(dev, TM6010_REQ08_R06_A_SOUND_MOD, 0x00);
+       tm6000_set_reg(dev, TM6010_REQ08_RF1_AADC_POWER_DOWN, 0xfc);
+       tm6000_set_reg(dev, TM6010_REQ08_R01_A_INIT, 0x80);
+
        return 0;
 }