From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Wed, 6 Dec 2017 05:16:33 +0000 (+0900)
Subject: ARM: uniphier: compute SSCPLL values more precisely
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f2ce50b2d076ccec56d33df71f77e6f3fd7a33f4;p=project%2Fbcm63xx%2Fu-boot.git

ARM: uniphier: compute SSCPLL values more precisely

Use DIV_ROUND_CLOSEST().  To make the JK value even more precise,
I used a bigger coefficient, then divide it by 512.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/arch/arm/mach-uniphier/clk/pll-base-ld20.c b/arch/arm/mach-uniphier/clk/pll-base-ld20.c
index 45fdf0a322..c9b78b9e88 100644
--- a/arch/arm/mach-uniphier/clk/pll-base-ld20.c
+++ b/arch/arm/mach-uniphier/clk/pll-base-ld20.c
@@ -7,6 +7,7 @@
 
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
@@ -41,13 +42,14 @@ int uniphier_ld20_sscpll_init(unsigned long reg_base, unsigned int freq,
 	if (freq != UNIPHIER_PLL_FREQ_DEFAULT) {
 		tmp = readl(base);	/* SSCPLLCTRL */
 		tmp &= ~SC_PLLCTRL_SSC_DK_MASK;
-		tmp |= (487 * freq * ssc_rate / divn / 512) &
+		tmp |= DIV_ROUND_CLOSEST(487UL * freq * ssc_rate, divn * 512) &
 							SC_PLLCTRL_SSC_DK_MASK;
 		writel(tmp, base);
 
 		tmp = readl(base + 4);
 		tmp &= ~SC_PLLCTRL2_SSC_JK_MASK;
-		tmp |= (41859 * freq / divn) & SC_PLLCTRL2_SSC_JK_MASK;
+		tmp |= DIV_ROUND_CLOSEST(21431887UL * freq, divn * 512) &
+							SC_PLLCTRL2_SSC_JK_MASK;
 		writel(tmp, base + 4);
 
 		udelay(50);