aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Majewski <l.majewski@samsung.com>2013-04-04 00:32:59 -0400
committerKukjin Kim <kgene.kim@samsung.com>2013-04-04 02:51:09 -0400
commite77ba804c103db5380d182aaa83af4566699fca1 (patch)
treee47c22162d421a78e7f59969931387014fafebf1
parent7bc1d2da0aa80ff387507e3bcb68bd72abec8a92 (diff)
clk: exynos4: Export clocks used by exynos cpufreq drivers
This patch exports clocks used by Exynos cpufreq drivers to allow lookup using device tree. (Support to cpufreq drivers will be added in further patches.) Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Thomas Abraham <thomas.abraham@linaro.org> Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--Documentation/devicetree/bindings/clock/exynos4-clock.txt2
-rw-r--r--drivers/clk/samsung/clk-exynos4.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/clock/exynos4-clock.txt b/Documentation/devicetree/bindings/clock/exynos4-clock.txt
index ac7cec44cfb4..51c572a715bc 100644
--- a/Documentation/devicetree/bindings/clock/exynos4-clock.txt
+++ b/Documentation/devicetree/bindings/clock/exynos4-clock.txt
@@ -44,6 +44,8 @@ Exynos4 SoC and this is specified where applicable.
44 aclk133 16 44 aclk133 16
45 mout_mpll_user_t 17 Exynos4x12 45 mout_mpll_user_t 17 Exynos4x12
46 mout_mpll_user_c 18 Exynos4x12 46 mout_mpll_user_c 18 Exynos4x12
47 mout_core 19
48 mout_apll 20
47 49
48 50
49 [Clock Gate for Special Clocks] 51 [Clock Gate for Special Clocks]
diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c
index c1e64512c1b8..5592a78b2edc 100644
--- a/drivers/clk/samsung/clk-exynos4.c
+++ b/drivers/clk/samsung/clk-exynos4.c
@@ -112,7 +112,8 @@ enum exynos4_clks {
112 /* core clocks */ 112 /* core clocks */
113 xxti, xusbxti, fin_pll, fout_apll, fout_mpll, fout_epll, fout_vpll, 113 xxti, xusbxti, fin_pll, fout_apll, fout_mpll, fout_epll, fout_vpll,
114 sclk_apll, sclk_mpll, sclk_epll, sclk_vpll, arm_clk, aclk200, aclk100, 114 sclk_apll, sclk_mpll, sclk_epll, sclk_vpll, arm_clk, aclk200, aclk100,
115 aclk160, aclk133, mout_mpll_user_t, mout_mpll_user_c, /* 18 */ 115 aclk160, aclk133, mout_mpll_user_t, mout_mpll_user_c, mout_core,
116 mout_apll, /* 20 */
116 117
117 /* gate for special clocks (sclk) */ 118 /* gate for special clocks (sclk) */
118 sclk_fimc0 = 128, sclk_fimc1, sclk_fimc2, sclk_fimc3, sclk_cam0, 119 sclk_fimc0 = 128, sclk_fimc1, sclk_fimc2, sclk_fimc3, sclk_cam0,
@@ -284,7 +285,8 @@ struct samsung_fixed_rate_clock exynos4210_fixed_rate_clks[] __initdata = {
284 285
285/* list of mux clocks supported in all exynos4 soc's */ 286/* list of mux clocks supported in all exynos4 soc's */
286struct samsung_mux_clock exynos4_mux_clks[] __initdata = { 287struct samsung_mux_clock exynos4_mux_clks[] __initdata = {
287 MUX(none, "mout_apll", mout_apll_p, SRC_CPU, 0, 1), 288 MUX_F(mout_apll, "mout_apll", mout_apll_p, SRC_CPU, 0, 1,
289 CLK_SET_RATE_PARENT, 0),
288 MUX(none, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1), 290 MUX(none, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1),
289 MUX(none, "mout_mfc1", sclk_evpll_p, SRC_MFC, 4, 1), 291 MUX(none, "mout_mfc1", sclk_evpll_p, SRC_MFC, 4, 1),
290 MUX(none, "mout_mfc", mout_mfc_p, SRC_MFC, 8, 1), 292 MUX(none, "mout_mfc", mout_mfc_p, SRC_MFC, 8, 1),
@@ -362,7 +364,7 @@ struct samsung_mux_clock exynos4x12_mux_clks[] __initdata = {
362 E4X12_SRC_DMC, 12, 1, "sclk_mpll"), 364 E4X12_SRC_DMC, 12, 1, "sclk_mpll"),
363 MUX_A(sclk_vpll, "sclk_vpll", mout_vpll_p, 365 MUX_A(sclk_vpll, "sclk_vpll", mout_vpll_p,
364 SRC_TOP0, 8, 1, "sclk_vpll"), 366 SRC_TOP0, 8, 1, "sclk_vpll"),
365 MUX(none, "mout_core", mout_core_p4x12, SRC_CPU, 16, 1), 367 MUX(mout_core, "mout_core", mout_core_p4x12, SRC_CPU, 16, 1),
366 MUX(none, "mout_fimc0", group1_p4x12, SRC_CAM, 0, 4), 368 MUX(none, "mout_fimc0", group1_p4x12, SRC_CAM, 0, 4),
367 MUX(none, "mout_fimc1", group1_p4x12, SRC_CAM, 4, 4), 369 MUX(none, "mout_fimc1", group1_p4x12, SRC_CAM, 4, 4),
368 MUX(none, "mout_fimc2", group1_p4x12, SRC_CAM, 8, 4), 370 MUX(none, "mout_fimc2", group1_p4x12, SRC_CAM, 8, 4),