| author | Peng Chuangcheng <chuangcheng.peng@amlogic.com> | 2018-03-12 08:51:11 (GMT) |
|---|---|---|
| committer | yang.xu <yang.xu@amlogic.com> | 2018-04-24 02:11:14 (GMT) |
| commit | b4b80ce10ced1fbe59dbf7749eb7bce2e987937e (patch) | |
| tree | 8a345d5f3fd41f80efa2c3c34a1e4a334ef350f9 | |
| parent | fec0eb1cedf4d302d1f158e763a3bda6bfe46fdd (diff) | |
| download | common-b4b80ce10ced1fbe59dbf7749eb7bce2e987937e.zip common-b4b80ce10ced1fbe59dbf7749eb7bce2e987937e.tar.gz common-b4b80ce10ced1fbe59dbf7749eb7bce2e987937e.tar.bz2 | |
dvb: add dvb module dts & modify demux define
PD#156734: add dvb module dts & modify demux define
Change-Id: I6125be7c0f489687524529a547b9d426eb5de4ac
Signed-off-by: Chuangcheng Peng <chuangcheng.peng@amlogic.com>
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts | 10 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/mesong12a.dtsi | 2 | ||||
| -rw-r--r-- | include/linux/amlogic/media/utils/amstream.h | 1 | ||||
| -rw-r--r-- | include/linux/amlogic/media/utils/vdec_reg.h | 3 |
4 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts index 2d5b1df..8fe99a1 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts @@ -280,7 +280,15 @@ 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"; diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi index d2ad356..3365a23 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi @@ -1203,6 +1203,7 @@ status = "okay"; clocks = <&clkc CLKID_DOS_PARSER &clkc CLKID_DEMUX + &clkc CLKID_AHB_ARB0 &clkc CLKID_DOS &clkc CLKID_VDEC_MUX &clkc CLKID_HCODEC_MUX @@ -1210,6 +1211,7 @@ &clkc CLKID_HEVCF_MUX>; clock-names = "parser_top", "demux", + "ahbarb0", "vdec", "clk_vdec_mux", "clk_hcodec_mux", diff --git a/include/linux/amlogic/media/utils/amstream.h b/include/linux/amlogic/media/utils/amstream.h index 9f6ed85..f40bdff 100644 --- a/include/linux/amlogic/media/utils/amstream.h +++ b/include/linux/amlogic/media/utils/amstream.h @@ -680,6 +680,7 @@ struct tsdemux_ops { void tsdemux_set_ops(struct tsdemux_ops *ops); int tsdemux_set_reset_flag(void); +int amports_switch_gate(const char *name, int enable); void set_adec_func(int (*adec_func)(struct adec_status *)); void wakeup_sub_poll(void); diff --git a/include/linux/amlogic/media/utils/vdec_reg.h b/include/linux/amlogic/media/utils/vdec_reg.h index 6808053..c90e453 100644 --- a/include/linux/amlogic/media/utils/vdec_reg.h +++ b/include/linux/amlogic/media/utils/vdec_reg.h @@ -40,9 +40,10 @@ #define INT_DOS_MAILBOX_1 AM_IRQ(44) #define INT_DOS_MAILBOX_2 AM_IRQ(45) #define INT_VIU_VSYNC AM_IRQ(3) + #define INT_DEMUX AM_IRQ(23) #define INT_DEMUX_1 AM_IRQ(5) -#define INT_DEMUX_2 AM_IRQ(53) +#define INT_DEMUX_2 AM_IRQ(21)//AM_IRQ(53) #define INT_ASYNC_FIFO_FILL AM_IRQ(18) #define INT_ASYNC_FIFO_FLUSH AM_IRQ(19) #define INT_ASYNC_FIFO2_FILL AM_IRQ(24) |