Patchwork [net-next,6/9] pch_gbe: do not set the channel control register

login
register
mail settings
Submitter Richard Cochran
Date April 21, 2012, 4:50 a.m.
Message ID <32548d7c716e8fa85ac5e50427208ec72b3c96c6.1334983471.git.richardcochran@gmail.com>
Download mbox | patch
Permalink /patch/154199/
State Accepted
Delegated to: David Miller
Headers show

Comments

Richard Cochran - April 21, 2012, 4:50 a.m.
From: Takahiro Shimizu <tshimizu818@gmail.com>

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>
---
 drivers/ptp/ptp_pch.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c
index 9e397fe..08c3311 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);