Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d96a9804 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 4986/1: S3C24XX: Simtec machines need UCLK as parent to DCLK 



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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1017be88

arch/arm/mach-s3c2410/mach-bast.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-s3c2410/mach-vr1000.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-s3c2440/mach-anubis.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-s3c2440/mach-osiris.c

+3 −2
Original line number Diff line number Diff line
@@ -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>
@@ -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;