diff --git a/drivers/amlogic/atv_demod/atv_demod_debug.c b/drivers/amlogic/atv_demod/atv_demod_debug.c
index 00dab54a6b8a..551ef3bbed3b 100644
--- a/drivers/amlogic/atv_demod/atv_demod_debug.c
+++ b/drivers/amlogic/atv_demod/atv_demod_debug.c
@@ -52,6 +52,8 @@
 	DEBUGFS_CREATE_NODE(aud_std, 0640, dentry, u32)\
 	DEBUGFS_CREATE_NODE(aud_mode, 0640, dentry, u32)\
 	DEBUGFS_CREATE_NODE(aud_auto, 0640, dentry, u32)\
+	DEBUGFS_CREATE_NODE(aud_reinit, 0640, dentry, u32)\
+	DEBUGFS_CREATE_NODE(aud_mono_only, 0640, dentry, u32)\
 	DEBUGFS_CREATE_NODE(over_threshold, 0640, dentry, u64)\
 	DEBUGFS_CREATE_NODE(input_amplitude, 0640, dentry, u64)\
 	DEBUGFS_CREATE_NODE(atvaudio_det_outputmode_en, 0640, dentry, bool)\
diff --git a/drivers/amlogic/atv_demod/atv_demod_ops.c b/drivers/amlogic/atv_demod/atv_demod_ops.c
index f323460a751d..0dedd6f2b8d8 100644
--- a/drivers/amlogic/atv_demod/atv_demod_ops.c
+++ b/drivers/amlogic/atv_demod/atv_demod_ops.c
@@ -440,7 +440,7 @@ static struct analog_demod_ops atvdemod_ops = {
 };
 
 
-unsigned int tuner_status_cnt = 8; /* 4-->16 test on sky mxl661 */
+unsigned int tuner_status_cnt = 4; /* 4-->16 test on sky mxl661 */
 
 bool slow_mode;
 
@@ -985,7 +985,7 @@ static enum v4l2_search atvdemod_fe_search(struct v4l2_frontend *v4l2_fe)
 		pr_dbg("[%s] slow mode to search the channel\n", __func__);
 		afc_step = ATV_AFC_1_0MHZ;
 	} else if (!slow_mode) {
-		afc_step = ATV_AFC_2_0MHZ;
+		afc_step = p->afc_range/* ATV_AFC_2_0MHZ */;
 	} else {
 		pr_dbg("[%s] slow mode to search the channel\n", __func__);
 		afc_step = ATV_AFC_1_0MHZ;
@@ -1098,7 +1098,7 @@ static enum v4l2_search atvdemod_fe_search(struct v4l2_frontend *v4l2_fe)
 						auto_search_std,
 						&std_bk, &audio, &soundsys);
 
-				pr_dbg("[%s] freq:%d, std_bk:0x%x, audmode:0x%x, search OK.\n",
+				pr_info("[%s] freq:%d, std_bk:0x%x, audmode:0x%x, search OK.\n",
 						__func__, p->frequency,
 						(unsigned int) std_bk, audio);
 
@@ -1120,21 +1120,6 @@ static enum v4l2_search atvdemod_fe_search(struct v4l2_frontend *v4l2_fe)
 			}
 		}
 
-		/*avoid sound format is not match after search over */
-		if (std_bk != 0 && audio != 0) {
-			p->std = std_bk;
-			p->audmode = audio;
-
-			params.frequency = p->frequency;
-			params.mode = p->afc_range;
-			params.audmode = p->audmode;
-			params.std = p->std;
-
-			fe->ops.analog_ops.set_params(fe, &params);
-			std_bk = 0;
-			audio = 0;
-		}
-
 		pr_dbg("[%s] freq[analog.std:0x%08x] is[%d] unlock\n",
 				__func__,
 				(uint32_t) p->std, p->frequency);