diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
index 7851cda5076d..f376b8ac4d94 100644
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
@@ -592,18 +592,19 @@
 		interrupt-names = "mailbox_2";
 	};
 
-	aml_atvdemod {
-		compatible = "amlogic, aml_atvdemod";
-		dev_name = "aml_atvdemod";
+	atv-demod {
+		compatible = "amlogic, atv-demod";
 		status = "okay";
 		tuner = "si2151_tuner";
 		tuner_i2c_ada_id = <&i2c1>;
 		tuner_i2c_addr = <0x60>;
 		btsc_sap_mode = <1>;
-		////pinctrl-names="atvdemod_agc";
-		////pinctrl-0=<&atvdemod_agc>;
-		reg = <0x0 0xff640000 0x0 0x2000
-				0x0 0xff648000 0x0 0x2000>;
+		/* pinctrl-names="atvdemod_agc_pins"; */
+		/* pinctrl-0=<&atvdemod_agc_pins>; */
+		reg = <0x0 0xff640000 0x0 0x2000 /* demod reg */
+				0x0 0xff63c000 0x0 0x2000 /* hiu reg */
+				0x0 0xff634000 0x0 0x2000 /* periphs reg */
+				0x0 0xff648000 0x0 0x2000>; /* audio reg */
 		reg_23cf = <0x88188832>;
 		/*default:0x88188832;r840 on haier:0x48188832*/
 	};
diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
index 1337f07592d2..8cb1790a5934 100644
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
@@ -646,18 +646,19 @@
 		interrupt-names = "mailbox_2";
 	};
 
-	aml_atvdemod {
-		compatible = "amlogic, aml_atvdemod";
-		dev_name = "aml_atvdemod";
+	atv-demod {
+		compatible = "amlogic, atv-demod";
 		status = "okay";
 		tuner = "si2151_tuner";
 		tuner_i2c_ada_id = <&i2c1>;
 		tuner_i2c_addr = <0x60>;
 		btsc_sap_mode = <1>;
-		////pinctrl-names="atvdemod_agc";
-		////pinctrl-0=<&atvdemod_agc>;
-		reg = <0x0 0xff640000 0x0 0x2000
-				0x0 0xff648000 0x0 0x2000>;
+		/* pinctrl-names="atvdemod_agc_pins"; */
+		/* pinctrl-0=<&atvdemod_agc_pins>; */
+		reg = <0x0 0xff640000 0x0 0x2000 /* demod reg */
+				0x0 0xff63c000 0x0 0x2000 /* hiu reg */
+				0x0 0xff634000 0x0 0x2000 /* periphs reg */
+				0x0 0xff648000 0x0 0x2000>; /* audio reg */
 		reg_23cf = <0x88188832>;
 		/*default:0x88188832;r840 on haier:0x48188832*/
 	};
diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index e167e8d70efc..df8ffd6e060f 100644
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -594,18 +594,19 @@
 		interrupt-names = "mailbox_2";
 	};
 
-	aml_atvdemod {
-		compatible = "amlogic, aml_atvdemod";
-		dev_name = "aml_atvdemod";
+	atv-demod {
+		compatible = "amlogic, atv-demod";
 		status = "okay";
 		tuner = "mxl661_tuner";
 		tuner_i2c_ada_id = <&i2c1>;
 		tuner_i2c_addr = <0x60>;
 		btsc_sap_mode = <1>;
-		////pinctrl-names="atvdemod_agc";
-		////pinctrl-0=<&atvdemod_agc>;
-		reg = <0x0 0xff640000 0x0 0x2000
-				0x0 0xff648000 0x0 0x2000>;
+		/* pinctrl-names="atvdemod_agc_pins"; */
+		/* pinctrl-0=<&atvdemod_agc_pins>; */
+		reg = <0x0 0xff640000 0x0 0x2000 /* demod reg */
+				0x0 0xff63c000 0x0 0x2000 /* hiu reg */
+				0x0 0xff634000 0x0 0x2000 /* periphs reg */
+				0x0 0xff648000 0x0 0x2000>; /* audio reg */
 		reg_23cf = <0x88188832>;
 		/*default:0x88188832;r840 on haier:0x48188832*/
 	};
diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index aba7a474b187..580fb8072315 100644
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -594,18 +594,19 @@
 		interrupt-names = "mailbox_2";
 	};
 
-	aml_atvdemod {
-		compatible = "amlogic, aml_atvdemod";
-		dev_name = "aml_atvdemod";
+	atv-demod {
+		compatible = "amlogic, atv-demod";
 		status = "okay";
 		tuner = "mxl661_tuner";
 		tuner_i2c_ada_id = <&i2c1>;
 		tuner_i2c_addr = <0x60>;
 		btsc_sap_mode = <1>;
-		////pinctrl-names="atvdemod_agc";
-		////pinctrl-0=<&atvdemod_agc>;
-		reg = <0x0 0xff640000 0x0 0x2000
-				0x0 0xff648000 0x0 0x2000>;
+		/* pinctrl-names="atvdemod_agc_pins"; */
+		/* pinctrl-0=<&atvdemod_agc_pins>; */
+		reg = <0x0 0xff640000 0x0 0x2000 /* demod reg */
+				0x0 0xff63c000 0x0 0x2000 /* hiu reg */
+				0x0 0xff634000 0x0 0x2000 /* periphs reg */
+				0x0 0xff648000 0x0 0x2000>; /* audio reg */
 		reg_23cf = <0x88188832>;
 		/*default:0x88188832;r840 on haier:0x48188832*/
 	};
diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
index 58af6dec5e4e..0f5d8e08224d 100644
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -593,18 +593,19 @@
 		interrupt-names = "mailbox_2";
 	};
 
-	aml_atvdemod {
-		compatible = "amlogic, aml_atvdemod";
-		dev_name = "aml_atvdemod";
+	atv-demod {
+		compatible = "amlogic, atv-demod";
 		status = "okay";
 		tuner = "mxl661_tuner";
 		tuner_i2c_ada_id = <&i2c1>;
 		tuner_i2c_addr = <0x60>;
 		btsc_sap_mode = <1>;
-		////pinctrl-names="atvdemod_agc";
-		////pinctrl-0=<&atvdemod_agc>;
-		reg = <0x0 0xff640000 0x0 0x2000
-				0x0 0xff648000 0x0 0x2000>;
+		/* pinctrl-names="atvdemod_agc_pins"; */
+		/* pinctrl-0=<&atvdemod_agc_pins>; */
+		reg = <0x0 0xff640000 0x0 0x2000 /* demod reg */
+				0x0 0xff63c000 0x0 0x2000 /* hiu reg */
+				0x0 0xff634000 0x0 0x2000 /* periphs reg */
+				0x0 0xff648000 0x0 0x2000>; /* audio reg */
 		reg_23cf = <0x88188832>;
 		/*default:0x88188832;r840 on haier:0x48188832*/
 	};