diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-10 05:31:44 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 17:00:38 -0400 |
commit | 25e56eba0ae783fc5b66d50c68826f276e8bd8c6 (patch) | |
tree | 0162391460341b29d50e47f74366d391222d89f6 /arch/arm/mach-exynos | |
parent | f4636d0ad7eee4741ef5146080e9ce57b9e2de0b (diff) |
clk: exynos: prepare for multiplatform
The new common clock drivers for exynos are using compile
time constants and soc_is_exynos* macros to provide backwards
compatibility for pre-DT systems, which is not possible with
multiplatform kernels. This moves all the necessary
information back into platform code and removes the mach/*
header inclusions.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r-- | arch/arm/mach-exynos/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos/common.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index a3ab0ecc7c6a..c3167b741180 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
@@ -413,7 +413,7 @@ void __init exynos_init_time(void) | |||
413 | } else { | 413 | } else { |
414 | /* todo: remove after migrating legacy E4 platforms to dt */ | 414 | /* todo: remove after migrating legacy E4 platforms to dt */ |
415 | #ifdef CONFIG_ARCH_EXYNOS4 | 415 | #ifdef CONFIG_ARCH_EXYNOS4 |
416 | exynos4_clk_init(NULL); | 416 | exynos4_clk_init(NULL, !soc_is_exynos4210(), S5P_VA_CMU, readl(S5P_VA_CHIPID + 8) & 1); |
417 | exynos4_clk_register_fixed_ext(xxti_f, xusbxti_f); | 417 | exynos4_clk_register_fixed_ext(xxti_f, xusbxti_f); |
418 | #endif | 418 | #endif |
419 | mct_init(); | 419 | mct_init(); |
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index cb89ab886950..4ed8eef2b096 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h | |||
@@ -27,7 +27,7 @@ void exynos5_restart(char mode, const char *cmd); | |||
27 | void exynos_init_late(void); | 27 | void exynos_init_late(void); |
28 | 28 | ||
29 | /* ToDo: remove these after migrating legacy exynos4 platforms to dt */ | 29 | /* ToDo: remove these after migrating legacy exynos4 platforms to dt */ |
30 | void exynos4_clk_init(struct device_node *np); | 30 | void exynos4_clk_init(struct device_node *np, int is_exynos4210, void __iomem *reg_base, unsigned long xom); |
31 | void exynos4_clk_register_fixed_ext(unsigned long, unsigned long); | 31 | void exynos4_clk_register_fixed_ext(unsigned long, unsigned long); |
32 | 32 | ||
33 | #ifdef CONFIG_PM_GENERIC_DOMAINS | 33 | #ifdef CONFIG_PM_GENERIC_DOMAINS |