aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2012-10-31 11:32:44 -0400
committerDavid S. Miller <davem@davemloft.net>2012-11-01 11:35:18 -0400
commit42a7ccef0a06519e2ea0be71d7c0f4ed9198509f (patch)
tree6171e6df724508370d36310a10a40664be22b7f7
parentc56283034ce28f99de494b69896528ae90cd9730 (diff)
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>
-rw-r--r--drivers/net/ethernet/intel/Kconfig2
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/Kconfig1
-rw-r--r--drivers/ptp/Kconfig5
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 9e49217ee559..d5b359df6e7c 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -124,7 +124,6 @@ config IGB_PTP
124 bool "PTP Hardware Clock (PHC)" 124 bool "PTP Hardware Clock (PHC)"
125 default n 125 default n
126 depends on IGB 126 depends on IGB
127 select PPS
128 select PTP_1588_CLOCK 127 select PTP_1588_CLOCK
129 ---help--- 128 ---help---
130 Say Y here if you want to use PTP Hardware Clock (PHC) in the 129 Say Y here if you want to use PTP Hardware Clock (PHC) in the
@@ -226,7 +225,6 @@ config IXGBE_PTP
226 bool "PTP Clock Support" 225 bool "PTP Clock Support"
227 default n 226 default n
228 depends on IXGBE 227 depends on IXGBE
229 select PPS
230 select PTP_1588_CLOCK 228 select PTP_1588_CLOCK
231 ---help--- 229 ---help---
232 Say Y here if you want support for 1588 Timestamping with a 230 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 9867bc6e43f6..d0e36f2b6fba 100644
--- 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
26config PCH_PTP 26config PCH_PTP
27 bool "PCH PTP clock support" 27 bool "PCH PTP clock support"
28 default n 28 default n
29 select PPS
30 select PTP_1588_CLOCK 29 select PTP_1588_CLOCK
31 select PTP_1588_CLOCK_PCH 30 select PTP_1588_CLOCK_PCH
32 ---help--- 31 ---help---
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index a6e4b7c4a704..131ef03fd11a 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -4,12 +4,9 @@
4 4
5menu "PTP clock support" 5menu "PTP clock support"
6 6
7comment "Enable Device Drivers -> PPS to see the PTP clock options."
8 depends on PPS=n
9
10config PTP_1588_CLOCK 7config PTP_1588_CLOCK
11 tristate "PTP clock support" 8 tristate "PTP clock support"
12 depends on PPS 9 select PPS
13 help 10 help
14 The IEEE 1588 standard defines a method to precisely 11 The IEEE 1588 standard defines a method to precisely
15 synchronize distributed clocks over Ethernet networks. The 12 synchronize distributed clocks over Ethernet networks. The