diff options
author | Jonghwan Choi <jhbird.choi@samsung.com> | 2014-05-16 19:19:30 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-25 15:05:01 -0400 |
commit | be1f7c8d7e2bc8b8c76846aa6f276e8d2ef8975a (patch) | |
tree | 3597f76be0d9453f2d0a7aa2255716fa63a10daa /drivers/cpufreq/exynos-cpufreq.h | |
parent | 2cd62bd4e5226ae5fa61f58ade8148f2e4643335 (diff) |
cpufreq: exynos: Fix the compile error
Commit 7da83a80 ("ARM: EXYNOS: Migrate Exynos specific macros from
plat to mach") which lands in samsung tree causes build breakage
for cpufreq-exynos like following:
drivers/cpufreq/exynos-cpufreq.c: In function 'exynos_cpufreq_probe':
drivers/cpufreq/exynos-cpufreq.c:166:2: error: implicit declaration of function 'soc_is_exynos4210'
[-Werror=implicit-function-declaration]
drivers/cpufreq/exynos-cpufreq.c:168:2: error: implicit declaration of function 'soc_is_exynos4212'
[-Werror=implicit-function-declaration]
drivers/cpufreq/exynos-cpufreq.c:168:2: error: implicit declaration of function 'soc_is_exynos4412'
[-Werror=implicit-function-declaration]
drivers/cpufreq/exynos-cpufreq.c:170:2: error: implicit declaration of function 'soc_is_exynos5250'
[-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors
make[2]: *** [drivers/cpufreq/exynos-cpufreq.o] Error 1
make[2]: *** Waiting for unfinished jobs....
drivers/cpufreq/exynos4x12-cpufreq.c: In function 'exynos4x12_set_clkdiv':
drivers/cpufreq/exynos4x12-cpufreq.c:118:2: error: implicit declaration of function 'soc_is_exynos4212'
[-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors
make[2]: *** [drivers/cpufreq/exynos4x12-cpufreq.o] Error 1
make[1]: *** [drivers/cpufreq] Error 2
This fixes above error with getting SoC information via
of_machine_is_compatible() instead of soc_is_exynosXXXX().
Suggested-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
[kgene.kim@samsung.com: fixed typo and modified as per Viresh's suggestion]
[kgene.kim@samsung.com: Rafael agreed]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'drivers/cpufreq/exynos-cpufreq.h')
-rw-r--r-- | drivers/cpufreq/exynos-cpufreq.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/cpufreq/exynos-cpufreq.h b/drivers/cpufreq/exynos-cpufreq.h index 3ddade8a5125..f189547bb447 100644 --- a/drivers/cpufreq/exynos-cpufreq.h +++ b/drivers/cpufreq/exynos-cpufreq.h | |||
@@ -17,6 +17,13 @@ enum cpufreq_level_index { | |||
17 | L20, | 17 | L20, |
18 | }; | 18 | }; |
19 | 19 | ||
20 | enum exynos_soc_type { | ||
21 | EXYNOS_SOC_4210, | ||
22 | EXYNOS_SOC_4212, | ||
23 | EXYNOS_SOC_4412, | ||
24 | EXYNOS_SOC_5250, | ||
25 | }; | ||
26 | |||
20 | #define APLL_FREQ(f, a0, a1, a2, a3, a4, a5, a6, a7, b0, b1, b2, m, p, s) \ | 27 | #define APLL_FREQ(f, a0, a1, a2, a3, a4, a5, a6, a7, b0, b1, b2, m, p, s) \ |
21 | { \ | 28 | { \ |
22 | .freq = (f) * 1000, \ | 29 | .freq = (f) * 1000, \ |
@@ -34,6 +41,7 @@ struct apll_freq { | |||
34 | }; | 41 | }; |
35 | 42 | ||
36 | struct exynos_dvfs_info { | 43 | struct exynos_dvfs_info { |
44 | enum exynos_soc_type type; | ||
37 | unsigned long mpll_freq_khz; | 45 | unsigned long mpll_freq_khz; |
38 | unsigned int pll_safe_idx; | 46 | unsigned int pll_safe_idx; |
39 | struct clk *cpu_clk; | 47 | struct clk *cpu_clk; |