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>
dts: flanklin bring up based on google-ref! [1/2]

PD#SWPL-7184

Problem:
flanklin bring up based on google-ref.

Solution:
Modify copy file for franklin.

Verify:
verify it on franklin.

Change-Id: Ibaba2dcb7a3e8715243f5a93d69a1bf96e8c49a7
Signed-off-by: qiyao.zhou <qiyao.zhou@amlogic.com>
dts: flanklin bring up based on google-ref! [1/1]

PD#SWPL-7184

Problem:
flanklin bring up based on google-ref.

Solution:
Modify copy file for franklin.

Verify:
verify it on franklin.

Change-Id: If55159835daf0a87439647586526f836a226504c
Signed-off-by: qiyao.zhou <qiyao.zhou@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
index 8544826..a67e899 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
@@ -172,17 +172,17 @@
 
        gpioleds {
                compatible = "gpio-leds";
-               status = "okay";
+               status = "disabled";
 
                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";
                };
 
@@ -333,43 +333,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";
-        *};
-        */
+       dvb {
+               compatible = "amlogic, dvb";
+               dev_name = "dvb";
+               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>;
+               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 = "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";
+       };
+
        unifykey{
                compatible = "amlogic, unifykey";
                status = "ok";
@@ -1004,15 +1004,16 @@
        };
 };
 
-&i2c2 {
-       status = "disabled";
-       pinctrl-names="default";
-       pinctrl-0=<&i2c2_master_pins2>;
-       clock-frequency = <100000>;
-};
+/*&i2c2 {
+ *     status = "okay";
+ *     pinctrl-names="default";
+ *     pinctrl-0=<&i2c2_master_pins2>;
+ *     clock-frequency = <300000>;
+ *};
+ */
 
 &i2c3 {
-       status = "okay";
+       status = "ok";
        pinctrl-names="default";
        pinctrl-0=<&i2c3_master_pins2>;
        clock-frequency = <100000>; /* default 100k */
@@ -1594,3 +1595,14 @@
        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/sm1_s905x3_ac213.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
index 1c6df0d..7c42211 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
@@ -170,17 +170,17 @@
 
        gpioleds {
                compatible = "gpio-leds";
-               status = "okay";
+               status = "disabled";
 
                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";
                };
 
@@ -326,6 +326,42 @@
                nrds-enable = <1>;
                pps-enable = <1>;
        };
+       dvb {
+               compatible = "amlogic, dvb";
+               dev_name = "dvb";
+               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>;
+               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 = "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";
+       };
+
        ionvideo {
                compatible = "amlogic, ionvideo";
                dev_name = "ionvideo";
@@ -1045,15 +1081,16 @@
        };
 };
 
-&i2c2 {
-       status = "disabled";
-       pinctrl-names="default";
-       pinctrl-0=<&i2c2_master_pins2>;
-       clock-frequency = <100000>;
-};
+/*&i2c2 {
+ *     status = "okay";
+ *     pinctrl-names="default";
+ *     pinctrl-0=<&i2c2_master_pins2>;
+ *     clock-frequency = <300000>;
+ *};
+ */
 
 &i2c3 {
-       status = "okay";
+       status = "ok";
        pinctrl-names="default";
        pinctrl-0=<&i2c3_master_pins2>;
        clock-frequency = <100000>; /* default 100k */
@@ -1063,7 +1100,7 @@
                compatible = "ESMT, ad82584f";
                #sound-dai-cells = <0>;
                reg = <0x31>;
-               status = "okay";
+               status = "disabled";
                reset_pin = <&gpio GPIOA_5 0>;
                no_mclk;
        };
@@ -1579,3 +1616,14 @@
        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";
+               };
+       };
+};