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

Revert "audio: enable hw resmaple pause thd [1/1]"

Browse Source 
This reverts commit 8398f8a917.

Change-Id: I76a3c8fc66b528b62e57630603ad3887b0b3abdc
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
This commit is contained in:
Jianxin Pan
2019-04-21 19:08:07 -07:00
committed by Tao Zeng
parent 110df547c4
commit d823215a3e
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/amlogic/auge/resample.c
View File

@@ -440,11 +440,11 @@ static const struct snd_kcontrol_new asrc_a_controls[] = {
resample_set_enum),
SOC_SINGLE_EXT_TLV("Hw resample pause enable",
EE_AUDIO_RESAMPLEA_CTRL2, 24, 0x1, 0,
mixer_audiobus_read, NULL,
mixer_audiobus_read, mixer_audiobus_write,
NULL),
SOC_SINGLE_EXT_TLV("Hw resample pause thd",
EE_AUDIO_RESAMPLEA_CTRL2, 11, 0x1fff, 0,
mixer_audiobus_read, NULL,
EE_AUDIO_RESAMPLEA_CTRL2, 0, 0xffffff, 0,
mixer_audiobus_read, mixer_audiobus_write,
NULL),
SOC_ENUM_EXT("Hw resample module",
auge_resample_module_enum,
@@ -459,11 +459,11 @@ static const struct snd_kcontrol_new asrc_b_controls[] = {
resample_set_enum),
SOC_SINGLE_EXT_TLV("Hw resample b pause enable",
EE_AUDIO_RESAMPLEB_CTRL2, 24, 0x1, 0,
mixer_audiobus_read, NULL,
mixer_audiobus_read, mixer_audiobus_write,
NULL),
SOC_SINGLE_EXT_TLV("Hw resample b pause thd",
EE_AUDIO_RESAMPLEB_CTRL2, 11, 0x1fff, 0,
mixer_audiobus_read, NULL,
EE_AUDIO_RESAMPLEB_CTRL2, 0, 0xffffff, 0,
mixer_audiobus_read, mixer_audiobus_write,
NULL),
SOC_ENUM_EXT("Hw resample b module",
auge_resample_module_enum,

11
sound/soc/amlogic/auge/resample_hw.c
View File

@@ -115,7 +115,6 @@ int resample_set_hw_param(enum resample_idx id,
reg = EE_AUDIO_RESAMPLEA_CTRL2 + offset * id;
audiobus_update_bits(reg,
1 << 25, 1 << 25);
resample_set_hw_pause_thd(id, 128);
return 0;
}
@@ -161,13 +160,3 @@ void resample_ctrl_write(enum resample_idx id, int value)
audiobus_write(reg, value);
}
int resample_set_hw_pause_thd(enum resample_idx id, unsigned int thd)
{
int offset = EE_AUDIO_RESAMPLEB_CTRL2 - EE_AUDIO_RESAMPLEA_CTRL2;
int reg = EE_AUDIO_RESAMPLEA_CTRL2 + offset * id;
audiobus_write(reg, 1 << 24 | thd << 11);
return 0;
}

1
sound/soc/amlogic/auge/resample_hw.h
View File

@@ -41,6 +41,5 @@ extern void resample_format_set(enum resample_idx id, int ch_num, int bits);
extern int resample_ctrl_read(enum resample_idx id);
extern void resample_ctrl_write(enum resample_idx id, int value);
int resample_set_hw_pause_thd(enum resample_idx id, unsigned int thd);
#endif