diff options
author | Mike Turquette <mturquette@linaro.org> | 2014-07-31 12:32:18 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-07-31 12:32:18 -0400 |
commit | d7d3d26fa5446fc74e2c52504d827bda89b7b03e (patch) | |
tree | 209f3a0fe71af5a97ece45cee40c7e1a4f5495f3 /drivers/clk/samsung/clk-exynos5440.c | |
parent | abeab450bfe823079c8a3abf5123f41a0da62392 (diff) | |
parent | f65d518942325d4bfa74b5c9d42ea5a89e4f6943 (diff) |
Merge tag 'for_3.17/samsung-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tfiga/samsung-clk into clk-next-samsung
Samsung clock patches for 3.17
1) non-critical fixes (without need to push to stable):
d5e136a clk: samsung: Register clk provider only after registering its all clocks
305cfab clk: samsung: Make of_device_id array const
e9d5295 clk: samsung: exynos5420: Setup clocks before system suspend
f65d518 clk: samsung: trivial: Correct typo in author's name
2) Exynos CLKOUT driver:
800c979 clk: samsung: exynos4: Add missing CPU/DMC clock hierarchy
01f7ec2 clk: samsung: exynos4: Add CLKOUT clock hierarchy
1e832e5 clk: samsung: Add driver to control CLKOUT line on Exynos SoCs
d19bb39 ARM: dts: exynos: Update PMU node with CLKOUT related data
3) Clock hierarchy extensions:
17d3f1d clk: exynos4: Add PPMU IP block source clocks.
ca5b402 clk: samsung: register exynos5420 apll/kpll configuration data
4) ARM CLKDOWN functionality enablement for Exynos4 and 3250:
42773b2 clk: samsung: exynos4: Enable ARMCLK down feature
45c5b0a clk: samsung: exynos3250: Enable ARMCLK down feature
Diffstat (limited to 'drivers/clk/samsung/clk-exynos5440.c')
-rw-r--r-- | drivers/clk/samsung/clk-exynos5440.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/samsung/clk-exynos5440.c b/drivers/clk/samsung/clk-exynos5440.c index 647f1440aa6a..00d1d00a41de 100644 --- a/drivers/clk/samsung/clk-exynos5440.c +++ b/drivers/clk/samsung/clk-exynos5440.c | |||
@@ -84,7 +84,7 @@ static struct samsung_gate_clock exynos5440_gate_clks[] __initdata = { | |||
84 | GATE(CLK_CS250_O, "cs250_o", "cs250", CLKEN_OV_VAL, 19, 0, 0), | 84 | GATE(CLK_CS250_O, "cs250_o", "cs250", CLKEN_OV_VAL, 19, 0, 0), |
85 | }; | 85 | }; |
86 | 86 | ||
87 | static struct of_device_id ext_clk_match[] __initdata = { | 87 | static const struct of_device_id ext_clk_match[] __initconst = { |
88 | { .compatible = "samsung,clock-xtal", .data = (void *)0, }, | 88 | { .compatible = "samsung,clock-xtal", .data = (void *)0, }, |
89 | {}, | 89 | {}, |
90 | }; | 90 | }; |
@@ -123,6 +123,8 @@ static void __init exynos5440_clk_init(struct device_node *np) | |||
123 | samsung_clk_register_gate(ctx, exynos5440_gate_clks, | 123 | samsung_clk_register_gate(ctx, exynos5440_gate_clks, |
124 | ARRAY_SIZE(exynos5440_gate_clks)); | 124 | ARRAY_SIZE(exynos5440_gate_clks)); |
125 | 125 | ||
126 | samsung_clk_of_add_provider(np, ctx); | ||
127 | |||
126 | pr_info("Exynos5440: arm_clk = %ldHz\n", _get_rate("arm_clk")); | 128 | pr_info("Exynos5440: arm_clk = %ldHz\n", _get_rate("arm_clk")); |
127 | pr_info("exynos5440 clock initialization complete\n"); | 129 | pr_info("exynos5440 clock initialization complete\n"); |
128 | } | 130 | } |