From 67d51ac6ae0dda9ca6e767ec0242e7de5b764955 Mon Sep 17 00:00:00 2001 From: Chuangcheng Peng Date: Sun, 29 Apr 2018 15:43:55 +0800 Subject: [PATCH] demux: add demux irq for txlx PD#165368: add demux irq for txlx Change-Id: I165a524cd5e161b22ee21318d9379bb139622e2f Signed-off-by: Chuangcheng Peng --- arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts | 49 +++++++++++----------- arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts | 46 ++++++++++---------- arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts | 47 +++++++++++---------- .../boot/dts/amlogic/txlx_t962x_r311_720p.dts | 47 +++++++++++---------- 4 files changed, 100 insertions(+), 89 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts index c031611..24cb6e7 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts @@ -1207,21 +1207,6 @@ }; /* end of AUDIO board specific */ - dvb { - compatible = "amlogic, dvb"; - dev_name = "dvb"; - status = "disabled"; - /*"parallel","serial","disable"*/ - ts2 = "parallel"; - ts2_control = <0>; - ts2_invert = <0>; - //resets = <&clock GCLK_IDX_DEMUX - // &clock GCLK_IDX_ASYNC_FIFO - // &clock GCLK_IDX_AHB_ARB0 - // &clock GCLK_IDX_U_PARSER_TOP>; - //reset-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; - }; - aml_sensor0: aml-sensor@0 { compatible = "amlogic, aml-thermal"; device_name = "thermal"; @@ -1268,30 +1253,46 @@ dvb { compatible = "amlogic, dvb"; dev_name = "dvb"; - status = "disabled"; + status = "okay"; + demod = "internal"; + tuner0 = "si2151_tuner"; + tuner0_i2c_adap_id = <&i2c1>; + tuner0_i2c_addr = <0x60>; /*"parallel","serial","disable"*/ ts2 = "parallel"; ts2_control = <0>; ts2_invert = <0>; - //resets = <&clock GCLK_IDX_DEMUX - // &clock GCLK_IDX_ASYNC_FIFO - // &clock GCLK_IDX_AHB_ARB0 - // &clock GCLK_IDX_U_PARSER_TOP>; - //reset-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; + 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"; + clocks = <&clkc CLKID_DEMUX + &clkc CLKID_ASYNC_FIFO + &clkc CLKID_AHB_ARB0 + &clkc CLKID_DOS_PARSER>; + clock-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; }; aml_dtv_demod { compatible = "amlogic, ddemod-txlx"; dev_name = "aml_dtv_demod"; - status = "disable"; + status = "okay"; //pinctrl-names="dtvdemod_agc"; //pinctrl-0=<&dtvdemod_agc>; - clocks = <&clkc CLKID_DAC_CLK>; clock-names = "vdac_clk_gate"; - reg = <0x0 0xff644000 0x0 0x2000 /*dtv demod base*/ 0x0 0xff63c000 0x0 0x2000 /*hiu reg base*/ 0x0 0xff800000 0x0 0x1000 /*io_aobus_base*/ diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts index dd090f9..9b63e48 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts @@ -1240,20 +1240,6 @@ }; /* end of AUDIO board specific */ - dvb { - compatible = "amlogic, dvb"; - dev_name = "dvb"; - status = "disabled"; - /*"parallel","serial","disable"*/ - ts2 = "parallel"; - ts2_control = <0>; - ts2_invert = <0>; - //resets = <&clock GCLK_IDX_DEMUX - // &clock GCLK_IDX_ASYNC_FIFO - // &clock GCLK_IDX_AHB_ARB0 - // &clock GCLK_IDX_U_PARSER_TOP>; - //reset-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; - }; aml_sensor0: aml-sensor@0 { compatible = "amlogic, aml-thermal"; @@ -1301,21 +1287,39 @@ dvb { compatible = "amlogic, dvb"; dev_name = "dvb"; - status = "disabled"; + status = "okay"; + demod = "internal"; + tuner0 = "si2151_tuner"; + tuner0_i2c_adap_id = <&i2c1>; + tuner0_i2c_addr = <0x60>; /*"parallel","serial","disable"*/ ts2 = "parallel"; ts2_control = <0>; ts2_invert = <0>; - //resets = <&clock GCLK_IDX_DEMUX - // &clock GCLK_IDX_ASYNC_FIFO - // &clock GCLK_IDX_AHB_ARB0 - // &clock GCLK_IDX_U_PARSER_TOP>; - //reset-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; + 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"; + clocks = <&clkc CLKID_DEMUX + &clkc CLKID_ASYNC_FIFO + &clkc CLKID_AHB_ARB0 + &clkc CLKID_DOS_PARSER>; + clock-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; }; aml_dtv_demod { compatible = "amlogic, ddemod-txlx"; dev_name = "aml_dtv_demod"; - status = "disable"; + status = "okay"; //pinctrl-names="dtvdemod_agc"; //pinctrl-0=<&dtvdemod_agc>; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts index 4b326c2..3e8542a 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts @@ -1240,21 +1240,6 @@ }; /* end of AUDIO board specific */ - dvb { - compatible = "amlogic, dvb"; - dev_name = "dvb"; - status = "disabled"; - /*"parallel","serial","disable"*/ - ts2 = "parallel"; - ts2_control = <0>; - ts2_invert = <0>; - //resets = <&clock GCLK_IDX_DEMUX - // &clock GCLK_IDX_ASYNC_FIFO - // &clock GCLK_IDX_AHB_ARB0 - // &clock GCLK_IDX_U_PARSER_TOP>; - //reset-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; - }; - aml_sensor0: aml-sensor@0 { compatible = "amlogic, aml-thermal"; device_name = "thermal"; @@ -1301,21 +1286,39 @@ dvb { compatible = "amlogic, dvb"; dev_name = "dvb"; - status = "disabled"; + status = "okay"; + demod = "internal"; + tuner0 = "si2151_tuner"; + tuner0_i2c_adap_id = <&i2c1>; + tuner0_i2c_addr = <0x60>; /*"parallel","serial","disable"*/ ts2 = "parallel"; ts2_control = <0>; ts2_invert = <0>; - //resets = <&clock GCLK_IDX_DEMUX - // &clock GCLK_IDX_ASYNC_FIFO - // &clock GCLK_IDX_AHB_ARB0 - // &clock GCLK_IDX_U_PARSER_TOP>; - //reset-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; + 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"; + clocks = <&clkc CLKID_DEMUX + &clkc CLKID_ASYNC_FIFO + &clkc CLKID_AHB_ARB0 + &clkc CLKID_DOS_PARSER>; + clock-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; }; aml_dtv_demod { compatible = "amlogic, ddemod-txlx"; dev_name = "aml_dtv_demod"; - status = "disable"; + status = "okay"; //pinctrl-names="dtvdemod_agc"; //pinctrl-0=<&dtvdemod_agc>; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts index 0348d96..0c90ab3 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts @@ -1239,21 +1239,6 @@ }; /* end of AUDIO board specific */ - dvb { - compatible = "amlogic, dvb"; - dev_name = "dvb"; - status = "disabled"; - /*"parallel","serial","disable"*/ - ts2 = "parallel"; - ts2_control = <0>; - ts2_invert = <0>; - //resets = <&clock GCLK_IDX_DEMUX - // &clock GCLK_IDX_ASYNC_FIFO - // &clock GCLK_IDX_AHB_ARB0 - // &clock GCLK_IDX_U_PARSER_TOP>; - //reset-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; - }; - aml_sensor0: aml-sensor@0 { compatible = "amlogic, aml-thermal"; device_name = "thermal"; @@ -1300,21 +1285,39 @@ dvb { compatible = "amlogic, dvb"; dev_name = "dvb"; - status = "disabled"; + status = "okay"; + demod = "internal"; + tuner0 = "si2151_tuner"; + tuner0_i2c_adap_id = <&i2c1>; + tuner0_i2c_addr = <0x60>; /*"parallel","serial","disable"*/ ts2 = "parallel"; ts2_control = <0>; ts2_invert = <0>; - //resets = <&clock GCLK_IDX_DEMUX - // &clock GCLK_IDX_ASYNC_FIFO - // &clock GCLK_IDX_AHB_ARB0 - // &clock GCLK_IDX_U_PARSER_TOP>; - //reset-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; + 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"; + clocks = <&clkc CLKID_DEMUX + &clkc CLKID_ASYNC_FIFO + &clkc CLKID_AHB_ARB0 + &clkc CLKID_DOS_PARSER>; + clock-names = "demux", "asyncfifo", "ahbarb0", "uparsertop"; }; aml_dtv_demod { compatible = "amlogic, ddemod-txlx"; dev_name = "aml_dtv_demod"; - status = "disable"; + status = "okay"; //pinctrl-names="dtvdemod_agc"; //pinctrl-0=<&dtvdemod_agc>; -- 2.7.4