diff --git a/arch/arm/boot/dts/amlogic/mesontl1.dtsi b/arch/arm/boot/dts/amlogic/mesontl1.dtsi
index ac54aaee166a..8bbefb774dea 100644
--- a/arch/arm/boot/dts/amlogic/mesontl1.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesontl1.dtsi
@@ -2062,12 +2062,27 @@
 		};
 	};
 
+	atvdemod_agc_pins: atvdemod_agc_pins {
+		mux {
+			groups = "atv_if_agc_dv";
+			function = "atv";
+		};
+	};
+
+	dtvdemod_agc_pins: dtvdemod_agc_pins {
+		mux {
+			groups = "dtv_if_agc_dv2";
+			function = "dtv";
+		};
+	};
+
 	lcd_vbyone_pins: lcd_vbyone_pin {
 		mux {
 			groups = "vx1_lockn","vx1_htpdn";
 			function = "vx1";
 		};
 	};
+
 	lcd_vbyone_off_pins: lcd_vbyone_off_pin {
 		mux {
 			groups = "GPIOH_15","GPIOH_16";
diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
index facb215ee250..640ee5e2a12a 100644
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
@@ -272,8 +272,8 @@
 		dev_name = "aml_dtv_demod";
 		status = "okay";
 
-		//pinctrl-names="dtvdemod_agc";
-		//pinctrl-0=<&dtvdemod_agc>;
+		pinctrl-names="dtvdemod_agc_pins";
+		pinctrl-0=<&dtvdemod_agc_pins>;
 
 		clocks = <&clkc CLKID_DAC_CLK>;
 		clock-names = "vdac_clk_gate";
@@ -1104,16 +1104,19 @@
 	};
 
 	tuner: tuner {
+		compatible = "amlogic, tuner";
 		status = "okay";
-		tuner_name = "mxl661_tuner";
+		tuner_name = "r842_tuner";
 		tuner_i2c_adap = <&i2c0>;
-		tuner_i2c_addr = <0x60>;
+		tuner_i2c_addr = <0xf6>;
 		tuner_xtal = <1>; /* 0: 16MHz, 1: 24MHz */
-		tuner_xtal_mode = <3>;
+		tuner_xtal_mode = <0>;
 					/* NO_SHARE_XTAL(0)
-					 * SLAVE_XTAL_SHARE(3)
+					 * MASTER_TO_SLAVE_XTAL_IN(1)
+					 * MASTER_TO_SLAVE_XTAL_OUT(2)
+					 * SLAVE_XTAL_OUT(3)
 					 */
-		tuner_xtal_cap = <25>; /* when tuner_xtal_mode = 3, set 25 */
+		tuner_xtal_cap = <38>; /* when tuner_xtal_mode = 3, set 25 */
 	};
 
 	atv-demod {
@@ -1121,8 +1124,8 @@
 		status = "okay";
 		tuner = <&tuner>;
 		btsc_sap_mode = <1>;
-		/* pinctrl-names="atvdemod_agc_pins"; */
-		/* pinctrl-0=<&atvdemod_agc_pins>; */
+		pinctrl-names="atvdemod_agc_pins";
+		pinctrl-0=<&atvdemod_agc_pins>;
 		reg = <0xff656000 0x2000 /* demod reg */
 				0xff63c000 0x2000 /* hiu reg */
 				0xff634000 0x2000 /* periphs reg */
diff --git a/arch/arm64/boot/dts/amlogic/mesontl1.dtsi b/arch/arm64/boot/dts/amlogic/mesontl1.dtsi
index a1b5a2eed712..786ca8d9b586 100644
--- a/arch/arm64/boot/dts/amlogic/mesontl1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesontl1.dtsi
@@ -2043,6 +2043,20 @@
 		};
 	};
 
+	atvdemod_agc_pins: atvdemod_agc_pins {
+		mux {
+			groups = "atv_if_agc_dv";
+			function = "atv";
+		};
+	};
+
+	dtvdemod_agc_pins: dtvdemod_agc_pins {
+		mux {
+			groups = "dtv_if_agc_dv2";
+			function = "dtv";
+		};
+	};
+
 	lcd_vbyone_pins: lcd_vbyone_pin {
 		mux {
 			groups = "vx1_lockn","vx1_htpdn";
diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
index 9d44ae54608b..defeedbe8bd0 100644
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
@@ -269,8 +269,8 @@
 		dev_name = "aml_dtv_demod";
 		status = "okay";
 
-		//pinctrl-names="dtvdemod_agc";
-		//pinctrl-0=<&dtvdemod_agc>;
+		pinctrl-names="dtvdemod_agc_pins";
+		pinctrl-0=<&dtvdemod_agc_pins>;
 
 		clocks = <&clkc CLKID_DAC_CLK>;
 		clock-names = "vdac_clk_gate";
@@ -1103,15 +1103,17 @@
 	tuner: tuner {
 		compatible = "amlogic, tuner";
 		status = "okay";
-		tuner_name = "mxl661_tuner";
+		tuner_name = "r842_tuner";
 		tuner_i2c_adap = <&i2c0>;
-		tuner_i2c_addr = <0x60>;
+		tuner_i2c_addr = <0xf6>;
 		tuner_xtal = <1>; /* 0: 16MHz, 1: 24MHz */
-		tuner_xtal_mode = <3>;
+		tuner_xtal_mode = <0>;
 					/* NO_SHARE_XTAL(0)
-					 * SLAVE_XTAL_SHARE(3)
+					 * MASTER_TO_SLAVE_XTAL_IN(1)
+					 * MASTER_TO_SLAVE_XTAL_OUT(2)
+					 * SLAVE_XTAL_OUT(3)
 					 */
-		tuner_xtal_cap = <25>; /* when tuner_xtal_mode = 3, set 25 */
+		tuner_xtal_cap = <38>; /* when tuner_xtal_mode = 3, set 25 */
 	};
 
 	atv-demod {
@@ -1119,8 +1121,8 @@
 		status = "okay";
 		tuner = <&tuner>;
 		btsc_sap_mode = <1>;
-		/* pinctrl-names="atvdemod_agc_pins"; */
-		/* pinctrl-0=<&atvdemod_agc_pins>; */
+		pinctrl-names="atvdemod_agc_pins";
+		pinctrl-0=<&atvdemod_agc_pins>;
 		reg = <0x0 0xff656000 0x0 0x2000 /* demod reg */
 				0x0 0xff63c000 0x0 0x2000 /* hiu reg */
 				0x0 0xff634000 0x0 0x2000 /* periphs reg */