dts: flanklin update dvb dts to adapte attach mode [1/3]

PD#SWPL-8315

Problem:
flanklin dvb dts used 3.14 mode

Solution:
flanklin update dvb dts to adapte attach mode

Verify:
verify it on franklin.

Change-Id: I53a9ed2c6f28e75cbb327c2d1c122622b2e4b23e
Signed-off-by: Cheng Tong <cheng.tong@amlogic.com>

6 files changed, 195 insertions, 264 deletions

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
index 679313d..160141e 100644
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -162,17 +162,17 @@
 
 	gpioleds {
 		compatible = "gpio-leds";
-		status = "disabled";
+		status = "okay";
 
 		net_red {
 			label="net_red";
-			/*gpios=<&gpio GPIOA_14 GPIO_ACTIVE_LOW>;*/
+			gpios=<&gpio GPIOA_14 GPIO_ACTIVE_LOW>;
 			default-state ="on";
 		};
 
 		net_green {
 			label="net_green";
-			/*gpios=<&gpio GPIOA_15 GPIO_ACTIVE_HIGH>;*/
+			gpios=<&gpio GPIOA_15 GPIO_ACTIVE_HIGH>;
 			default-state ="on";
 		};
 
@@ -318,47 +318,43 @@
 		dev_name = "ionvideo";
 		status = "okay";
 	};
