ptp: Enable clock drivers along with associated net/PHY drivers

Where a PTP clock driver is associated with a net or PHY driver, it
should be enabled automatically whenever that driver is enabled.
Therefore:

- Make PTP clock drivers select rather than depending on PTP_1588_CLOCK
- Remove separate boolean options for PTP clock drivers that are built
  as part of net driver modules.  (This also fixes cases where the PTP
  subsystem is wrongly forced to be built-in.)
- Set 'default y' for PTP clock drivers that depend on specific net
  drivers but are built separately

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

1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index 131ef03fd11a..70c5836ebfc9 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -25,8 +25,9 @@ config PTP_1588_CLOCK
 
 config PTP_1588_CLOCK_GIANFAR
         tristate "Freescale eTSEC as PTP clock"
-        depends on PTP_1588_CLOCK
         depends on GIANFAR
+        select PTP_1588_CLOCK
+        default y
         help
           This driver adds support for using the eTSEC as a PTP
           clock. This clock is only useful if your PTP programs are
@@ -38,8 +39,9 @@ config PTP_1588_CLOCK_GIANFAR
 
 config PTP_1588_CLOCK_IXP46X
         tristate "Intel IXP46x as PTP clock"
-        depends on PTP_1588_CLOCK
         depends on IXP4XX_ETH
+        select PTP_1588_CLOCK
+        default y
         help
           This driver adds support for using the IXP46X as a PTP
           clock. This clock is only useful if your PTP programs are
@@ -50,13 +52,13 @@ config PTP_1588_CLOCK_IXP46X
           will be called ptp_ixp46x.
 
 comment "Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks."
-        depends on PTP_1588_CLOCK && (PHYLIB=n || NETWORK_PHY_TIMESTAMPING=n)
+        depends on PHYLIB=n || NETWORK_PHY_TIMESTAMPING=n
 
 config DP83640_PHY
         tristate "Driver for the National Semiconductor DP83640 PHYTER"
-        depends on PTP_1588_CLOCK
         depends on NETWORK_PHY_TIMESTAMPING
         depends on PHYLIB
+        select PTP_1588_CLOCK
         ---help---
           Supports the DP83640 PHYTER with IEEE 1588 features.
 
@@ -70,8 +72,9 @@ config DP83640_PHY
 
 config PTP_1588_CLOCK_PCH
         tristate "Intel PCH EG20T as PTP clock"
-        depends on PTP_1588_CLOCK
         depends on PCH_GBE
+        select PTP_1588_CLOCK
+        default y
         help
           This driver adds support for using the PCH EG20T as a PTP
           clock. The hardware supports time stamping of PTP packets