dts: unify dvb dts definition

PD#163384: dts: unify dvb dts definition

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

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
index c669454..2e20007 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
@@ -1223,13 +1223,13 @@
                compatible = "amlogic, dvb";
                dev_name = "dvb";
 
-               demod = "external";
-               demod0 = "Atbm8881";
-               demod0_i2c_adap_id = <&i2c1>;
-               demod0_i2c_addr = <0xc0>;
-               demod0_ts = <0>;
-               demod0_reset_value = <0>;
-               demod0_reset_gpio = <&gpio GPIODV_14 GPIO_ACTIVE_HIGH>;
+               fe0_mode = "external";
+               fe0_demod = "Atbm8881";
+               fe0_i2c_adap_id = <&i2c1>;
+               fe0_demod_i2c_addr = <0xc0>;
+               fe0_ts = <0>;
+               fe0_reset_value = <0>;
+               fe0_reset_gpio = <&gpio GPIODV_14 GPIO_ACTIVE_HIGH>;
 
                ts0 = "parallel";
                ts0_control = <0>;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
index 66e4d7f..ec92387 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
@@ -1262,10 +1262,11 @@
                compatible = "amlogic, dvb";
                dev_name = "dvb";
                status = "okay";
-               demod = "internal";
-               tuner0 = "si2151_tuner";
-               tuner0_i2c_adap_id = <&i2c1>;
-               tuner0_i2c_addr = <0x60>;
+               fe0_mode = "internal";
+               fe0_tuner = "si2151_tuner";
+               fe0_i2c_adap_id = <&i2c1>;
+               fe0_tuner_i2c_addr = <0x60>;
+
                /*"parallel","serial","disable"*/
                ts2 = "parallel";
                ts2_control = <0>;

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 6e81d40..14b321e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -1289,10 +1289,10 @@
                compatible = "amlogic, dvb";
                dev_name = "dvb";
                status = "okay";
-               demod = "internal";
-               tuner0 = "mxl661_tuner";
-               tuner0_i2c_adap_id = <&i2c1>;
-               tuner0_i2c_addr = <0x60>;
+               fe0_mode = "internal";
+               fe0_tuner = "mxl661_tuner";
+               fe0_i2c_adap_id = <&i2c1>;
+               fe0_tuner_i2c_addr = <0x60>;
                /*"parallel","serial","disable"*/
                ts2 = "parallel";
                ts2_control = <0>;

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 d590fe8..508fa3e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -1288,10 +1288,10 @@
                compatible = "amlogic, dvb";
                dev_name = "dvb";
                status = "okay";
-               demod = "internal";
-               tuner0 = "mxl661_tuner";
-               tuner0_i2c_adap_id = <&i2c1>;
-               tuner0_i2c_addr = <0x60>;
+               fe0_mode = "internal";
+               fe0_tuner = "mxl661_tuner";
+               fe0_i2c_adap_id = <&i2c1>;
+               fe0_tuner_i2c_addr = <0x60>;
                /*"parallel","serial","disable"*/
                ts2 = "parallel";
                ts2_control = <0>;

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 7568bd8..c764142 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -1287,10 +1287,10 @@
                compatible = "amlogic, dvb";
                dev_name = "dvb";
                status = "okay";
-               demod = "internal";
-               tuner0 = "mxl661_tuner";
-               tuner0_i2c_adap_id = <&i2c1>;
-               tuner0_i2c_addr = <0x60>;
+               fe0_mode = "internal";
+               fe0_tuner = "mxl661_tuner";
+               fe0_i2c_adap_id = <&i2c1>;
+               fe0_tuner_i2c_addr = <0x60>;
                /*"parallel","serial","disable"*/
                ts2 = "parallel";
                ts2_control = <0>;