From: Takahiro Shimizu <tshimizu818@gmail.com>
To: jeffrey.t.kirsher@intel.com, davem@davemloft.net,
lucas.demarchi@profusion.mobi, mirq-linux@rere.qmqm.pl,
paul.gortmaker@windriver.com, jdmason@kudzu.us,
john.stultz@linaro.org, richardcochran@gmail.com, arnd@arndb.de,
khc@pm.waw.pl, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: qi.wang@intel.com, yong.y.wang@intel.com, joel.clark@intel.com,
kok.howg.ewe@intel.com, Takahiro Shimizu <tshimizu818@gmail.com>
Subject: [PATCH 1/2] ptp/ptp_pch: Modified according to the mainter's comments
Date: Fri, 23 Mar 2012 11:12:39 +0900 [thread overview]
Message-ID: <1332468760-2525-1-git-send-email-tshimizu818@gmail.com> (raw)
Signed-off-by: Takahiro Shimizu <tshimizu818@gmail.com>
---
drivers/ptp/ptp_pch.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c
index 375eb04..212381e 100644
--- a/drivers/ptp/ptp_pch.c
+++ b/drivers/ptp/ptp_pch.c
@@ -261,6 +261,7 @@ u64 pch_rx_snap_read(struct pci_dev *pdev)
ns = ((u64) hi) << 32;
ns |= lo;
+ ns <<= TICKS_NS_SHIFT;
return ns;
}
@@ -277,6 +278,7 @@ u64 pch_tx_snap_read(struct pci_dev *pdev)
ns = ((u64) hi) << 32;
ns |= lo;
+ ns <<= TICKS_NS_SHIFT;
return ns;
}
@@ -649,8 +651,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);
--
1.7.4.4
next reply other threads:[~2012-03-23 2:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-23 2:12 Takahiro Shimizu [this message]
2012-03-23 2:12 ` [PATCH 2/2] net/pch_gbe: Modified according to the mainter's comments Takahiro Shimizu
2012-03-23 2:35 ` [PATCH 1/2] ptp/ptp_pch: " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332468760-2525-1-git-send-email-tshimizu818@gmail.com \
--to=tshimizu818@gmail.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=jdmason@kudzu.us \
--cc=jeffrey.t.kirsher@intel.com \
--cc=joel.clark@intel.com \
--cc=john.stultz@linaro.org \
--cc=khc@pm.waw.pl \
--cc=kok.howg.ewe@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lucas.demarchi@profusion.mobi \
--cc=mirq-linux@rere.qmqm.pl \
--cc=netdev@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=qi.wang@intel.com \
--cc=richardcochran@gmail.com \
--cc=yong.y.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).