diff options
Diffstat (limited to 'arch/arm/mach-kirkwood/common.c')
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 77d4852e19f2..a02cae881f2f 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
@@ -279,7 +279,7 @@ void __init kirkwood_crypto_init(void) | |||
279 | /***************************************************************************** | 279 | /***************************************************************************** |
280 | * XOR0 | 280 | * XOR0 |
281 | ****************************************************************************/ | 281 | ****************************************************************************/ |
282 | static void __init kirkwood_xor0_init(void) | 282 | void __init kirkwood_xor0_init(void) |
283 | { | 283 | { |
284 | kirkwood_clk_ctrl |= CGC_XOR0; | 284 | kirkwood_clk_ctrl |= CGC_XOR0; |
285 | 285 | ||
@@ -291,7 +291,7 @@ static void __init kirkwood_xor0_init(void) | |||
291 | /***************************************************************************** | 291 | /***************************************************************************** |
292 | * XOR1 | 292 | * XOR1 |
293 | ****************************************************************************/ | 293 | ****************************************************************************/ |
294 | static void __init kirkwood_xor1_init(void) | 294 | void __init kirkwood_xor1_init(void) |
295 | { | 295 | { |
296 | kirkwood_clk_ctrl |= CGC_XOR1; | 296 | kirkwood_clk_ctrl |= CGC_XOR1; |
297 | 297 | ||
@@ -303,7 +303,7 @@ static void __init kirkwood_xor1_init(void) | |||
303 | /***************************************************************************** | 303 | /***************************************************************************** |
304 | * Watchdog | 304 | * Watchdog |
305 | ****************************************************************************/ | 305 | ****************************************************************************/ |
306 | static void __init kirkwood_wdt_init(void) | 306 | void __init kirkwood_wdt_init(void) |
307 | { | 307 | { |
308 | orion_wdt_init(kirkwood_tclk); | 308 | orion_wdt_init(kirkwood_tclk); |
309 | } | 309 | } |
@@ -392,7 +392,7 @@ void __init kirkwood_audio_init(void) | |||
392 | /* | 392 | /* |
393 | * Identify device ID and revision. | 393 | * Identify device ID and revision. |
394 | */ | 394 | */ |
395 | static char * __init kirkwood_id(void) | 395 | char * __init kirkwood_id(void) |
396 | { | 396 | { |
397 | u32 dev, rev; | 397 | u32 dev, rev; |
398 | 398 | ||
@@ -435,7 +435,7 @@ static char * __init kirkwood_id(void) | |||
435 | } | 435 | } |
436 | } | 436 | } |
437 | 437 | ||
438 | static void __init kirkwood_l2_init(void) | 438 | void __init kirkwood_l2_init(void) |
439 | { | 439 | { |
440 | #ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH | 440 | #ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH |
441 | writel(readl(L2_CONFIG_REG) | L2_WRITETHROUGH, L2_CONFIG_REG); | 441 | writel(readl(L2_CONFIG_REG) | L2_WRITETHROUGH, L2_CONFIG_REG); |
@@ -450,7 +450,6 @@ void __init kirkwood_init(void) | |||
450 | { | 450 | { |
451 | printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n", | 451 | printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n", |
452 | kirkwood_id(), kirkwood_tclk); | 452 | kirkwood_id(), kirkwood_tclk); |
453 | kirkwood_i2s_data.tclk = kirkwood_tclk; | ||
454 | 453 | ||
455 | /* | 454 | /* |
456 | * Disable propagation of mbus errors to the CPU local bus, | 455 | * Disable propagation of mbus errors to the CPU local bus, |