| author | Nanxin Qin <nanxin.qin@amlogic.com> | 2017-04-27 06:19:05 (GMT) |
|---|---|---|
| committer | Nanxin Qin <nanxin.qin@amlogic.com> | 2017-05-02 07:27:43 (GMT) |
| commit | 0b016f3fbb21054dc742e63c07a73aeae1742930 (patch) | |
| tree | 8f7f52eb99e7cc4ab6c5b2efd0915c8e9b887d71 | |
| parent | d42aa31b47c42af7e6c90719031ec317ae2d6522 (diff) | |
| download | media-0b016f3fbb21054dc742e63c07a73aeae1742930.zip media-0b016f3fbb21054dc742e63c07a73aeae1742930.tar.gz media-0b016f3fbb21054dc742e63c07a73aeae1742930.tar.bz2 | |
amports: the vpu gate removed from media modules
PD#143250: the vpu_intr removed from media modules
Change-Id: Ib574d8b3e159044d65bb1a2a12c8abba9303268b
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
| -rw-r--r-- | drivers/common/media_clock/switch/amports_gate.c | 5 | ||||
| -rw-r--r-- | drivers/stream_input/amports/amstream.c | 14 |
2 files changed, 0 insertions, 19 deletions
diff --git a/drivers/common/media_clock/switch/amports_gate.c b/drivers/common/media_clock/switch/amports_gate.c index 51e606c..a4e6b54 100644 --- a/drivers/common/media_clock/switch/amports_gate.c +++ b/drivers/common/media_clock/switch/amports_gate.c @@ -44,9 +44,6 @@ struct gate_swtch_node gates[] = { .name = "parser_top", }, { - .name = "vpu_intr", - }, - { .name = "vdec", }, { @@ -67,14 +64,12 @@ mesonstream { dev_name = "mesonstream"; status = "okay"; clocks = <&clkc CLKID_DOS_PARSER - &clkc CLKID_VPU_INTR &clkc CLKID_DEMUX &clkc CLKID_DOS &clkc CLKID_VDEC_MUX &clkc CLKID_HCODEC_MUX &clkc CLKID_HEVC_MUX>; clock-names = "parser_top", - "vpu_intr", "demux", "vdec", "clk_vdec_mux", diff --git a/drivers/stream_input/amports/amstream.c b/drivers/stream_input/amports/amstream.c index bfd9e5a..6c07f63 100644 --- a/drivers/stream_input/amports/amstream.c +++ b/drivers/stream_input/amports/amstream.c @@ -1483,13 +1483,6 @@ static int amstream_open(struct inode *inode, struct file *file) amports_switch_gate("parser_top", 1); } - if ((get_cpu_type() >= MESON_CPU_MAJOR_ID_M8) - && !is_meson_mtvd_cpu()) { - /* TODO: clc gate */ - /* CLK_GATE_ON(VPU_INTR); */ - amports_switch_gate("vpu_intr", 1); - } - if (port->type & PORT_TYPE_VIDEO) { /* TODO: mod gate */ /* switch_mod_gate_by_name("vdec", 1); */ @@ -1635,13 +1628,6 @@ static int amstream_release(struct inode *inode, struct file *file) /* amports_switch_gate("audio", 0); */ } - if (get_cpu_type() >= MESON_CPU_MAJOR_ID_M8 - && !is_meson_mtvd_cpu()) { - /* TODO: clc gate */ - /* /CLK_GATE_OFF(VPU_INTR); */ - amports_switch_gate("vpu_intr", 0); - } - if (get_cpu_type() >= MESON_CPU_MAJOR_ID_M8) { /* TODO: clc gate */ /* CLK_GATE_OFF(HIU_PARSER_TOP); */ |