diff options
Diffstat (limited to 'arch/arm/mach-exynos/clock-exynos4212.c')
-rw-r--r-- | arch/arm/mach-exynos/clock-exynos4212.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/arch/arm/mach-exynos/clock-exynos4212.c b/arch/arm/mach-exynos/clock-exynos4212.c index 48af28566fa..3ecc01e06f7 100644 --- a/arch/arm/mach-exynos/clock-exynos4212.c +++ b/arch/arm/mach-exynos/clock-exynos4212.c | |||
@@ -1,7 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/arm/mach-exynos4/clock-exynos4212.c | 2 | * Copyright (c) 2011-2012 Samsung Electronics Co., Ltd. |
3 | * | ||
4 | * Copyright (c) 2011 Samsung Electronics Co., Ltd. | ||
5 | * http://www.samsung.com | 3 | * http://www.samsung.com |
6 | * | 4 | * |
7 | * EXYNOS4212 - Clock support | 5 | * EXYNOS4212 - Clock support |
@@ -28,22 +26,22 @@ | |||
28 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
29 | #include <mach/map.h> | 27 | #include <mach/map.h> |
30 | #include <mach/regs-clock.h> | 28 | #include <mach/regs-clock.h> |
31 | #include <mach/exynos4-clock.h> | ||
32 | 29 | ||
33 | #include "common.h" | 30 | #include "common.h" |
31 | #include "clock-exynos4.h" | ||
34 | 32 | ||
35 | #ifdef CONFIG_PM_SLEEP | 33 | #ifdef CONFIG_PM_SLEEP |
36 | static struct sleep_save exynos4212_clock_save[] = { | 34 | static struct sleep_save exynos4212_clock_save[] = { |
37 | SAVE_ITEM(S5P_CLKSRC_IMAGE), | 35 | SAVE_ITEM(EXYNOS4_CLKSRC_IMAGE), |
38 | SAVE_ITEM(S5P_CLKDIV_IMAGE), | 36 | SAVE_ITEM(EXYNOS4_CLKDIV_IMAGE), |
39 | SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4212), | 37 | SAVE_ITEM(EXYNOS4212_CLKGATE_IP_IMAGE), |
40 | SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4212), | 38 | SAVE_ITEM(EXYNOS4212_CLKGATE_IP_PERIR), |
41 | }; | 39 | }; |
42 | #endif | 40 | #endif |
43 | 41 | ||
44 | static struct clk *clk_src_mpll_user_list[] = { | 42 | static struct clk *clk_src_mpll_user_list[] = { |
45 | [0] = &clk_fin_mpll, | 43 | [0] = &clk_fin_mpll, |
46 | [1] = &clk_mout_mpll.clk, | 44 | [1] = &exynos4_clk_mout_mpll.clk, |
47 | }; | 45 | }; |
48 | 46 | ||
49 | static struct clksrc_sources clk_src_mpll_user = { | 47 | static struct clksrc_sources clk_src_mpll_user = { |
@@ -56,7 +54,7 @@ static struct clksrc_clk clk_mout_mpll_user = { | |||
56 | .name = "mout_mpll_user", | 54 | .name = "mout_mpll_user", |
57 | }, | 55 | }, |
58 | .sources = &clk_src_mpll_user, | 56 | .sources = &clk_src_mpll_user, |
59 | .reg_src = { .reg = S5P_CLKSRC_CPU, .shift = 24, .size = 1 }, | 57 | .reg_src = { .reg = EXYNOS4_CLKSRC_CPU, .shift = 24, .size = 1 }, |
60 | }; | 58 | }; |
61 | 59 | ||
62 | static struct clksrc_clk *sysclks[] = { | 60 | static struct clksrc_clk *sysclks[] = { |
@@ -89,7 +87,7 @@ static void exynos4212_clock_resume(void) | |||
89 | #define exynos4212_clock_resume NULL | 87 | #define exynos4212_clock_resume NULL |
90 | #endif | 88 | #endif |
91 | 89 | ||
92 | struct syscore_ops exynos4212_clock_syscore_ops = { | 90 | static struct syscore_ops exynos4212_clock_syscore_ops = { |
93 | .suspend = exynos4212_clock_suspend, | 91 | .suspend = exynos4212_clock_suspend, |
94 | .resume = exynos4212_clock_resume, | 92 | .resume = exynos4212_clock_resume, |
95 | }; | 93 | }; |
@@ -99,15 +97,15 @@ void __init exynos4212_register_clocks(void) | |||
99 | int ptr; | 97 | int ptr; |
100 | 98 | ||
101 | /* usbphy1 is removed */ | 99 | /* usbphy1 is removed */ |
102 | clkset_group_list[4] = NULL; | 100 | exynos4_clkset_group_list[4] = NULL; |
103 | 101 | ||
104 | /* mout_mpll_user is used */ | 102 | /* mout_mpll_user is used */ |
105 | clkset_group_list[6] = &clk_mout_mpll_user.clk; | 103 | exynos4_clkset_group_list[6] = &clk_mout_mpll_user.clk; |
106 | clkset_aclk_top_list[0] = &clk_mout_mpll_user.clk; | 104 | exynos4_clkset_aclk_top_list[0] = &clk_mout_mpll_user.clk; |
107 | 105 | ||
108 | clk_mout_mpll.reg_src.reg = S5P_CLKSRC_DMC; | 106 | exynos4_clk_mout_mpll.reg_src.reg = EXYNOS4_CLKSRC_DMC; |
109 | clk_mout_mpll.reg_src.shift = 12; | 107 | exynos4_clk_mout_mpll.reg_src.shift = 12; |
110 | clk_mout_mpll.reg_src.size = 1; | 108 | exynos4_clk_mout_mpll.reg_src.size = 1; |
111 | 109 | ||
112 | for (ptr = 0; ptr < ARRAY_SIZE(sysclks); ptr++) | 110 | for (ptr = 0; ptr < ARRAY_SIZE(sysclks); ptr++) |
113 | s3c_register_clksrc(sysclks[ptr], 1); | 111 | s3c_register_clksrc(sysclks[ptr], 1); |