Merge "msm: camera: isp: Set no memory retention"

This commit is contained in:
Linux Build Service Account 2016-08-16 10:20:25 -07:00 committed by Gerrit - the friendly Code Review server
commit a788d5ed56

View file

@ -12,6 +12,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <linux/clk/msm-clk.h>
#include "msm_isp_util.h" #include "msm_isp_util.h"
#include "msm_isp_axi_util.h" #include "msm_isp_axi_util.h"
@ -198,6 +199,18 @@ static int msm_vfe48_get_clks(struct vfe_device *vfe_dev)
if (strcmp(vfe_dev->vfe_clk_info[i].clk_name, if (strcmp(vfe_dev->vfe_clk_info[i].clk_name,
"mnoc_maxi_clk") == 0) "mnoc_maxi_clk") == 0)
vfe_dev->vfe_clk_info[i].clk_rate = INIT_RATE; vfe_dev->vfe_clk_info[i].clk_rate = INIT_RATE;
/* set no memory retention */
if (strcmp(vfe_dev->vfe_clk_info[i].clk_name,
"camss_vfe_clk") == 0 ||
strcmp(vfe_dev->vfe_clk_info[i].clk_name,
"camss_csi_vfe_clk") == 0 ||
strcmp(vfe_dev->vfe_clk_info[i].clk_name,
"camss_vfe_vbif_axi_clk") == 0) {
msm_camera_set_clk_flags(vfe_dev->vfe_clk[i],
CLKFLAG_NORETAIN_MEM);
msm_camera_set_clk_flags(vfe_dev->vfe_clk[i],
CLKFLAG_NORETAIN_PERIPH);
}
} }
return 0; return 0;
} }