shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

atv_demod: audio: fix audio source contorl for atv demod [1/1]

Browse Source 
PD#TV-9484

Problem:
1.fix audio source contorl for atv demod.

Solution:
1.fix audio source contorl for atv demod.
2.increase the output power of ATV audio.

Verify:
Verified by r311.

Change-Id: I1332dcd3b968790e3227170799ddb019578fe431
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
This commit is contained in:
nengwen.chen
2019-08-30 19:41:40 +08:00
committed by Luke Go
parent 2ef271dfb3
commit 9bf5804009
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/amlogic/atv_demod/atvauddemod_func.c
View File

@@ -317,7 +317,7 @@ static void set_deem_and_gain(int standard)
case AUDIO_STANDARD_BTSC:
deem = AUDIO_DEEM_75US;
lmr_gain = 0x1e8;
lpr_gain = 0x3e0;
lpr_gain = 0x3c0;
demod_gain = 0x2;
break;
case AUDIO_STANDARD_A2_K:
@@ -335,25 +335,25 @@ static void set_deem_and_gain(int standard)
case AUDIO_STANDARD_A2_BG:
deem = AUDIO_DEEM_50US;
lmr_gain = 0x3a8;
lpr_gain = 0x1d0;
lpr_gain = 0x1f6;
demod_gain = 0x222;
break;
case AUDIO_STANDARD_A2_DK1:
deem = AUDIO_DEEM_50US;
lmr_gain = 0x3a8;
lpr_gain = 0x1d0;
lpr_gain = 0x1f6;
demod_gain = 0x222;
break;
case AUDIO_STANDARD_A2_DK2:
deem = AUDIO_DEEM_50US;
lmr_gain = 0x3a8;
lpr_gain = 0x1d0;
lpr_gain = 0x1f6;
demod_gain = 0x222;
break;
case AUDIO_STANDARD_A2_DK3:
deem = AUDIO_DEEM_50US;
lmr_gain = 0x3a8;
lpr_gain = 0x1d0;
lpr_gain = 0x1f6;
demod_gain = 0x222;
break;
case AUDIO_STANDARD_NICAM_DK:
@@ -363,7 +363,7 @@ static void set_deem_and_gain(int standard)
break;
case AUDIO_STANDARD_NICAM_I:
deem = AUDIO_DEEM_J17_2;
lpr_gain = 0x200;
lpr_gain = 0x177;
demod_gain = 0x233;
break;
case AUDIO_STANDARD_NICAM_BG:
@@ -391,7 +391,7 @@ static void set_deem_and_gain(int standard)
case AUDIO_STANDARD_MONO_I:
deem = AUDIO_DEEM_J17_2;
lmr_gain = 0x3a8;
lpr_gain = 0x200;
lpr_gain = 0x1c5;
demod_gain = 0x233;
break;
case AUDIO_STANDARD_MONO_BG:
@@ -1593,8 +1593,10 @@ void set_outputmode(uint32_t standard, uint32_t outmode)
aud_std = AUDIO_STANDARD_NICAM_L;
audio_source_select(1);
} else
audio_source_select(0);
} else {
if (standard == AUDIO_STANDARD_MONO_L)
audio_source_select(0);
}
break;
}

2
sound/soc/amlogic/meson/audio_hw.c
View File

@@ -468,7 +468,7 @@ static void i2sin_fifo2_set_buf(u32 addr, u32 size, u32 src, u32 ch)
void atv_src_select(bool src)
{
aml_audin_update_bits(AUDIN_ATV_DEMOD_CTRL,
0x3, (src << 1) && src);
0x3, (src ? 0x3 : 0x0));
}
void atv_LR_swap(bool swap)