From 49c21ac7025fd4366f1be3652b6a402f4d61fe8f Mon Sep 17 00:00:00 2001
From: Deepak Katragadda <dkatraga@codeaurora.org>
Date: Fri, 12 Aug 2016 17:02:30 -0700
Subject: [PATCH] clk: msm: clock: Add voter clocks for mmss_camss_jpeg0_clk
Add separate voter clocks for controlling the mmss_camss_jpeg0_clk
from two clients on MSMCOBALT.
CRs-Fixed: 1049594
Change-Id: I530e35054fd512574bca9e5937317099f58d2bb6
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
---
drivers/clk/msm/clock-mmss-cobalt.c | 6 ++++++
include/dt-bindings/clock/msm-clocks-cobalt.h | 2 ++
2 files changed, 8 insertions(+)
diff --git a/drivers/clk/msm/clock-mmss-cobalt.c b/drivers/clk/msm/clock-mmss-cobalt.c
index 2da10a2e4780..bbb9af961235 100644
--- a/drivers/clk/msm/clock-mmss-cobalt.c
+++ b/drivers/clk/msm/clock-mmss-cobalt.c
@@ -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),
diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h
index 3fb1e45373da..efbc91093e40 100644
--- a/include/dt-bindings/clock/msm-clocks-cobalt.h
+++ b/include/dt-bindings/clock/msm-clocks-cobalt.h
@@ -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