[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1332468760-2525-1-git-send-email-tshimizu818@gmail.com>
Date: Fri, 23 Mar 2012 11:12:39 +0900
From: Takahiro Shimizu <tshimizu818@...il.com>
To: jeffrey.t.kirsher@...el.com, davem@...emloft.net,
lucas.demarchi@...fusion.mobi, mirq-linux@...e.qmqm.pl,
paul.gortmaker@...driver.com, jdmason@...zu.us,
john.stultz@...aro.org, richardcochran@...il.com, arnd@...db.de,
khc@...waw.pl, netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: qi.wang@...el.com, yong.y.wang@...el.com, joel.clark@...el.com,
kok.howg.ewe@...el.com, Takahiro Shimizu <tshimizu818@...il.com>
Subject: [PATCH 1/2] ptp/ptp_pch: Modified according to the mainter's comments
Signed-off-by: Takahiro Shimizu <tshimizu818@...il.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists