dts: u212 2G ddr add dvb dts config [1/1]

PD#SWPL-4140

Problem:
u212 2G dts didn't have dvb config

Solution:
add dvb dts config
defalut commented out as reference

Verify:
Verify by Android P franklin

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

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
index 58fcf68..58073e2 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -306,15 +306,43 @@
                dev_name = "ionvideo";
                status = "okay";
        };
-       dvb{
-           compatible = "amlogic, dvb";
-               dev_name = "dvb";
-               status = "ok";
-               /*"parallel","serial","disable"*/
-               ts2 = "parallel";
-               ts2_control = <0>;
-               ts2_invert = <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";
@@ -788,6 +816,19 @@
        };
 };
 
+/*
+ *if use i2c2_master_pins2
+ *please disable internal_eth_pins
+ *in case pinmux conflict
+ */
+/*&i2c2 {
+ *     status = "okay";
+ *     pinctrl-names="default";
+ *     pinctrl-0=<&i2c2_master_pins2>;
+ *     clock-frequency = <300000>;
+ *};
+ */
+
 &i2c3 {
        status = "disabled";
        pinctrl-names="default";

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 19db70b..aed00d0 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
@@ -304,6 +304,43 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+       /*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";
@@ -734,43 +771,6 @@
                status = "okay";
        };
 
-       /*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";
-        *};
-        */
 }; /* end of / */
 
 &meson_fb {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
index 2c6f2d3..83da45b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -306,15 +306,43 @@
                dev_name = "ionvideo";
                status = "okay";
        };
-       dvb{
-           compatible = "amlogic, dvb";
-               dev_name = "dvb";
-               status = "ok";
-               /*"parallel","serial","disable"*/
-               ts2 = "parallel";
-               ts2_control = <0>;
-               ts2_invert = <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";
@@ -788,6 +816,19 @@
        };
 };
 
+/*
+ *if use i2c2_master_pins2
+ *please disable internal_eth_pins
+ *in case pinmux conflict
+ */
+/*&i2c2 {
+ *     status = "okay";
+ *     pinctrl-names="default";
+ *     pinctrl-0=<&i2c2_master_pins2>;
+ *     clock-frequency = <300000>;
+ *};
+ */
+
 &i2c3 {
        status = "disabled";
        pinctrl-names="default";

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 977ecc6..8082109 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
@@ -300,6 +300,43 @@
                dev_name = "ionvideo";
                status = "okay";
        };
+       /*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";
@@ -730,43 +767,6 @@
                status = "okay";
        };
 
-       /*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";
-        *};
-        */
 }; /* end of / */
 
 &meson_fb {