-	dvb {
-		compatible = "amlogic, dvb";
-		dev_name = "dvb";
-		status = "ok";
-
-		ts0 = "serial";
-		ts0_control = <0x800>;
-		ts0_invert = <0>;
-		pinctrl-names = "s_ts0";
-		pinctrl-0 = <&dvb_s_ts0_pins>;
-
-		interrupts = <0 23 1
-		0 5 1
-		0 53 1
-		0 19 1
-		0 25 1
-		0 18 1
-		0 24 1>;
-		interrupt-names = "demux0_irq",
-		"demux1_irq",
-		"demux2_irq",
-		"dvr0_irq",
-		"dvr1_irq",
-		"dvrfill0_fill",
-		"dvrfill1_flush";
-	};
-	dvbfe {
-		compatible = "amlogic, dvbfe";
-		dev_name = "dvbfe";
-		dtv_demod0 = "Avl6762";
-		dtv_demod0_i2c_adap = <&i2c3>;
-		dtv_demod0_i2c_addr = <0x14>;
-		dtv_demod0_reset_value = <0>;
-		dtv_demod0_reset_gpio = <&gpio GPIOZ_10 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_ant_poweron_value = <0>;
-		dtv_demod0_ant_power_gpio = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_tuner_type = <52>;
-		fe0_dtv_demod = <0>;
-		fe0_ts  = <0>;
-		fe0_dev = <0>;
-	};
+	/*dvb {
+	 *	compatible = "amlogic, dvb";
+	 *	dev_name = "dvb";
+	 *
+	 *	fe0_mode = "external";
+	 *	fe0_demod = "Atbm8881";
+	 *	fe0_i2c_adap_id = <&i2c2>;
+	 *	fe0_demod_i2c_addr = <0xc0>;
+	 *	fe0_ts = <1>;
+	 *	fe0_reset_value = <0>;
+	 *	fe0_reset_gpio = <&gpio GPIOZ_1 GPIO_ACTIVE_HIGH>;
+	 *
+	 *	ts1 = "parallel";
+	 *	ts1_control = <0>;
+	 *	ts1_invert = <0>;
+	 *	interrupts = <0 23 1
+	 *	0 5 1
+	 *	0 21 1
+	 *	0 19 1
+	 *	0 25 1
+	 *	0 18 1
+	 *	0 24 1>;
+	 *	interrupt-names = "demux0_irq",
+	 *	"demux1_irq",
+	 *	"demux2_irq",
+	 *	"dvr0_irq",
+	 *	"dvr1_irq",
+	 *	"dvrfill0_fill",
+	 *	"dvrfill1_flush";
+	 *	pinctrl-names = "p_ts1";
+	 *	pinctrl-0 = <&dvb_p_ts1_pins>;
+	 *	clocks = <&clkc CLKID_DEMUX
+	 *	&clkc CLKID_AHB_ARB0
+	 *	&clkc CLKID_DOS_PARSER>;
+	 *	clock-names = "demux", "ahbarb0", "parser_top";
+	 *};
+	 */
 	unifykey{
 		compatible = "amlogic, unifykey";
 		status = "ok";
@@ -859,7 +855,7 @@
  */
 
 &i2c3 {
-	status = "ok";
+	status = "disabled";
 	pinctrl-names="default";
 	pinctrl-0=<&i2c3_master_pins2>;
 	clock-frequency = <100000>; /* default 100k */
@@ -1473,14 +1469,3 @@
 	status = "okay";
 };
 
-&pinctrl_aobus {
-	dvb_s_ts0_pins: dvb_s_ts0_pins {
-		tsin_a {
-			groups = "tsin_a_sop_ao",
-				"tsin_a_valid_ao",
-				"tsin_a_clk_ao",
-				"tsin_a_din0_ao";
-			function = "tsin_a_ao";
-		};
-	};
-};
diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
index 66231ed..f23ada9 100644
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
@@ -167,17 +167,17 @@
 
 	gpioleds {
 		compatible = "gpio-leds";
-		status = "disabled";
+		status = "okay";
 
 		net_red {
 			label="net_red";
-			/*gpios=<&gpio GPIOA_14 GPIO_ACTIVE_LOW>;*/
+			gpios=<&gpio GPIOA_14 GPIO_ACTIVE_LOW>;
 			default-state ="on";
 		};
 
 		net_green {
 			label="net_green";
-			/*gpios=<&gpio GPIOA_15 GPIO_ACTIVE_HIGH>;*/
+			gpios=<&gpio GPIOA_15 GPIO_ACTIVE_HIGH>;
 			default-state ="on";
 		};
 
@@ -316,47 +316,43 @@
 		dev_name = "ionvideo";
 		status = "okay";
 	};
-	dvb {
-		compatible = "amlogic, dvb";
-		dev_name = "dvb";
-		status = "ok";
-
-		ts0 = "serial";
-		ts0_control = <0x800>;
-		ts0_invert = <0>;
-		pinctrl-names = "s_ts0";
-		pinctrl-0 = <&dvb_s_ts0_pins>;
-
-		interrupts = <0 23 1
-		0 5 1
-		0 53 1
-		0 19 1
-		0 25 1
-		0 18 1
-		0 24 1>;
-		interrupt-names = "demux0_irq",
-		"demux1_irq",
-		"demux2_irq",
-		"dvr0_irq",
-		"dvr1_irq",
-		"dvrfill0_fill",
-		"dvrfill1_flush";
-	};
-	dvbfe {
-		compatible = "amlogic, dvbfe";
-		dev_name = "dvbfe";
-		dtv_demod0 = "Avl6762";
-		dtv_demod0_i2c_adap = <&i2c3>;
-		dtv_demod0_i2c_addr = <0x14>;
-		dtv_demod0_reset_value = <0>;
-		dtv_demod0_reset_gpio = <&gpio GPIOZ_10 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_ant_poweron_value = <0>;
-		dtv_demod0_ant_power_gpio = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_tuner_type = <52>;
-		fe0_dtv_demod = <0>;
-		fe0_ts  = <0>;
-		fe0_dev = <0>;
-	};
+	/*dvb {
+	 *	compatible = "amlogic, dvb";
+	 *	dev_name = "dvb";
+	 *
+	 *	fe0_mode = "external";
+	 *	fe0_demod = "Atbm8881";
+	 *	fe0_i2c_adap_id = <&i2c2>;
+	 *	fe0_demod_i2c_addr = <0xc0>;
+	 *	fe0_ts = <1>;
+	 *	fe0_reset_value = <0>;
+	 *	fe0_reset_gpio = <&gpio GPIOZ_1 GPIO_ACTIVE_HIGH>;
+	 *
+	 *	ts1 = "parallel";
+	 *	ts1_control = <0>;
+	 *	ts1_invert = <0>;
+	 *	interrupts = <0 23 1
+	 *	0 5 1
+	 *	0 21 1
+	 *	0 19 1
+	 *	0 25 1
+	 *	0 18 1
+	 *	0 24 1>;
+	 *	interrupt-names = "demux0_irq",
+	 *	"demux1_irq",
+	 *	"demux2_irq",
+	 *	"dvr0_irq",
+	 *	"dvr1_irq",
+	 *	"dvrfill0_fill",
+	 *	"dvrfill1_flush";
+	 *	pinctrl-names = "p_ts1";
+	 *	pinctrl-0 = <&dvb_p_ts1_pins>;
+	 *	clocks = <&clkc CLKID_DEMUX
+	 *	&clkc CLKID_AHB_ARB0
+	 *	&clkc CLKID_DOS_PARSER>;
+	 *	clock-names = "demux", "ahbarb0", "parser_top";
+	 *};
+	 */
 	unifykey{
 		compatible = "amlogic, unifykey";
 		status = "ok";
@@ -855,7 +851,7 @@
  */
 
 &i2c3 {
-	status = "okay";
+	status = "disabled";
 	pinctrl-names="default";
 	pinctrl-0=<&i2c3_master_pins2>;
 	clock-frequency = <100000>; /* default 100k */
@@ -1463,14 +1459,3 @@
 &saradc {
 	status = "disabled";
 };
-&pinctrl_aobus {
-	dvb_s_ts0_pins: dvb_s_ts0_pins {
-		tsin_a {
-			groups = "tsin_a_sop_ao",
-				"tsin_a_valid_ao",
-				"tsin_a_clk_ao",
-				"tsin_a_din0_ao";
-			function = "tsin_a_ao";
-		};
-	};
-};
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
index bd8773b..de23031 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
@@ -335,17 +335,21 @@
 	dvb {
 		compatible = "amlogic, dvb";
 		dev_name = "dvb";
-		status = "ok";
+		fe0_mode = "external";
+		fe0_demod = "Avl6762";
+		fe0_i2c_adap_id = <&i2c3>;
+		fe0_demod_i2c_addr = <0x14>;
+		fe0_ts = <0>;
+		fe0_reset_value = <0>;
+		fe0_reset_gpio = <&gpio GPIOZ_10 GPIO_ACTIVE_HIGH>;
+		dtv_demod0_ant_poweron_value = <0>;
 
 		ts0 = "serial";
 		ts0_control = <0x800>;
 		ts0_invert = <0>;
-		pinctrl-names = "s_ts0";
-		pinctrl-0 = <&dvb_s_ts0_pins>;
-
 		interrupts = <0 23 1
 		0 5 1
-		0 53 1
+		0 21 1
 		0 19 1
 		0 25 1
 		0 18 1
@@ -357,22 +361,14 @@
 		"dvr1_irq",
 		"dvrfill0_fill",
 		"dvrfill1_flush";
+		pinctrl-names = "s_ts0";
+		pinctrl-0 = <&dvb_s_ts0_pins>;
+		clocks = <&clkc CLKID_DEMUX
+		&clkc CLKID_AHB_ARB0
+		&clkc CLKID_DOS_PARSER>;
+		clock-names = "demux", "ahbarb0", "parser_top";
 	};
-	dvbfe {
-		compatible = "amlogic, dvbfe";
-		dev_name = "dvbfe";
-		dtv_demod0 = "Avl6762";
-		dtv_demod0_i2c_adap = <&i2c3>;
-		dtv_demod0_i2c_addr = <0x14>;
-		dtv_demod0_reset_value = <0>;
-		dtv_demod0_reset_gpio = <&gpio GPIOZ_10 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_ant_poweron_value = <0>;
-		dtv_demod0_ant_power_gpio = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_tuner_type = <52>;
-		fe0_dtv_demod = <0>;
-		fe0_ts  = <0>;
-		fe0_dev = <0>;
-	};
+
 	unifykey{
 		compatible = "amlogic, unifykey";
 		status = "ok";
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
index 898f0d3..3015d5d3 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -162,17 +162,17 @@
 
 	gpioleds {
 		compatible = "gpio-leds";
-		status = "disabled";
+		status = "okay";
 
 		net_red {
 			label="net_red";
-			/*gpios=<&gpio GPIOA_14 GPIO_ACTIVE_LOW>;*/
+			gpios=<&gpio GPIOA_14 GPIO_ACTIVE_LOW>;
 			default-state ="on";
 		};
 
 		net_green {
 			label="net_green";
-			/*gpios=<&gpio GPIOA_15 GPIO_ACTIVE_HIGH>;*/
+			gpios=<&gpio GPIOA_15 GPIO_ACTIVE_HIGH>;
 			default-state ="on";
 		};
 
@@ -318,47 +318,43 @@
 		dev_name = "ionvideo";
 		status = "okay";
 	};
-	dvb {
-		compatible = "amlogic, dvb";
-		dev_name = "dvb";
-		status = "ok";
-
-		ts0 = "serial";
-		ts0_control = <0x800>;
-		ts0_invert = <0>;
-		pinctrl-names = "s_ts0";
-		pinctrl-0 = <&dvb_s_ts0_pins>;
-
-		interrupts = <0 23 1
-		0 5 1
-		0 53 1
-		0 19 1
-		0 25 1
-		0 18 1
-		0 24 1>;
-		interrupt-names = "demux0_irq",
-		"demux1_irq",
-		"demux2_irq",
-		"dvr0_irq",
-		"dvr1_irq",
-		"dvrfill0_fill",
-		"dvrfill1_flush";
-	};
-	dvbfe {
-		compatible = "amlogic, dvbfe";
-		dev_name = "dvbfe";
-		dtv_demod0 = "Avl6762";
-		dtv_demod0_i2c_adap = <&i2c3>;
-		dtv_demod0_i2c_addr = <0x14>;
-		dtv_demod0_reset_value = <0>;
-		dtv_demod0_reset_gpio = <&gpio GPIOZ_10 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_ant_poweron_value = <0>;
-		dtv_demod0_ant_power_gpio = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_tuner_type = <52>;
-		fe0_dtv_demod = <0>;
-		fe0_ts  = <0>;
-		fe0_dev = <0>;
-	};
+	/*dvb {
+	 *	compatible = "amlogic, dvb";
+	 *	dev_name = "dvb";
+	 *
+	 *	fe0_mode = "external";
+	 *	fe0_demod = "Atbm8881";
+	 *	fe0_i2c_adap_id = <&i2c2>;
+	 *	fe0_demod_i2c_addr = <0xc0>;
+	 *	fe0_ts = <1>;
+	 *	fe0_reset_value = <0>;
+	 *	fe0_reset_gpio = <&gpio GPIOZ_1 GPIO_ACTIVE_HIGH>;
+	 *
+	 *	ts1 = "parallel";
+	 *	ts1_control = <0>;
+	 *	ts1_invert = <0>;
+	 *	interrupts = <0 23 1
+	 *	0 5 1
+	 *	0 21 1
+	 *	0 19 1
+	 *	0 25 1
+	 *	0 18 1
+	 *	0 24 1>;
+	 *	interrupt-names = "demux0_irq",
+	 *	"demux1_irq",
+	 *	"demux2_irq",
+	 *	"dvr0_irq",
+	 *	"dvr1_irq",
+	 *	"dvrfill0_fill",
+	 *	"dvrfill1_flush";
+	 *	pinctrl-names = "p_ts1";
+	 *	pinctrl-0 = <&dvb_p_ts1_pins>;
+	 *	clocks = <&clkc CLKID_DEMUX
+	 *	&clkc CLKID_AHB_ARB0
+	 *	&clkc CLKID_DOS_PARSER>;
+	 *	clock-names = "demux", "ahbarb0", "parser_top";
+	 *};
+	 */
 	unifykey{
 		compatible = "amlogic, unifykey";
 		status = "ok";
@@ -859,7 +855,7 @@
  */
 
 &i2c3 {
-	status = "ok";
+	status = "disabled";
 	pinctrl-names="default";
 	pinctrl-0=<&i2c3_master_pins2>;
 	clock-frequency = <100000>; /* default 100k */
@@ -1472,14 +1468,3 @@
 	status = "okay";
 };
 
-&pinctrl_aobus {
-	dvb_s_ts0_pins: dvb_s_ts0_pins {
-		tsin_a {
-			groups = "tsin_a_sop_ao",
-				"tsin_a_valid_ao",
-				"tsin_a_clk_ao",
-				"tsin_a_din0_ao";
-			function = "tsin_a_ao";
-		};
-	};
-};
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
index 6325200..e80ae48 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
@@ -163,17 +163,17 @@
 
 	gpioleds {
 		compatible = "gpio-leds";
-		status = "disabled";
+		status = "okay";
 
 		net_red {
 			label="net_red";
-			/*gpios=<&gpio GPIOA_14 GPIO_ACTIVE_LOW>;*/
+			gpios=<&gpio GPIOA_14 GPIO_ACTIVE_LOW>;
 			default-state ="on";
 		};
 
 		net_green {
 			label="net_green";
-			/*gpios=<&gpio GPIOA_15 GPIO_ACTIVE_HIGH>;*/
+			gpios=<&gpio GPIOA_15 GPIO_ACTIVE_HIGH>;
 			default-state ="on";
 		};
 
@@ -312,47 +312,43 @@
 		dev_name = "ionvideo";
 		status = "okay";
 	};
-	dvb {
-		compatible = "amlogic, dvb";
-		dev_name = "dvb";
-		status = "ok";
-
-		ts0 = "serial";
-		ts0_control = <0x800>;
-		ts0_invert = <0>;
-		pinctrl-names = "s_ts0";
-		pinctrl-0 = <&dvb_s_ts0_pins>;
-
-		interrupts = <0 23 1
-		0 5 1
-		0 53 1
-		0 19 1
-		0 25 1
-		0 18 1
-		0 24 1>;
-		interrupt-names = "demux0_irq",
-		"demux1_irq",
-		"demux2_irq",
-		"dvr0_irq",
-		"dvr1_irq",
-		"dvrfill0_fill",
-		"dvrfill1_flush";
-	};
-	dvbfe {
-		compatible = "amlogic, dvbfe";
-		dev_name = "dvbfe";
-		dtv_demod0 = "Avl6762";
-		dtv_demod0_i2c_adap = <&i2c3>;
-		dtv_demod0_i2c_addr = <0x14>;
-		dtv_demod0_reset_value = <0>;
-		dtv_demod0_reset_gpio = <&gpio GPIOZ_10 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_ant_poweron_value = <0>;
-		dtv_demod0_ant_power_gpio = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_tuner_type = <52>;
-		fe0_dtv_demod = <0>;
-		fe0_ts  = <0>;
-		fe0_dev = <0>;
-	};
+	/*dvb {
+	 *	compatible = "amlogic, dvb";
+	 *	dev_name = "dvb";
+	 *
+	 *	fe0_mode = "external";
+	 *	fe0_demod = "Atbm8881";
+	 *	fe0_i2c_adap_id = <&i2c2>;
+	 *	fe0_demod_i2c_addr = <0xc0>;
+	 *	fe0_ts = <1>;
+	 *	fe0_reset_value = <0>;
+	 *	fe0_reset_gpio = <&gpio GPIOZ_1 GPIO_ACTIVE_HIGH>;
+	 *
+	 *	ts1 = "parallel";
+	 *	ts1_control = <0>;
+	 *	ts1_invert = <0>;
+	 *	interrupts = <0 23 1
+	 *	0 5 1
+	 *	0 21 1
+	 *	0 19 1
+	 *	0 25 1
+	 *	0 18 1
+	 *	0 24 1>;
+	 *	interrupt-names = "demux0_irq",
+	 *	"demux1_irq",
+	 *	"demux2_irq",
+	 *	"dvr0_irq",
+	 *	"dvr1_irq",
+	 *	"dvrfill0_fill",
+	 *	"dvrfill1_flush";
+	 *	pinctrl-names = "p_ts1";
+	 *	pinctrl-0 = <&dvb_p_ts1_pins>;
+	 *	clocks = <&clkc CLKID_DEMUX
+	 *	&clkc CLKID_AHB_ARB0
+	 *	&clkc CLKID_DOS_PARSER>;
+	 *	clock-names = "demux", "ahbarb0", "parser_top";
+	 *};
+	 */
 	unifykey{
 		compatible = "amlogic, unifykey";
 		status = "ok";
@@ -851,7 +847,7 @@
  */
 
 &i2c3 {
-	status = "okay";
+	status = "disabled";
 	pinctrl-names="default";
 	pinctrl-0=<&i2c3_master_pins2>;
 	clock-frequency = <100000>; /* default 100k */
@@ -1458,14 +1454,3 @@
 &saradc {
 	status = "disabled";
 };
-&pinctrl_aobus {
-	dvb_s_ts0_pins: dvb_s_ts0_pins {
-		tsin_a {
-			groups = "tsin_a_sop_ao",
-				"tsin_a_valid_ao",
-				"tsin_a_clk_ao",
-				"tsin_a_din0_ao";
-			function = "tsin_a_ao";
-		};
-	};
-};
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
index dc7a63c..079f59b 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
@@ -328,17 +328,20 @@
 	dvb {
 		compatible = "amlogic, dvb";
 		dev_name = "dvb";
-		status = "ok";
+		fe0_mode = "external";
+		fe0_demod = "Avl6762";
+		fe0_i2c_adap_id = <&i2c3>;
+		fe0_demod_i2c_addr = <0x14>;
+		fe0_ts = <0>;
+		fe0_reset_value = <0>;
+		fe0_reset_gpio = <&gpio GPIOZ_10 GPIO_ACTIVE_HIGH>;
 
 		ts0 = "serial";
 		ts0_control = <0x800>;
 		ts0_invert = <0>;
-		pinctrl-names = "s_ts0";
-		pinctrl-0 = <&dvb_s_ts0_pins>;
-
 		interrupts = <0 23 1
 		0 5 1
-		0 53 1
+		0 21 1
 		0 19 1
 		0 25 1
 		0 18 1
@@ -350,22 +353,14 @@
 		"dvr1_irq",
 		"dvrfill0_fill",
 		"dvrfill1_flush";
+		pinctrl-names = "s_ts0";
+		pinctrl-0 = <&dvb_s_ts0_pins>;
+		clocks = <&clkc CLKID_DEMUX
+		&clkc CLKID_AHB_ARB0
+		&clkc CLKID_DOS_PARSER>;
+		clock-names = "demux", "ahbarb0", "parser_top";
 	};
-	dvbfe {
-		compatible = "amlogic, dvbfe";
-		dev_name = "dvbfe";
-		dtv_demod0 = "Avl6762";
-		dtv_demod0_i2c_adap = <&i2c3>;
-		dtv_demod0_i2c_addr = <0x14>;
-		dtv_demod0_reset_value = <0>;
-		dtv_demod0_reset_gpio = <&gpio GPIOZ_10 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_ant_poweron_value = <0>;
-		dtv_demod0_ant_power_gpio = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
-		dtv_demod0_tuner_type = <52>;
-		fe0_dtv_demod = <0>;
-		fe0_ts  = <0>;
-		fe0_dev = <0>;
-	};
+
 	ionvideo {
 		compatible = "amlogic, ionvideo";
 		dev_name = "ionvideo";