evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "clk: msm: clock: Add voter clocks for mmss_camss_jpeg0_clk"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-26 14:48:29 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2f4167d0e1
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/clk/msm/clock-mmss-cobalt.c
View file

@ -1665,6 +1665,10 @@ static struct branch_clk mmss_camss_jpeg0_clk = {
},
};
static DEFINE_CLK_VOTER(mmss_camss_jpeg0_vote_clk, &mmss_camss_jpeg0_clk.c, 0);
static DEFINE_CLK_VOTER(mmss_camss_jpeg0_dma_vote_clk,
&mmss_camss_jpeg0_clk.c, 0);
static struct branch_clk mmss_camss_jpeg_ahb_clk = {
.cbcr_reg = MMSS_CAMSS_JPEG_AHB_CBCR,
.has_sibling = 1,
@ -2572,6 +2576,8 @@ static struct clk_lookup msm_clocks_mmss_cobalt[] = {
CLK_LIST(mmss_camss_gp1_clk),
CLK_LIST(mmss_camss_ispif_ahb_clk),
CLK_LIST(mmss_camss_jpeg0_clk),
CLK_LIST(mmss_camss_jpeg0_vote_clk),
CLK_LIST(mmss_camss_jpeg0_dma_vote_clk),
CLK_LIST(mmss_camss_jpeg_ahb_clk),
CLK_LIST(mmss_camss_jpeg_axi_clk),
CLK_LIST(mmss_camss_mclk0_clk),

2
include/dt-bindings/clock/msm-clocks-cobalt.h
View file

@ -383,6 +383,8 @@
#define clk_mmss_camss_gp1_clk 0xdccdd730
#define clk_mmss_camss_ispif_ahb_clk 0xbda4f0e3
#define clk_mmss_camss_jpeg0_clk 0x4cc73b07
#define clk_mmss_camss_jpeg0_vote_clk 0xc9efa6ac
#define clk_mmss_camss_jpeg0_dma_vote_clk 0x371ec109
#define clk_mmss_camss_jpeg_ahb_clk 0xde1fece3
#define clk_mmss_camss_jpeg_axi_clk 0x7534616b
#define clk_mmss_camss_mclk0_clk 0x056293a7