linux/drivers/ptp, branch v4.5

ptp: ixp46x: use helpers for converting ns to timespec

2016-01-29T20:38:59Z

Convert the driver to use ns_to_timespec64() and timespec64_to_ns() instead of open coding the same logic. Signed-off-by: Kefeng Wang Acked-by: Richard Cochran Signed-off-by: David S. Miller

ptp: remove 32 bit get/set methods.

2015-03-31T16:01:19Z

All of the PHC drivers have been converted to the new methods. This patch converts the three remaining callers within the core code and removes the older methods for good. As a result, the core PHC code is ready for the year 2038. However, some of the PHC drivers are not quite ready yet. Signed-off-by: Richard Cochran Signed-off-by: David S. Miller

ptp: pch: convert to the 64 bit get/set time methods.

2015-03-31T16:01:19Z

The device has a 64 bit clock register, where each clock tick is 32 nanoseconds, and so with this patch the driver is ready for the year 2038. Compile tested only. Signed-off-by: Richard Cochran Signed-off-by: David S. Miller

ptp: ixp46x: convert to the 64 bit get/set time methods.

2015-03-31T16:01:19Z

The device has a 64 bit clock register, where each clock tick is 16 nanoseconds, and so with this patch the driver is ready for the year 2038. Signed-off-by: Richard Cochran Signed-off-by: David S. Miller

ptp: use the 64 bit get/set time methods for the posix clock.

2015-03-31T16:01:16Z

This patch changes the posix clock code to prefer the new methods whenever they are implemented by the PHC drivers. Signed-off-by: Richard Cochran Signed-off-by: David S. Miller

ptp: use the 64 bit gettime method for the SYS_OFFSET ioctl.

2015-03-31T16:01:16Z

This patch changes the code to use the new method whenever implemented by the PHC driver. Signed-off-by: Richard Cochran Signed-off-by: David S. Miller

PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use

2014-08-12T18:15:14Z

We should prefer `struct pci_device_id` over `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines. This issue was reported by checkpatch. A simplified version of the semantic patch that makes this change is as follows (http://coccinelle.lip6.fr/): // @@ identifier i; declarer name DEFINE_PCI_DEVICE_TABLE; initializer z; @@ - DEFINE_PCI_DEVICE_TABLE(i) + const struct pci_device_id i[] = z; // [bhelgaas: add semantic patch] Signed-off-by: Benoit Taine Signed-off-by: Bjorn Helgaas

ptp: Allow reassigning calibration pin function

2014-07-02T01:52:54Z

The ptp pin function programming does not allow calibration pin to change function. This is problematic on hardware that uses the default calibration pin for other purposes. Removing this limitation does not impact calibration if userspace does not reprogram the calibration pin. Signed-off-by: Stefan Sørensen Signed-off-by: David S. Miller

ptp: ptp_pch depends on x86_32

2014-06-17T22:43:48Z

The ptp_pch driver is for a companion chip to the Intel Atom E600 series processors. These are 32-bit x86 processors so the driver is only needed on X86_32. Signed-off-by: Jean Delvare Cc: Richard Cochran Acked-by: Richard Cochran Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-05-12T17:19:14Z

Conflicts: drivers/net/ethernet/altera/altera_sgdma.c net/netlink/af_netlink.c net/sched/cls_api.c net/sched/sch_api.c The netlink conflict dealt with moving to netlink_capable() and netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations in non-init namespaces. These were simple transformations from netlink_capable to netlink_ns_capable. The Altera driver conflict was simply code removal overlapping some void pointer cast cleanups in net-next. Signed-off-by: David S. Miller