From 8243ae7dfc5ceb3566c375ac26bbfcd29d782ce9 Mon Sep 17 00:00:00 2001
From: Pavel Pisa <ppisa@pikron.com>
Date: Wed, 6 Dec 2006 17:08:27 +0100
Subject: [PATCH] --- yaml --- r: 43399 b: refs/heads/master c:
 5c894cd1c89fc10907febd93e6ef35cd3c65e25e h: refs/heads/master i:   43397:
 b793b520a9c191bdd9a24362cfa7a627ae4985ca   43395:
 da59b344277b1af5d0e7decd20c5180a7dc69683   43391:
 c5b2420ca7d1efe65d9674b9a81af94b1d244218 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-imx/generic.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b301abfa5fd4..e28f960cb1f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9073341c2ba5d5e77b3d05d84cf9e3a16e8a7902
+refs/heads/master: 5c894cd1c89fc10907febd93e6ef35cd3c65e25e
diff --git a/trunk/arch/arm/mach-imx/generic.c b/trunk/arch/arm/mach-imx/generic.c
index 12ea58a3b84f..b5aa49d00ca3 100644
--- a/trunk/arch/arm/mach-imx/generic.c
+++ b/trunk/arch/arm/mach-imx/generic.c
@@ -104,6 +104,9 @@ EXPORT_SYMBOL(imx_gpio_mode);
  */
 static unsigned int imx_decode_pll(unsigned int pll)
 {
+	unsigned long long ll;
+	unsigned long quot;
+
 	u32 mfi = (pll >> 10) & 0xf;
 	u32 mfn = pll & 0x3ff;
 	u32 mfd = (pll >> 16) & 0x3ff;
@@ -112,7 +115,11 @@ static unsigned int imx_decode_pll(unsigned int pll)
 
 	mfi = mfi <= 5 ? 5 : mfi;
 
-	return (2 * (f_ref>>10) * ( (mfi<<10) + (mfn<<10) / (mfd+1) )) / (pd+1);
+	ll = 2 * (unsigned long long)f_ref * ( (mfi<<16) + (mfn<<16) / (mfd+1) );
+	quot = (pd+1) * (1<<16);
+	ll += quot / 2;
+	do_div(ll, quot);
+	return (unsigned int) ll;
 }
 
 unsigned int imx_get_system_clk(void)