diff options
author | Richard Cochran <richardcochran@gmail.com> | 2012-04-03 18:59:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-04 05:28:46 -0400 |
commit | 509a7c25729feab353502e1b544c614772a1d49a (patch) | |
tree | 44e08849d8c9cd6cff083c5d3b1720588d4e8944 /drivers/ptp | |
parent | a85bbddd080ab49e461870411f6bb93f3d94ec11 (diff) |
ixp4xx_eth: Support the get_ts_info ethtool method.
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ptp')
-rw-r--r-- | drivers/ptp/ptp_ixp46x.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c index 6f2782bb5f41..9d13a71c5367 100644 --- a/drivers/ptp/ptp_ixp46x.c +++ b/drivers/ptp/ptp_ixp46x.c | |||
@@ -284,6 +284,7 @@ static void __exit ptp_ixp_exit(void) | |||
284 | { | 284 | { |
285 | free_irq(MASTER_IRQ, &ixp_clock); | 285 | free_irq(MASTER_IRQ, &ixp_clock); |
286 | free_irq(SLAVE_IRQ, &ixp_clock); | 286 | free_irq(SLAVE_IRQ, &ixp_clock); |
287 | ixp46x_phc_clock = -1; | ||
287 | ptp_clock_unregister(ixp_clock.ptp_clock); | 288 | ptp_clock_unregister(ixp_clock.ptp_clock); |
288 | } | 289 | } |
289 | 290 | ||
@@ -302,6 +303,8 @@ static int __init ptp_ixp_init(void) | |||
302 | if (IS_ERR(ixp_clock.ptp_clock)) | 303 | if (IS_ERR(ixp_clock.ptp_clock)) |
303 | return PTR_ERR(ixp_clock.ptp_clock); | 304 | return PTR_ERR(ixp_clock.ptp_clock); |
304 | 305 | ||
306 | ixp46x_phc_clock = ptp_clock_index(ixp_clock.ptp_clock); | ||
307 | |||
305 | __raw_writel(DEFAULT_ADDEND, &ixp_clock.regs->addend); | 308 | __raw_writel(DEFAULT_ADDEND, &ixp_clock.regs->addend); |
306 | __raw_writel(1, &ixp_clock.regs->trgt_lo); | 309 | __raw_writel(1, &ixp_clock.regs->trgt_lo); |
307 | __raw_writel(0, &ixp_clock.regs->trgt_hi); | 310 | __raw_writel(0, &ixp_clock.regs->trgt_hi); |