diff options
Diffstat (limited to 'arch/arm/mach-s3c2443/clock.c')
-rw-r--r-- | arch/arm/mach-s3c2443/clock.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index 6fda4bf09cdd..b93cb96f57a5 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c | |||
@@ -76,13 +76,6 @@ static unsigned int armdiv[16] = { | |||
76 | [S3C2443_CLKDIV0_ARMDIV_16 >> S3C2443_CLKDIV0_ARMDIV_SHIFT] = 16, | 76 | [S3C2443_CLKDIV0_ARMDIV_16 >> S3C2443_CLKDIV0_ARMDIV_SHIFT] = 16, |
77 | }; | 77 | }; |
78 | 78 | ||
79 | static inline unsigned int s3c2443_fclk_div(unsigned long clkcon0) | ||
80 | { | ||
81 | clkcon0 &= S3C2443_CLKDIV0_ARMDIV_MASK; | ||
82 | |||
83 | return armdiv[clkcon0 >> S3C2443_CLKDIV0_ARMDIV_SHIFT]; | ||
84 | } | ||
85 | |||
86 | /* hsspi | 79 | /* hsspi |
87 | * | 80 | * |
88 | * high-speed spi clock, sourced from esysclk | 81 | * high-speed spi clock, sourced from esysclk |
@@ -191,7 +184,7 @@ static struct clk *clks[] __initdata = { | |||
191 | 184 | ||
192 | void __init_or_cpufreq s3c2443_setup_clocks(void) | 185 | void __init_or_cpufreq s3c2443_setup_clocks(void) |
193 | { | 186 | { |
194 | s3c2443_common_setup_clocks(s3c2443_get_mpll, s3c2443_fclk_div); | 187 | s3c2443_common_setup_clocks(s3c2443_get_mpll); |
195 | } | 188 | } |
196 | 189 | ||
197 | void __init s3c2443_init_clocks(int xtal) | 190 | void __init s3c2443_init_clocks(int xtal) |
@@ -202,7 +195,7 @@ void __init s3c2443_init_clocks(int xtal) | |||
202 | clk_epll.rate = s3c2443_get_epll(epllcon, xtal); | 195 | clk_epll.rate = s3c2443_get_epll(epllcon, xtal); |
203 | clk_epll.parent = &clk_epllref.clk; | 196 | clk_epll.parent = &clk_epllref.clk; |
204 | 197 | ||
205 | s3c2443_common_init_clocks(xtal, s3c2443_get_mpll, s3c2443_fclk_div, | 198 | s3c2443_common_init_clocks(xtal, s3c2443_get_mpll, |
206 | armdiv, ARRAY_SIZE(armdiv), | 199 | armdiv, ARRAY_SIZE(armdiv), |
207 | S3C2443_CLKDIV0_ARMDIV_MASK); | 200 | S3C2443_CLKDIV0_ARMDIV_MASK); |
208 | 201 | ||