diff options
Diffstat (limited to 'drivers/net/gianfar_ptp.c')
-rw-r--r-- | drivers/net/gianfar_ptp.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/gianfar_ptp.c b/drivers/net/gianfar_ptp.c index 1c97861596f0..f67b8aebc89c 100644 --- a/drivers/net/gianfar_ptp.c +++ b/drivers/net/gianfar_ptp.c | |||
@@ -193,14 +193,9 @@ static void set_alarm(struct etsects *etsects) | |||
193 | /* Caller must hold etsects->lock. */ | 193 | /* Caller must hold etsects->lock. */ |
194 | static void set_fipers(struct etsects *etsects) | 194 | static void set_fipers(struct etsects *etsects) |
195 | { | 195 | { |
196 | u32 tmr_ctrl = gfar_read(&etsects->regs->tmr_ctrl); | 196 | set_alarm(etsects); |
197 | |||
198 | gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl & (~TE)); | ||
199 | gfar_write(&etsects->regs->tmr_prsc, etsects->tmr_prsc); | ||
200 | gfar_write(&etsects->regs->tmr_fiper1, etsects->tmr_fiper1); | 197 | gfar_write(&etsects->regs->tmr_fiper1, etsects->tmr_fiper1); |
201 | gfar_write(&etsects->regs->tmr_fiper2, etsects->tmr_fiper2); | 198 | gfar_write(&etsects->regs->tmr_fiper2, etsects->tmr_fiper2); |
202 | set_alarm(etsects); | ||
203 | gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl|TE); | ||
204 | } | 199 | } |
205 | 200 | ||
206 | /* | 201 | /* |
@@ -511,7 +506,7 @@ static int gianfar_ptp_probe(struct platform_device *dev) | |||
511 | gfar_write(&etsects->regs->tmr_fiper1, etsects->tmr_fiper1); | 506 | gfar_write(&etsects->regs->tmr_fiper1, etsects->tmr_fiper1); |
512 | gfar_write(&etsects->regs->tmr_fiper2, etsects->tmr_fiper2); | 507 | gfar_write(&etsects->regs->tmr_fiper2, etsects->tmr_fiper2); |
513 | set_alarm(etsects); | 508 | set_alarm(etsects); |
514 | gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl|FS|RTPE|TE); | 509 | gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl|FS|RTPE|TE|FRD); |
515 | 510 | ||
516 | spin_unlock_irqrestore(&etsects->lock, flags); | 511 | spin_unlock_irqrestore(&etsects->lock, flags); |
517 | 512 | ||