pch_gbe: do not set the channel control register
authorTakahiro Shimizu <tshimizu818@gmail.com>
Fri, 20 Apr 2012 18:50:33 +0000 (18:50 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Apr 2012 19:27:45 +0000 (15:27 -0400)
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 <tshimizu818@gmail.com>
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/ptp/ptp_pch.c

index 9e397fe5ed121e42df2ca812372ac6195342365e..08c331130d88f3b19beba9281aab5ab1e1f882cb 100644 (file)
@@ -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);