diff --git a/drivers/amlogic/atv_demod/atv_demod_ops.c b/drivers/amlogic/atv_demod/atv_demod_ops.c
index 7d23c8d50215..f2320a7744bd 100644
--- a/drivers/amlogic/atv_demod/atv_demod_ops.c
+++ b/drivers/amlogic/atv_demod/atv_demod_ops.c
@@ -485,7 +485,7 @@ int atv_demod_enter_mode(struct dvb_frontend *fe)
 		}
 	}
 
-	adc_set_pll_cntl(1, 0x1, NULL);
+	adc_set_pll_cntl(1, ADC_EN_ATV_DEMOD, NULL);
 	vdac_enable(1, 1);
 	usleep_range(2000, 2100);
 	atvdemod_clk_init();
@@ -529,7 +529,7 @@ int atv_demod_leave_mode(struct dvb_frontend *fe)
 	}
 
 	vdac_enable(0, 1);
-	adc_set_pll_cntl(0, 0x1, NULL);
+	adc_set_pll_cntl(0, ADC_EN_ATV_DEMOD, NULL);
 	if (is_meson_txlx_cpu() || is_meson_txhd_cpu())
 		aud_demod_clk_gate(0);
 
@@ -1421,6 +1421,10 @@ static enum v4l2_search atvdemod_fe_search(struct v4l2_frontend *v4l2_fe)
 				__func__,
 				(uint32_t) p->std, p->frequency);
 
+		/* when manual search, just search current freq */
+		if (p->flag == ANALOG_FLAG_MANUL_SCAN)
+			break;
+
 		if (p->frequency >= 44200000 &&
 			p->frequency <= 44300000 &&
 			double_check_cnt) {
diff --git a/drivers/amlogic/atv_demod/atvdemod_func.c b/drivers/amlogic/atv_demod/atvdemod_func.c
index e9e5d587dcdb..77c735e71267 100644
--- a/drivers/amlogic/atv_demod/atvdemod_func.c
+++ b/drivers/amlogic/atv_demod/atvdemod_func.c
@@ -2541,7 +2541,7 @@ int amlatvdemod_reg_read(unsigned int reg, unsigned int *val)
 			return 0;
 		}
 	} else if (0 == (ADC_EN_ATV_DEMOD & tvafe_adc_get_pll_flag())) {
-		pr_dbg("%s atv demod pll not init\n", __func__);
+		/* pr_dbg("%s atv demod pll not init\n", __func__); */
 		return 0;
 	}
 
@@ -2560,7 +2560,7 @@ int amlatvdemod_reg_write(unsigned int reg, unsigned int val)
 			return 0;
 		}
 	} else if (0 == (ADC_EN_ATV_DEMOD & tvafe_adc_get_pll_flag())) {
-		pr_dbg("%s atv demod pll not init\n", __func__);
+		/* pr_dbg("%s atv demod pll not init\n", __func__); */
 		return 0;
 	}