[PATCH|RESEND 3/4] clock-imx35: correct arm and ahb clock calculation

[mgr@pengutronix.de (Michael Grzeschik)]

On Mon, Aug 16, 2010 at 03:54:06PM +0200, Michael Grzeschik wrote:
> From: Marc Kleine-Budde <mkl@pengutronix.de>
> 
> According to the Datasheet:
> "i.MX35 (MCIMX35) Multimedia Applications Processor Reference Manual,
> Rev. 2" "Figure 14-24. Clock Control And Gating"
> change the result of get_rate_ahb based on the frequency returned
> by get_rate_arm to calculate the proper rate.
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> ---
>  arch/arm/mach-mx3/clock-imx35.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c
> index f54a82c..009156d 100644
> --- a/arch/arm/mach-mx3/clock-imx35.c
> +++ b/arch/arm/mach-mx3/clock-imx35.c
> @@ -155,7 +155,7 @@ static unsigned long get_rate_arm(void)
>  
>  	aad = &clk_consumer[(pdr0 >> 16) & 0xf];
>  	if (aad->sel)
> -		fref = fref * 2 / 3;
> +		fref = fref * 3 / 4;
>  
>  	return fref / aad->arm;
>  }
> @@ -164,7 +164,7 @@ static unsigned long get_rate_ahb(struct clk *clk)
>  {
>  	unsigned long pdr0 = __raw_readl(CCM_BASE + CCM_PDR0);
>  	struct arm_ahb_div *aad;
> -	unsigned long fref = get_rate_mpll();
> +	unsigned long fref = get_rate_arm();
>  
>  	aad = &clk_consumer[(pdr0 >> 16) & 0xf];
>  
> -- 
> 1.7.1

This one is probably not needed anymore and conflicts with
the following patch in this tree [1] in branch imx-for-2.6.36:

a4104f4c3e6e24961e4d29f96c0488a7bce8da8d i.MX35: Fix arm/ahb clock calculation

[1] git://git.pengutronix.de/git/imx/linux-2.6.git

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |