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

atv_demod: fix commit "c12f8957d441e99d3c037dfe1f36029f55421fe3". [1/1]

Browse Source 
PD#TV-6044, PD#TV-6047

Problem:
1.fix commit "c12f8957d441e99d3c037dfe1f36029f55421fe3".

Solution:
1.fix commit "c12f8957d441e99d3c037dfe1f36029f55421fe3".

Verify:
Verified by x301

Change-Id: I8e8632e608b8e0ddd8757409af6c5509bafd801d
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
This commit is contained in:
nengwen.chen
2019-06-12 17:22:30 +08:00
parent c12f8957d4
commit fb0dc0acf8
2 changed files with 17 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1667,22 +1667,16 @@ void set_outputmode_status_init(void)
void set_output_left_right_exchange(unsigned int ch)
{
#if 0 /* use audio module interface */
unsigned int read = 0;
atvaudio_ctrl_read(&read);
if (is_meson_tl1_cpu() || is_meson_tm2_cpu()) { /* bit[19] */
if ((read & (1 << 19)) != ((ch & 0x01) << 19))
atvaudio_ctrl_write((read & ~(1 << 19)) |
((ch & 0x01) << 19));
} else { /* bit[2] */
if ((read & (1 << 2)) != ((ch & 0x01) << 2))
atvaudio_ctrl_write((read & ~(1 << 2)) |
((ch & 0x01) << 2));
}
#ifdef CONFIG_AMLOGIC_SND_SOC_AUGE
if (ch)
fratv_LR_swap(true);
else
fratv_LR_swap(false);
#else
if (ch)
atv_LR_swap(true);
else
atv_LR_swap(false);
#endif
}
@@ -1692,26 +1686,15 @@ void set_output_left_right_exchange(unsigned int ch)
*/
void audio_source_select(int source)
{
#if 0 /* use audio module interface */
unsigned int reg = 0;
atvaudio_ctrl_read(&reg);
if (source) {
if (is_meson_tl1_cpu() || is_meson_tm2_cpu())
atvaudio_ctrl_write(reg | 0x100000);/* bit20 */
else
atvaudio_ctrl_write(reg | 0x3);/* bit[1-0] */
} else {
if (is_meson_tl1_cpu() || is_meson_tm2_cpu())
atvaudio_ctrl_write(reg & (~0x100000));/* bit20 */
else
atvaudio_ctrl_write(reg & (~0x3));/* bit[1-0] */
}
#ifdef CONFIG_AMLOGIC_SND_SOC_AUGE
if (source)
fratv_src_select(true);
else
fratv_src_select(false);
#else
if (source)
fratv_src_select(1);
atv_LR_swap(true);
else
fratv_src_select(0);
atv_LR_swap(false);
#endif
}

2
drivers/amlogic/atv_demod/atvauddemod_func.h
View File

@@ -23,7 +23,7 @@
#ifdef CONFIG_AMLOGIC_SND_SOC_AUGE
#include "sound/soc/amlogic/auge/audio_utils.h"
#else
#include "sound/soc/amlogic/meson/audio_utils.h"
#include "sound/soc/amlogic/meson/audio_hw.h"
#endif
extern unsigned int signal_audmode;