diff options
| author | Michael Turquette <mturquette@linaro.org> | 2014-12-11 21:17:15 +0100 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2014-12-11 21:17:15 +0100 |
| commit | c9b928148eb430bc2beb486d94efd2c3bc439a0c (patch) | |
| tree | 9bae414dc6a2e926eef9cec8d7df0480db96271e /drivers/clk/samsung/clk.c | |
| parent | clk: mmp: fix sparse non static symbol warning (diff) | |
| parent | clk: samsung: Fix double add of syscore ops after driver rebind (diff) | |
| download | linux-c9b928148eb430bc2beb486d94efd2c3bc439a0c.tar.xz linux-c9b928148eb430bc2beb486d94efd2c3bc439a0c.zip | |
Merge tag 'for-v3.19-exynos-clk-2' of git://linuxtv.org/snawrocki/samsung into clk-next
- exynos4415 and exynos audio subsystem clk driver (build
with PM_SLEEP disabled, resource release) fixes
- minor cleanups in drivers/clk/samsung/clk.c (spelling,
includes)
- modification of the exynos4 HDMI PHY clock definition to
model dependency of "sclk_hdmiphy" on the "hdmi" clock
Diffstat (limited to 'drivers/clk/samsung/clk.c')
| -rw-r--r-- | drivers/clk/samsung/clk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/samsung/clk.c b/drivers/clk/samsung/clk.c index dd1f7c977b6b..4bda54095a16 100644 --- a/drivers/clk/samsung/clk.c +++ b/drivers/clk/samsung/clk.c @@ -11,7 +11,9 @@ * clock framework for Samsung platforms. */ +#include <linux/of_address.h> #include <linux/syscore_ops.h> + #include "clk.h" static LIST_HEAD(clock_reg_cache_list); @@ -283,7 +285,6 @@ void __init samsung_clk_register_gate(struct samsung_clk_provider *ctx, * obtain the clock speed of all external fixed clock sources from device * tree and register it */ -#ifdef CONFIG_OF void __init samsung_clk_of_register_fixed_ext(struct samsung_clk_provider *ctx, struct samsung_fixed_rate_clock *fixed_rate_clk, unsigned int nr_fixed_rate_clk, @@ -300,7 +301,6 @@ void __init samsung_clk_of_register_fixed_ext(struct samsung_clk_provider *ctx, } samsung_clk_register_fixed_rate(ctx, fixed_rate_clk, nr_fixed_rate_clk); } -#endif /* utility function to get the rate of a specified clock */ unsigned long _get_rate(const char *clk_name) |