commit a2aff84ffa6dcda9e25df912d6ce739ce1b0f315
author Linux Build Service Account <lnxbuild@localhost> Mon May 20 21:45:28 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon May 20 21:45:26 2013 -0700
tree fe33568c1d166277fda572647616b3138e1cec33
parent 15174b4bccca9badcdd20d6b8e156b4e5f876294
parent 722ed32bd21ac8dd2a80e405047c699ad108deae

Merge "msm: clock-8084: Add clock support for ocmem"

arch/arm/mach-msm/clock-8084.c

diff --git a/arch/arm/mach-msm/clock-8084.c b/arch/arm/mach-msm/clock-8084.c
index 424b694..b7f9fd7 100644
--- a/arch/arm/mach-msm/clock-8084.c
+++ b/arch/arm/mach-msm/clock-8084.c
@@ -325,7 +325,9 @@
 	CLK_DUMMY("",	mmss_mmssnoc_ahb_clk.c,	"", OFF),
 	CLK_DUMMY("",	mmss_mmssnoc_axi_clk.c,	"", OFF),
 	CLK_DUMMY("",	mmss_s0_axi_clk.c,	"", OFF),
-	CLK_DUMMY("",	ocmemcx_ocmemnoc_clk.c,	"", OFF),
+	CLK_DUMMY("core_clk",  ocmemgx_core_clk.c, "fdd00000.qcom,ocmem", OFF),
+	CLK_DUMMY("iface_clk",	ocmemcx_ocmemnoc_clk.c,
+						"fdd00000.qcom,ocmem", OFF),
 	CLK_DUMMY("",	oxili_ocmemgx_clk.c,	"", OFF),
 	CLK_DUMMY("",	oxili_gfx3d_clk.c,	"", OFF),
 	CLK_DUMMY("",	oxili_rbbmtimer_clk.c,	"", OFF),