From 0fb842f3758a07b52c2fb6175d8c7a9afbaea969 Mon Sep 17 00:00:00 2001 From: "nengwen.chen" Date: Wed, 30 Oct 2019 15:37:59 +0800 Subject: [PATCH] atv_demod: fix atv non-std signal handle [1/1] PD#TV-11542 Problem: fix atv non std handle when video and audio are set at the same time. Solution: 1.fix atv non std handle when video and audio are set at the same time. 2.atv demod version: [V2.14]. 3.branch: amlogic-4.9-dev. Verify: verified by tl1. Change-Id: I4bfc0e076ccde813329c315e4cbcead6e9bf6c94 Signed-off-by: nengwen.chen --- drivers/amlogic/atv_demod/atv_demod_driver.c | 4 ++-- drivers/amlogic/atv_demod/atvdemod_func.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/amlogic/atv_demod/atv_demod_driver.c b/drivers/amlogic/atv_demod/atv_demod_driver.c index bb7bb8886915..e56b3608ad05 100644 --- a/drivers/amlogic/atv_demod/atv_demod_driver.c +++ b/drivers/amlogic/atv_demod/atv_demod_driver.c @@ -45,7 +45,7 @@ #include "atvauddemod_func.h" -#define AMLATVDEMOD_VER "V2.13" +#define AMLATVDEMOD_VER "V2.14" struct aml_atvdemod_device *amlatvdemod_devp; @@ -358,7 +358,7 @@ static ssize_t aml_atvdemod_store(struct class *class, int blk = 0, reg = 0; for (blk = 0; blk <= APB_BLOCK_ADDR_TOP; ++blk) { - for (reg = 0; reg <= 0x40; ++reg) { + for (reg = 0; reg < 0x40; ++reg) { val = atv_dmd_rd_long(blk, reg); pr_err("[0x%04x] = 0x%x.\n", (blk << 8) + (reg << 2), val); diff --git a/drivers/amlogic/atv_demod/atvdemod_func.c b/drivers/amlogic/atv_demod/atvdemod_func.c index 5fef4c3da7ee..56bfd7e8c86e 100644 --- a/drivers/amlogic/atv_demod/atvdemod_func.c +++ b/drivers/amlogic/atv_demod/atvdemod_func.c @@ -260,7 +260,7 @@ void atv_dmd_misc(void) /* for audio non-standard signal, first set gain 0 to mute, * then unmute in detection. */ - if (audio_atv_ov || atv_audio_overmodulated_en) + if ((audio_atv_ov || atv_audio_overmodulated_en) && non_std_en == 0) aml_audio_valume_gain_set(0); else aml_audio_valume_gain_set(audio_gain_val); -- 2.20.1