From 339ddea03cc5fe0c9dd6386e1309dd64f812c0a2 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sat, 6 Aug 2011 21:03:03 +0000 Subject: [PATCH] --- yaml --- r: 262774 b: refs/heads/master c: cbc056602c7c63620c86904c431ff6b61e029dcc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar_ptp.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index b9a6df7ade2c..ae769a3e22e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2e2a313ff8fdc25cedef5e63da712a6a0d35dfe +refs/heads/master: cbc056602c7c63620c86904c431ff6b61e029dcc diff --git a/trunk/drivers/net/gianfar_ptp.c b/trunk/drivers/net/gianfar_ptp.c index 1c97861596f0..f67b8aebc89c 100644 --- a/trunk/drivers/net/gianfar_ptp.c +++ b/trunk/drivers/net/gianfar_ptp.c @@ -193,14 +193,9 @@ static void set_alarm(struct etsects *etsects) /* Caller must hold etsects->lock. */ static void set_fipers(struct etsects *etsects) { - u32 tmr_ctrl = gfar_read(&etsects->regs->tmr_ctrl); - - gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl & (~TE)); - gfar_write(&etsects->regs->tmr_prsc, etsects->tmr_prsc); + set_alarm(etsects); gfar_write(&etsects->regs->tmr_fiper1, etsects->tmr_fiper1); gfar_write(&etsects->regs->tmr_fiper2, etsects->tmr_fiper2); - set_alarm(etsects); - gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl|TE); } /* @@ -511,7 +506,7 @@ static int gianfar_ptp_probe(struct platform_device *dev) gfar_write(&etsects->regs->tmr_fiper1, etsects->tmr_fiper1); gfar_write(&etsects->regs->tmr_fiper2, etsects->tmr_fiper2); set_alarm(etsects); - gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl|FS|RTPE|TE); + gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl|FS|RTPE|TE|FRD); spin_unlock_irqrestore(&etsects->lock, flags);