From: Cheng Tong Date: Tue, 11 Dec 2018 09:21:06 +0000 (+0800) Subject: dts: add LiveTv support [2/2] X-Git-Tag: hardkernel-4.9.236-104~2001 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e887c657eeebb887dbd5915ef8e15fa804785ec;p=platform%2Fkernel%2Flinux-amlogic.git dts: add LiveTv support [2/2] PD#SWPL-3105 Problem: dts didn't have dvb config Solution: add dvb dts config defalut commented out as reference Verify: Verify by Android P franklin Change-Id: I47ab10c22b32f6bfd51a0c113a692f0c5863178b Signed-off-by: Cheng Tong --- 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 c3a267d..fffda51 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts @@ -304,15 +304,6 @@ 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>; - }; unifykey{ compatible = "amlogic, unifykey"; status = "ok"; @@ -737,6 +728,43 @@ 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 { @@ -778,6 +806,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/mesong12a.dtsi b/arch/arm/boot/dts/amlogic/mesong12a.dtsi index baa4187..c0e8fce 100644 --- a/arch/arm/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm/boot/dts/amlogic/mesong12a.dtsi @@ -2315,6 +2315,24 @@ }; }; + /*dvb_p_ts1_pins: dvb_p_ts1_pins { + * tsin_b { + * groups = "tsin_b_sop_z", + * "tsin_b_valid_z", + * "tsin_b_clk_z", + * "tsin_b_din0_z", + * "tsin_b_din1", + * "tsin_b_din2", + * "tsin_b_din3", + * "tsin_b_din4", + * "tsin_b_din5", + * "tsin_b_din6", + * "tsin_b_din7"; + * function = "tsin_b"; + * }; + *}; + */ + pwm_a_pins: pwm_a { mux { groups = "pwm_a"; 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 caebfcb..0ddaf89 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts @@ -300,15 +300,6 @@ 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>; - }; unifykey{ compatible = "amlogic, unifykey"; status = "ok"; @@ -733,6 +724,43 @@ 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 { @@ -774,6 +802,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/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi index d55ca6c..d5cecef 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi @@ -2315,6 +2315,24 @@ }; }; + /*dvb_p_ts1_pins: dvb_p_ts1_pins { + * tsin_b { + * groups = "tsin_b_sop_z", + * "tsin_b_valid_z", + * "tsin_b_clk_z", + * "tsin_b_din0_z", + * "tsin_b_din1", + * "tsin_b_din2", + * "tsin_b_din3", + * "tsin_b_din4", + * "tsin_b_din5", + * "tsin_b_din6", + * "tsin_b_din7"; + * function = "tsin_b"; + * }; + *}; + */ + pwm_a_pins: pwm_a { mux { groups = "pwm_a";