diff options
-rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-vr1000.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-anubis.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 5 |
4 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index b45fb65889d2..518727d0dfcc 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
@@ -592,10 +592,10 @@ static void __init bast_map_io(void) | |||
592 | { | 592 | { |
593 | /* initialise the clocks */ | 593 | /* initialise the clocks */ |
594 | 594 | ||
595 | s3c24xx_dclk0.parent = NULL; | 595 | s3c24xx_dclk0.parent = &clk_upll; |
596 | s3c24xx_dclk0.rate = 12*1000*1000; | 596 | s3c24xx_dclk0.rate = 12*1000*1000; |
597 | 597 | ||
598 | s3c24xx_dclk1.parent = NULL; | 598 | s3c24xx_dclk1.parent = &clk_upll; |
599 | s3c24xx_dclk1.rate = 24*1000*1000; | 599 | s3c24xx_dclk1.rate = 24*1000*1000; |
600 | 600 | ||
601 | s3c24xx_clkout0.parent = &s3c24xx_dclk0; | 601 | s3c24xx_clkout0.parent = &s3c24xx_dclk0; |
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index 3aade7b78fe5..c56423373ff3 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c | |||
@@ -393,7 +393,7 @@ static void __init vr1000_map_io(void) | |||
393 | { | 393 | { |
394 | /* initialise clock sources */ | 394 | /* initialise clock sources */ |
395 | 395 | ||
396 | s3c24xx_dclk0.parent = NULL; | 396 | s3c24xx_dclk0.parent = &clk_upll; |
397 | s3c24xx_dclk0.rate = 12*1000*1000; | 397 | s3c24xx_dclk0.rate = 12*1000*1000; |
398 | 398 | ||
399 | s3c24xx_dclk1.parent = NULL; | 399 | s3c24xx_dclk1.parent = NULL; |
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index 3d3dfa95db8e..47258915a2f9 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
@@ -413,10 +413,10 @@ static void __init anubis_map_io(void) | |||
413 | { | 413 | { |
414 | /* initialise the clocks */ | 414 | /* initialise the clocks */ |
415 | 415 | ||
416 | s3c24xx_dclk0.parent = NULL; | 416 | s3c24xx_dclk0.parent = &clk_upll; |
417 | s3c24xx_dclk0.rate = 12*1000*1000; | 417 | s3c24xx_dclk0.rate = 12*1000*1000; |
418 | 418 | ||
419 | s3c24xx_dclk1.parent = NULL; | 419 | s3c24xx_dclk1.parent = &clk_upll; |
420 | s3c24xx_dclk1.rate = 24*1000*1000; | 420 | s3c24xx_dclk1.rate = 24*1000*1000; |
421 | 421 | ||
422 | s3c24xx_clkout0.parent = &s3c24xx_dclk0; | 422 | s3c24xx_clkout0.parent = &s3c24xx_dclk0; |
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index 78af7664988b..8a8acdbd072d 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/device.h> | 18 | #include <linux/device.h> |
19 | #include <linux/sysdev.h> | 19 | #include <linux/sysdev.h> |
20 | #include <linux/serial_core.h> | 20 | #include <linux/serial_core.h> |
21 | #include <linux/clk.h> | ||
21 | 22 | ||
22 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
23 | #include <asm/mach/map.h> | 24 | #include <asm/mach/map.h> |
@@ -344,10 +345,10 @@ static void __init osiris_map_io(void) | |||
344 | 345 | ||
345 | /* initialise the clocks */ | 346 | /* initialise the clocks */ |
346 | 347 | ||
347 | s3c24xx_dclk0.parent = NULL; | 348 | s3c24xx_dclk0.parent = &clk_upll; |
348 | s3c24xx_dclk0.rate = 12*1000*1000; | 349 | s3c24xx_dclk0.rate = 12*1000*1000; |
349 | 350 | ||
350 | s3c24xx_dclk1.parent = NULL; | 351 | s3c24xx_dclk1.parent = &clk_upll; |
351 | s3c24xx_dclk1.rate = 24*1000*1000; | 352 | s3c24xx_dclk1.rate = 24*1000*1000; |
352 | 353 | ||
353 | s3c24xx_clkout0.parent = &s3c24xx_dclk0; | 354 | s3c24xx_clkout0.parent = &s3c24xx_dclk0; |