diff options
author | Takahiro Shimizu <tshimizu818@gmail.com> | 2012-04-20 18:50:33 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-21 15:27:45 -0400 |
commit | a6891ac70c99be5312c9aea9e38169e4cbb4f099 (patch) | |
tree | a2fb0554be15f0570d428c86ff15df30361d6dea /drivers/ptp/ptp_pch.c | |
parent | 93c8acb599b72ca7da42e36d7971a28dce273665 (diff) | |
download | linux-a6891ac70c99be5312c9aea9e38169e4cbb4f099.tar.gz linux-a6891ac70c99be5312c9aea9e38169e4cbb4f099.tar.bz2 linux-a6891ac70c99be5312c9aea9e38169e4cbb4f099.zip |
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 <tshimizu818@gmail.com>
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ptp/ptp_pch.c')
-rw-r--r-- | drivers/ptp/ptp_pch.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c index 9e397fe5ed12..08c331130d88 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); |