summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/include/plat/s5p-clock.h
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-05-20 03:04:59 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-05-20 03:04:59 +0900
commit2de05a57467c43f58802cdeaa547aee73396b6f3 (patch)
treee73f96c9954479a6909eb6195631284eac0fa47f /arch/arm/plat-samsung/include/plat/s5p-clock.h
parentab5a4e6381d27a6554e6833383e536773e3a6ec1 (diff)
parent380c3a545f7de096c0f84344ba70ea4cfd1a059f (diff)
downloadop-kernel-dev-2de05a57467c43f58802cdeaa547aee73396b6f3.zip
op-kernel-dev-2de05a57467c43f58802cdeaa547aee73396b6f3.tar.gz
Merge branch 'next/devel-exynos5250-1' into next/devel-samsung-2
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/s5p-clock.h')
-rw-r--r--arch/arm/plat-samsung/include/plat/s5p-clock.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/s5p-clock.h b/arch/arm/plat-samsung/include/plat/s5p-clock.h
index 1de4b32..8364b4b 100644
--- a/arch/arm/plat-samsung/include/plat/s5p-clock.h
+++ b/arch/arm/plat-samsung/include/plat/s5p-clock.h
@@ -32,8 +32,10 @@ extern struct clk clk_48m;
extern struct clk s5p_clk_27m;
extern struct clk clk_fout_apll;
extern struct clk clk_fout_bpll;
+extern struct clk clk_fout_bpll_div2;
extern struct clk clk_fout_cpll;
extern struct clk clk_fout_mpll;
+extern struct clk clk_fout_mpll_div2;
extern struct clk clk_fout_epll;
extern struct clk clk_fout_dpll;
extern struct clk clk_fout_vpll;
@@ -42,8 +44,10 @@ extern struct clk clk_vpll;
extern struct clksrc_sources clk_src_apll;
extern struct clksrc_sources clk_src_bpll;
+extern struct clksrc_sources clk_src_bpll_fout;
extern struct clksrc_sources clk_src_cpll;
extern struct clksrc_sources clk_src_mpll;
+extern struct clksrc_sources clk_src_mpll_fout;
extern struct clksrc_sources clk_src_epll;
extern struct clksrc_sources clk_src_dpll;
OpenPOWER on IntegriCloud