summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-14 11:50:54 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-14 11:50:54 +0100
commite6fe4bd989b93b1f37a25771fc14478dd33aa0df (patch)
tree58943761873a212fa7d7547e5220b16d67fb5daa /arch/arm
parentb02bfc4dfcef3be8276521e1933573e97a5cf203 (diff)
parenta6bbee66197759f790de83181924bf1d2cf482b2 (diff)
downloadu-boot-imx-e6fe4bd989b93b1f37a25771fc14478dd33aa0df.zip
u-boot-imx-e6fe4bd989b93b1f37a25771fc14478dd33aa0df.tar.gz
u-boot-imx-e6fe4bd989b93b1f37a25771fc14478dd33aa0df.tar.bz2
Merge 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/armv7/mx6/clock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
index fcc4f35..f12bba2 100644
--- a/arch/arm/cpu/armv7/mx6/clock.c
+++ b/arch/arm/cpu/armv7/mx6/clock.c
@@ -5,6 +5,7 @@
*/
#include <common.h>
+#include <div64.h>
#include <asm/io.h>
#include <asm/errno.h>
#include <asm/arch/imx-regs.h>
@@ -123,7 +124,7 @@ static u32 mxc_get_pll_pfd(enum pll_clocks pll, int pfd_num)
return 0;
}
- return (freq * 18) / ((div & ANATOP_PFD_FRAC_MASK(pfd_num)) >>
+ return lldiv(freq * 18, (div & ANATOP_PFD_FRAC_MASK(pfd_num)) >>
ANATOP_PFD_FRAC_SHIFT(pfd_num));
}