From 14ecb88d48a80b774f255ae3a7735e4f66ef955e Mon Sep 17 00:00:00 2001 From: Evoke Zhang Date: Sat, 24 Feb 2018 10:55:57 +0800 Subject: [PATCH] vpu: add viu2 vpu_clk_gate control PD#156734: vpu: add viu2 vpu_clk_gate control Change-Id: I5a40a71e83a673292810233b000e853bd0420fe8 Signed-off-by: Evoke Zhang --- drivers/amlogic/media/common/vpu/vpu_ctrl.h | 2 ++ drivers/amlogic/media/common/vpu/vpu_module.h | 2 ++ include/linux/amlogic/media/vpu/vpu.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/drivers/amlogic/media/common/vpu/vpu_ctrl.h b/drivers/amlogic/media/common/vpu/vpu_ctrl.h index 4d9d8586a3c2..6ba2f74bb6d4 100644 --- a/drivers/amlogic/media/common/vpu/vpu_ctrl.h +++ b/drivers/amlogic/media/common/vpu/vpu_ctrl.h @@ -394,6 +394,8 @@ static struct vpu_ctrl_s vpu_clk_gate_g12a[] = { /* vpu module, reg, bit, len */ {VPU_VPU_TOP, VPU_CLK_GATE, 1, 1}, /* vpu_system_clk */ {VPU_VPU_CLKB, VPU_CLK_GATE, 18, 1}, + {VPU_CLK_B_REG_LATCH, VPU_CLK_GATE, 17, 1}, + {VPU_CLK_VIB, VPU_CLK_GATE, 16, 1}, {VPU_RDMA, VPU_CLK_GATE, 15, 1}, /* rdma_clk */ {VPU_VLOCK, VPU_CLK_GATE, 14, 1}, {VPU_MISC, VPU_CLK_GATE, 6, 1}, /* hs,vs interrupt*/ diff --git a/drivers/amlogic/media/common/vpu/vpu_module.h b/drivers/amlogic/media/common/vpu/vpu_module.h index c896af5f5b27..beb6bbf812cf 100644 --- a/drivers/amlogic/media/common/vpu/vpu_module.h +++ b/drivers/amlogic/media/common/vpu/vpu_module.h @@ -80,6 +80,8 @@ static char *vpu_mod_table[] = { /* for clk_gate */ "vpu_top", "vpu_clkb", + "clk_vib", + "clk_b_reg_latch", "vpu_misc", "venc_dac", "vlock", diff --git a/include/linux/amlogic/media/vpu/vpu.h b/include/linux/amlogic/media/vpu/vpu.h index e5735695458a..c0d5e143ff54 100644 --- a/include/linux/amlogic/media/vpu/vpu.h +++ b/include/linux/amlogic/media/vpu/vpu.h @@ -80,6 +80,8 @@ enum vpu_mod_e { /* for clk_gate */ VPU_VPU_TOP, VPU_VPU_CLKB, + VPU_CLK_VIB, + VPU_CLK_B_REG_LATCH, VPU_MISC, /* hs,vs,interrupt */ VPU_VENC_DAC, VPU_VLOCK,