diff options
| author | Jongpill Lee <boyko.lee@samsung.com> | 2010-08-18 09:20:31 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-27 05:06:54 -0400 |
| commit | 3ff310206db33e66c076b1f656e70e9080f5be50 (patch) | |
| tree | 18cb540c6e39b4b65030ad0f3c213ca617e76754 | |
| parent | 4d235f7934ab55329a5cb34d7e3949ba50b511d4 (diff) | |
ARM: S5PV310: Should be clk_sclk_apll not clk_mout_apll
This patch adds clk_sclk_apll so that fixes on clk_mout_apll.
Signed-off-by: Jongpill Lee <boyko.lee@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/mach-s5pv310/clock.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pv310/clock.c b/arch/arm/mach-s5pv310/clock.c index 1659eb1e7b07..b3f50426148d 100644 --- a/arch/arm/mach-s5pv310/clock.c +++ b/arch/arm/mach-s5pv310/clock.c | |||
| @@ -39,6 +39,14 @@ static struct clksrc_clk clk_mout_apll = { | |||
| 39 | }, | 39 | }, |
| 40 | .sources = &clk_src_apll, | 40 | .sources = &clk_src_apll, |
| 41 | .reg_src = { .reg = S5P_CLKSRC_CPU, .shift = 0, .size = 1 }, | 41 | .reg_src = { .reg = S5P_CLKSRC_CPU, .shift = 0, .size = 1 }, |
| 42 | }; | ||
| 43 | |||
| 44 | static struct clksrc_clk clk_sclk_apll = { | ||
| 45 | .clk = { | ||
| 46 | .name = "sclk_apll", | ||
| 47 | .id = -1, | ||
| 48 | .parent = &clk_mout_apll.clk, | ||
| 49 | }, | ||
| 42 | .reg_div = { .reg = S5P_CLKDIV_CPU, .shift = 24, .size = 3 }, | 50 | .reg_div = { .reg = S5P_CLKDIV_CPU, .shift = 24, .size = 3 }, |
| 43 | }; | 51 | }; |
| 44 | 52 | ||
| @@ -61,7 +69,7 @@ static struct clksrc_clk clk_mout_mpll = { | |||
| 61 | }; | 69 | }; |
| 62 | 70 | ||
| 63 | static struct clk *clkset_moutcore_list[] = { | 71 | static struct clk *clkset_moutcore_list[] = { |
| 64 | [0] = &clk_mout_apll.clk, | 72 | [0] = &clk_sclk_apll.clk, |
| 65 | [1] = &clk_mout_mpll.clk, | 73 | [1] = &clk_mout_mpll.clk, |
| 66 | }; | 74 | }; |
| 67 | 75 | ||
| @@ -154,7 +162,7 @@ static struct clksrc_clk clk_pclk_dbg = { | |||
| 154 | 162 | ||
| 155 | static struct clk *clkset_corebus_list[] = { | 163 | static struct clk *clkset_corebus_list[] = { |
| 156 | [0] = &clk_mout_mpll.clk, | 164 | [0] = &clk_mout_mpll.clk, |
| 157 | [1] = &clk_mout_apll.clk, | 165 | [1] = &clk_sclk_apll.clk, |
| 158 | }; | 166 | }; |
| 159 | 167 | ||
| 160 | static struct clksrc_sources clkset_mout_corebus = { | 168 | static struct clksrc_sources clkset_mout_corebus = { |
| @@ -220,7 +228,7 @@ static struct clksrc_clk clk_pclk_acp = { | |||
| 220 | 228 | ||
| 221 | static struct clk *clkset_aclk_top_list[] = { | 229 | static struct clk *clkset_aclk_top_list[] = { |
| 222 | [0] = &clk_mout_mpll.clk, | 230 | [0] = &clk_mout_mpll.clk, |
| 223 | [1] = &clk_mout_apll.clk, | 231 | [1] = &clk_sclk_apll.clk, |
| 224 | }; | 232 | }; |
| 225 | 233 | ||
| 226 | static struct clksrc_sources clkset_aclk_200 = { | 234 | static struct clksrc_sources clkset_aclk_200 = { |
| @@ -411,6 +419,7 @@ static struct clksrc_clk clksrcs[] = { | |||
| 411 | /* Clock initialization code */ | 419 | /* Clock initialization code */ |
| 412 | static struct clksrc_clk *sysclks[] = { | 420 | static struct clksrc_clk *sysclks[] = { |
| 413 | &clk_mout_apll, | 421 | &clk_mout_apll, |
| 422 | &clk_sclk_apll, | ||
| 414 | &clk_mout_epll, | 423 | &clk_mout_epll, |
| 415 | &clk_mout_mpll, | 424 | &clk_mout_mpll, |
| 416 | &clk_moutcore, | 425 | &clk_moutcore, |
