Merge "msm: sde: shutoff memory and periphery when clock is off"

This commit is contained in:
Linux Build Service Account 2016-08-17 20:28:36 -07:00 committed by Gerrit - the friendly Code Review server
commit 2165532d6e

View file

@ -24,6 +24,7 @@
#include <linux/dma-mapping.h>
#include <linux/dma-buf.h>
#include <linux/msm_ion.h>
#include <linux/clk/msm-clk.h>
#include "sde_rotator_core.h"
#include "sde_rotator_util.h"
@ -1963,6 +1964,12 @@ int sde_rotator_r3_init(struct sde_rot_mgr *mgr)
if (ret)
goto error_hw_rev_init;
/* set rotator CBCR to shutoff memory/periphery on clock off.*/
clk_set_flags(mgr->rot_clk[mgr->core_clk_idx].clk,
CLKFLAG_NORETAIN_MEM);
clk_set_flags(mgr->rot_clk[mgr->core_clk_idx].clk,
CLKFLAG_NORETAIN_PERIPH);
return 0;
error_hw_rev_init:
if (rot->irq_num >= 0)