aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-09-01 09:04:55 -0500
committerBjorn Helgaas <bhelgaas@google.com>2016-09-01 09:04:55 -0500
commit9e18ad98ca71ca0cfcadf633547409829773f36a (patch)
tree66a761b8f3db00623fc112e32af55d909c628dcf /drivers/pci/probe.c
parentMerge branch 'pci/demodularize' into next (diff)
parentPCI: Add PTM clock granularity information (diff)
downloadlinux-dev-9e18ad98ca71ca0cfcadf633547409829773f36a.tar.xz
linux-dev-9e18ad98ca71ca0cfcadf633547409829773f36a.zip
Merge branch 'pci/ptm' into next
* pci/ptm: PCI: Add PTM clock granularity information PCI: Add pci_enable_ptm() for drivers to enable PTM on endpoints PCI: Add Precision Time Measurement (PTM) support
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r--drivers/pci/probe.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 93f280df3428..e2e424472058 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1667,6 +1667,9 @@ static void pci_init_capabilities(struct pci_dev *dev)
pci_enable_acs(dev);
pci_cleanup_aer_error_status_regs(dev);
+
+ /* Precision Time Measurement */
+ pci_ptm_init(dev);
}
/*