|
@@ -6217,7 +6217,7 @@ static int tg3_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-static int tg3_ptp_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
|
|
|
|
|
|
|
+static int tg3_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
|
|
|
{
|
|
{
|
|
|
u64 ns;
|
|
u64 ns;
|
|
|
u32 remainder;
|
|
u32 remainder;
|
|
@@ -6235,12 +6235,12 @@ static int tg3_ptp_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static int tg3_ptp_settime(struct ptp_clock_info *ptp,
|
|
static int tg3_ptp_settime(struct ptp_clock_info *ptp,
|
|
|
- const struct timespec *ts)
|
|
|
|
|
|
|
+ const struct timespec64 *ts)
|
|
|
{
|
|
{
|
|
|
u64 ns;
|
|
u64 ns;
|
|
|
struct tg3 *tp = container_of(ptp, struct tg3, ptp_info);
|
|
struct tg3 *tp = container_of(ptp, struct tg3, ptp_info);
|
|
|
|
|
|
|
|
- ns = timespec_to_ns(ts);
|
|
|
|
|
|
|
+ ns = timespec64_to_ns(ts);
|
|
|
|
|
|
|
|
tg3_full_lock(tp, 0);
|
|
tg3_full_lock(tp, 0);
|
|
|
tg3_refclk_write(tp, ns);
|
|
tg3_refclk_write(tp, ns);
|
|
@@ -6320,8 +6320,8 @@ static const struct ptp_clock_info tg3_ptp_caps = {
|
|
|
.pps = 0,
|
|
.pps = 0,
|
|
|
.adjfreq = tg3_ptp_adjfreq,
|
|
.adjfreq = tg3_ptp_adjfreq,
|
|
|
.adjtime = tg3_ptp_adjtime,
|
|
.adjtime = tg3_ptp_adjtime,
|
|
|
- .gettime = tg3_ptp_gettime,
|
|
|
|
|
- .settime = tg3_ptp_settime,
|
|
|
|
|
|
|
+ .gettime64 = tg3_ptp_gettime,
|
|
|
|
|
+ .settime64 = tg3_ptp_settime,
|
|
|
.enable = tg3_ptp_enable,
|
|
.enable = tg3_ptp_enable,
|
|
|
};
|
|
};
|
|
|
|
|
|