projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5023a9e)
dts: flanklin bring up based on google-ref! [1/2]
authorqiyao.zhou <qiyao.zhou@amlogic.com>
Mon, 15 Apr 2019 09:25:03 +0000 (17:25 +0800)
committerTao Zeng <tao.zeng@amlogic.com>
Fri, 19 Apr 2019 02:44:36 +0000 (19:44 -0700)
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>
arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts patch | blob | history
arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts patch | blob | history
arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts patch | blob | history
arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts patch | blob | history

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
index 019cfcc..fb6030c 100644 (file)
--- 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 = "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";
                };
 
@@ -318,43 +318,47 @@
                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";
+               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>;
+       };
        unifykey{
                compatible = "amlogic, unifykey";
                status = "ok";
@@ -842,7 +846,7 @@
  */
 
 &i2c3 {
-       status = "disabled";
+       status = "ok";
        pinctrl-names="default";
        pinctrl-0=<&i2c3_master_pins2>;
        clock-frequency = <100000>; /* default 100k */
@@ -1409,3 +1413,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/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
index 30b731a..58e31cb 100644 (file)
--- 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 = "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";
                };
 
@@ -316,43 +316,47 @@
                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";
+               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>;
+       };
        unifykey{
                compatible = "amlogic, unifykey";
                status = "ok";
@@ -838,7 +842,7 @@
  */
 
 &i2c3 {
-       status = "disabled";
+       status = "okay";
        pinctrl-names="default";
        pinctrl-0=<&i2c3_master_pins2>;
        clock-frequency = <100000>; /* default 100k */
@@ -1399,3 +1403,14 @@
 &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/g12a_s905x2_u212.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
index e38063f..23ed588 100644 (file)
--- 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 = "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";
                };
 
@@ -318,43 +318,47 @@
                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";
+               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>;
+       };
        unifykey{
                compatible = "amlogic, unifykey";
                status = "ok";
@@ -842,7 +846,7 @@
  */
 
 &i2c3 {
-       status = "disabled";
+       status = "ok";
        pinctrl-names="default";
        pinctrl-0=<&i2c3_master_pins2>;
        clock-frequency = <100000>; /* default 100k */
@@ -1409,3 +1413,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/g12a_s905x2_u212_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
index 799ed0b..b742fe8 100644 (file)
--- 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 = "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";
                };
 
@@ -312,43 +312,47 @@
                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";
+               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>;
+       };
        unifykey{
                compatible = "amlogic, unifykey";
                status = "ok";
@@ -834,7 +838,7 @@
  */
 
 &i2c3 {
-       status = "disabled";
+       status = "okay";
        pinctrl-names="default";
        pinctrl-0=<&i2c3_master_pins2>;
        clock-frequency = <100000>; /* default 100k */
@@ -1395,3 +1399,14 @@
 &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";
+               };
+       };
+};
Domain: System / Kernel;