From patchwork Sat Apr 21 04:50:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 154199 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5598DB6FC8 for ; Sat, 21 Apr 2012 14:51:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752847Ab2DUEvI (ORCPT ); Sat, 21 Apr 2012 00:51:08 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:57150 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752273Ab2DUEvF (ORCPT ); Sat, 21 Apr 2012 00:51:05 -0400 Received: by wejx9 with SMTP id x9so6444663wej.19 for ; Fri, 20 Apr 2012 21:51:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=gM0WTRojfGnmCdThdZ2LmYTrHPEAC8JMDobr9BtUQyE=; b=zRjOB/36L634WTGVRyxziuZ9AZNhZeFbjoDTQnOFaTsa7JGIpLPBI5fKKdadKqlTFB ZzugOFmjvNa1y8HeMUTXeKy1u/ENADPpaY2Rh9xyusiOolydYyHrMCFHAblImfcUd3f5 t/zEAFXKvSKx63YBog57Ryh4pQPqXD3QdCu+p5JcZ9blIVXEq0xRYkxrqY28c3YCLh2D cvsP2yV84Qjv28BD9dTcWAVPPTNFggOSOI5Ce9wrk8izFMPddvuWwr8LhJWiPtpJgQQf DF5Uv3uIFYIheja9gWOJL9s9XSF8d6yU0WP6B80n6pIgIHVIgfGcRIQ5diQkdZai69A4 poHw== Received: by 10.216.137.149 with SMTP id y21mr5375319wei.110.1334983864374; Fri, 20 Apr 2012 21:51:04 -0700 (PDT) Received: from localhost.localdomain (089144206131.atnat0015.highway.a1.net. [89.144.206.131]) by mx.google.com with ESMTPS id k6sm2512285wiy.7.2012.04.20.21.51.02 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Apr 2012 21:51:03 -0700 (PDT) From: Richard Cochran To: Cc: David Miller , Takahiro Shimizu Subject: [PATCH net-next 6/9] pch_gbe: do not set the channel control register Date: Sat, 21 Apr 2012 06:50:33 +0200 Message-Id: <32548d7c716e8fa85ac5e50427208ec72b3c96c6.1334983471.git.richardcochran@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Takahiro Shimizu 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 --- 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 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);