ptp: Make PTP_1588_CLOCK select rather than depend on PPS

PTP hardware clock drivers that select PTP_1588_CLOCK must currently
also select PPS.  For those drivers that don't, the user must enable
PPS, then enable PTP_1588_CLOCK, then the driver.  Simplify things for
developers and users by putting this selection in one place.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 9e49217ee5590655956c32b26311c8c93016ab43..d5b359df6e7c3e7c5b5bc4cce9a5bd06e6fe0981 100644 (file)
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -124,7 +124,6 @@ config IGB_PTP
        bool "PTP Hardware Clock (PHC)"
        default n
        depends on IGB
-       select PPS
        select PTP_1588_CLOCK
        ---help---
          Say Y here if you want to use PTP Hardware Clock (PHC) in the
@@ -226,7 +225,6 @@ config IXGBE_PTP
        bool "PTP Clock Support"
        default n
        depends on IXGBE
-       select PPS
        select PTP_1588_CLOCK
        ---help---
          Say Y here if you want support for 1588 Timestamping with a

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
index 9867bc6e43f62d88d3147c73803ccfa50190f7ab..d0e36f2b6fba87391f537877b9c5da0df8822f31 100644 (file)
--- a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
@@ -26,7 +26,6 @@ if PCH_GBE
 config PCH_PTP
        bool "PCH PTP clock support"
        default n
-       select PPS
        select PTP_1588_CLOCK
        select PTP_1588_CLOCK_PCH
        ---help---

diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index a6e4b7c4a70407f87536f9b64c21dd9b81e83548..131ef03fd11a164b417c2387777fd617c5fd2b7f 100644 (file)
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -4,12 +4,9 @@
 
 menu "PTP clock support"
 
-comment "Enable Device Drivers -> PPS to see the PTP clock options."
-       depends on PPS=n
-
 config PTP_1588_CLOCK
        tristate "PTP clock support"
-       depends on PPS
+       select PPS
        help
          The IEEE 1588 standard defines a method to precisely
          synchronize distributed clocks over Ethernet networks. The