Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ca13de2 authored by Richard Cochran's avatar Richard Cochran Committed by David S. Miller
Browse files

ptp: ixp46x: convert to the 64 bit get/set time methods. 



The device has a 64 bit clock register, where each clock tick is 16
nanoseconds, and so with this patch the driver is ready for the year
2038.

Signed-off-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41c2c18f

drivers/ptp/ptp_ixp46x.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -175,7 +175,7 @@ static int ptp_ixp_adjtime(struct ptp_clock_info *ptp, s64 delta) 
	return 0;

	return 0;

}

}





static int ptp_ixp_gettime(struct ptp_clock_info *ptp, struct timespec *ts)

static int ptp_ixp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)

{

{

	u64 ns;

	u64 ns;

	u32 remainder;

	u32 remainder;
@@ -195,7 +195,7 @@ static int ptp_ixp_gettime(struct ptp_clock_info *ptp, struct timespec *ts) 
}

}





static int ptp_ixp_settime(struct ptp_clock_info *ptp,

static int ptp_ixp_settime(struct ptp_clock_info *ptp,

			   const struct timespec *ts)

			   const struct timespec64 *ts)

{

{

	u64 ns;

	u64 ns;

	unsigned long flags;

	unsigned long flags;
@@ -248,8 +248,8 @@ static struct ptp_clock_info ptp_ixp_caps = { 
	.pps		= 0,

	.pps		= 0,

	.adjfreq	= ptp_ixp_adjfreq,

	.adjfreq	= ptp_ixp_adjfreq,

	.adjtime	= ptp_ixp_adjtime,

	.adjtime	= ptp_ixp_adjtime,

	.gettime	= ptp_ixp_gettime,

	.gettime64	= ptp_ixp_gettime,

	.settime	= ptp_ixp_settime,

	.settime64	= ptp_ixp_settime,

	.enable		= ptp_ixp_enable,

	.enable		= ptp_ixp_enable,

};

};