From: junchao yuan Date: Thu, 26 Sep 2019 09:11:57 +0000 (+0800) Subject: dts: support many tuners with dtbo [3/4] X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7dcfd5d158406e296b5f8617ac2b17bf4eaab3db;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git dts: support many tuners with dtbo [3/4] PD#SWPL-13156 Problem: need to support many tuners; Solution: support many tuners with dtbo Verify: local verify ok; Change-Id: I6331b0db772b214ee6a4c404b4b9a2c673cb98c0 Signed-off-by: junchao.yuan@amlogic.com --- diff --git a/arch/arm/boot/dts/amlogic/android_p_overlay_dt.dts b/arch/arm/boot/dts/amlogic/android_p_overlay_dt.dts index de97c56e27a1..ab20172984f9 100644 --- a/arch/arm/boot/dts/amlogic/android_p_overlay_dt.dts +++ b/arch/arm/boot/dts/amlogic/android_p_overlay_dt.dts @@ -40,4 +40,24 @@ }; }; }; + + fragment@2 { + //target = <&some_node>; + target-path="/"; + __overlay__ { + dvb_avl6762 { + status = "disabled"; + }; + }; + }; + + fragment@3 { + //target = <&some_node>; + target-path="/"; + __overlay__ { + dvb_mn88436 { + status = "okay"; + }; + }; + }; }; diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts index d52501106358..a083260099e9 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts @@ -349,9 +349,47 @@ cma_mode = <1>; }; - dvb { + dvb_avl6762 { compatible = "amlogic, dvb"; dev_name = "dvb"; + status = "disabled"; + 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"; + }; + + dvb_mn88436 { + compatible = "amlogic, dvb"; + dev_name = "dvb"; + status = "disabled"; dtv_demod0 = "Mn88436"; dtv_demod0_i2c_adap = <&i2c3>; diff --git a/arch/arm64/boot/dts/amlogic/android_p_overlay_dt.dts b/arch/arm64/boot/dts/amlogic/android_p_overlay_dt.dts index 42efa870557c..516c66dd7b05 100644 --- a/arch/arm64/boot/dts/amlogic/android_p_overlay_dt.dts +++ b/arch/arm64/boot/dts/amlogic/android_p_overlay_dt.dts @@ -40,4 +40,24 @@ }; }; }; + + fragment@2 { + //target = <&some_node>; + target-path="/"; + __overlay__ { + dvb_avl6762 { + status = "disabled"; + }; + }; + }; + + fragment@3 { + //target = <&some_node>; + target-path="/"; + __overlay__ { + dvb_mn88436 { + status = "okay"; + }; + }; + }; }; diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts index 13da80c581c9..738183d5ebb4 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts @@ -325,9 +325,48 @@ nrds-enable = <1>; pps-enable = <1>; }; - dvb { + + dvb_avl6762 { compatible = "amlogic, dvb"; dev_name = "dvb"; + status = "disabled"; + 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"; + }; + + dvb_mn88436 { + compatible = "amlogic, dvb"; + dev_name = "dvb"; + status = "disabled"; dtv_demod0 = "Mn88436"; dtv_demod0_i2c_adap = <&i2c3>;