Skip to content

Commit

Permalink
[ARM] 4986/1: S3C24XX: Simtec machines need UCLK as parent to DCLK
Browse files Browse the repository at this point in the history
All current Simtec designs source the DCLK outputs from
the UPLL. This means the DCLK's parent must be set to UPLL
so that anything enabling and disabling an UPLL sourced
clock does not shutdown the DCLK due to missing open counts.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Ben Dooks authored and Russell King committed Apr 17, 2008
1 parent 1017be8 commit d96a980
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-s3c2410/mach-bast.c
Original file line number Diff line number Diff line change
Expand Up @@ -592,10 +592,10 @@ static void __init bast_map_io(void)
{
/* initialise the clocks */

s3c24xx_dclk0.parent = NULL;
s3c24xx_dclk0.parent = &clk_upll;
s3c24xx_dclk0.rate = 12*1000*1000;

s3c24xx_dclk1.parent = NULL;
s3c24xx_dclk1.parent = &clk_upll;
s3c24xx_dclk1.rate = 24*1000*1000;

s3c24xx_clkout0.parent = &s3c24xx_dclk0;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-s3c2410/mach-vr1000.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ static void __init vr1000_map_io(void)
{
/* initialise clock sources */

s3c24xx_dclk0.parent = NULL;
s3c24xx_dclk0.parent = &clk_upll;
s3c24xx_dclk0.rate = 12*1000*1000;

s3c24xx_dclk1.parent = NULL;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-s3c2440/mach-anubis.c
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,10 @@ static void __init anubis_map_io(void)
{
/* initialise the clocks */

s3c24xx_dclk0.parent = NULL;
s3c24xx_dclk0.parent = &clk_upll;
s3c24xx_dclk0.rate = 12*1000*1000;

s3c24xx_dclk1.parent = NULL;
s3c24xx_dclk1.parent = &clk_upll;
s3c24xx_dclk1.rate = 24*1000*1000;

s3c24xx_clkout0.parent = &s3c24xx_dclk0;
Expand Down
5 changes: 3 additions & 2 deletions arch/arm/mach-s3c2440/mach-osiris.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <linux/device.h>
#include <linux/sysdev.h>
#include <linux/serial_core.h>
#include <linux/clk.h>

#include <asm/mach/arch.h>
#include <asm/mach/map.h>
Expand Down Expand Up @@ -344,10 +345,10 @@ static void __init osiris_map_io(void)

/* initialise the clocks */

s3c24xx_dclk0.parent = NULL;
s3c24xx_dclk0.parent = &clk_upll;
s3c24xx_dclk0.rate = 12*1000*1000;

s3c24xx_dclk1.parent = NULL;
s3c24xx_dclk1.parent = &clk_upll;
s3c24xx_dclk1.rate = 24*1000*1000;

s3c24xx_clkout0.parent = &s3c24xx_dclk0;
Expand Down

0 comments on commit d96a980

Please sign in to comment.