From a6891ac70c99be5312c9aea9e38169e4cbb4f099 Mon Sep 17 00:00:00 2001 From: Takahiro Shimizu Date: Fri, 20 Apr 2012 18:50:33 +0000 Subject: pch_gbe: do not set the channel control register We will let the pch_gbe code do that according to the receive time stamp filter. [ RC - Rebased Takahiro's changes and wrote a commit message explaining the changes. ] Signed-off-by: Takahiro Shimizu Signed-off-by: Richard Cochran Signed-off-by: David S. Miller --- drivers/ptp/ptp_pch.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c index 9e397fe5ed1..08c331130d8 100644 --- a/drivers/ptp/ptp_pch.c +++ b/drivers/ptp/ptp_pch.c @@ -652,8 +652,6 @@ pch_probe(struct pci_dev *pdev, const struct pci_device_id *id) iowrite32(1, &chip->regs->trgt_lo); iowrite32(0, &chip->regs->trgt_hi); iowrite32(PCH_TSE_TTIPEND, &chip->regs->event); - /* Version: IEEE1588 v1 and IEEE1588-2008, Mode: All Evwnt, Locked */ - iowrite32(0x80020000, &chip->regs->ch_control); pch_eth_enable_set(chip); -- cgit v1.2.3-70-g09d2