aboutsummaryrefslogtreecommitdiff
path: root/drivers/ptp/ptp_qoriq.c
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2018-08-06 12:39:11 +0800
committerDavid S. Miller <davem@davemloft.net>2018-08-06 10:43:35 -0700
commit74c05a33cb02e75888771bc39e22e438195d6427 (patch)
tree672c1602803578955d58003e8568e36eb5a095e1 /drivers/ptp/ptp_qoriq.c
parent9dae34978d83df06fc59aff5cf0d88ce41b80643 (diff)
downloadlinux-74c05a33cb02e75888771bc39e22e438195d6427.tar.gz
ptp_qoriq: use div_u64/div_u64_rem for 64-bit division
This is a fix-up patch for below build issue with multi_v7_defconfig. drivers/ptp/ptp_qoriq.o: In function `qoriq_ptp_probe': ptp_qoriq.c:(.text+0xd0c): undefined reference to `__aeabi_uldivmod' Fixes: 91305f281262 ("ptp_qoriq: support automatic configuration for ptp timer") Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ptp/ptp_qoriq.c')
-rw-r--r--drivers/ptp/ptp_qoriq.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ptp/ptp_qoriq.c b/drivers/ptp/ptp_qoriq.c
index 095c18532dc7..fdd49c26bbcc 100644
--- a/drivers/ptp/ptp_qoriq.c
+++ b/drivers/ptp/ptp_qoriq.c
@@ -373,6 +373,7 @@ static int qoriq_ptp_auto_config(struct qoriq_ptp *qoriq_ptp,
u64 freq_comp;
u64 max_adj;
u32 nominal_freq;
+ u32 remainder = 0;
u32 clk_src = 0;
qoriq_ptp->cksel = DEFAULT_CKSEL;
@@ -400,7 +401,8 @@ static int qoriq_ptp_auto_config(struct qoriq_ptp *qoriq_ptp,
* freq_ratio = reference_clock_freq / nominal_freq
*/
freq_comp = ((u64)1 << 32) * nominal_freq;
- if (do_div(freq_comp, clk_src))
+ freq_comp = div_u64_rem(freq_comp, clk_src, &remainder);
+ if (remainder)
freq_comp++;
qoriq_ptp->tmr_add = freq_comp;
@@ -411,7 +413,7 @@ static int qoriq_ptp_auto_config(struct qoriq_ptp *qoriq_ptp,
* freq_ratio = reference_clock_freq / nominal_freq
*/
max_adj = 1000000000ULL * (clk_src - nominal_freq);
- max_adj = max_adj / nominal_freq - 1;
+ max_adj = div_u64(max_adj, nominal_freq) - 1;
qoriq_ptp->caps.max_adj = max_adj;
return 0;