summaryrefslogtreecommitdiff
path: root/drivers/video/ipu_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/ipu_common.c')
-rw-r--r--drivers/video/ipu_common.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c
index 88f6a52..0a47117 100644
--- a/drivers/video/ipu_common.c
+++ b/drivers/video/ipu_common.c
@@ -162,6 +162,7 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
static int clk_ipu_enable(struct clk *clk)
{
+ ipu_clk_enable();
return 0;
}
@@ -169,7 +170,6 @@ static void clk_ipu_disable(struct clk *clk)
{
}
-
static struct clk ipu_clk = {
.name = "ipu_clk",
.rate = 133000000,
@@ -976,8 +976,12 @@ int32_t ipu_enable_channel(ipu_channel_t channel)
}
if ((channel == MEM_DC_SYNC) || (channel == MEM_BG_SYNC) ||
- (channel == MEM_FG_SYNC))
+ (channel == MEM_FG_SYNC)) {
+ reg = __raw_readl(IDMAC_WM_EN(in_dma));
+ __raw_writel(reg | idma_mask(in_dma), IDMAC_WM_EN(in_dma));
+
ipu_dp_dc_enable(channel);
+ }
g_channel_enable_mask |= 1L << IPU_CHAN_ID(channel);