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

[linux-2.6-microblaze.git] / drivers / ptp / Kconfig

diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index e085c25..32660dc 100644 (file)
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -8,6 +8,7 @@ menu "PTP clock support"
 config PTP_1588_CLOCK
        tristate "PTP clock support"
        depends on NET && POSIX_TIMERS
+       default ETHERNET
        select PPS
        select NET_PTP_CLASSIFY
        help
@@ -26,6 +27,18 @@ config PTP_1588_CLOCK
          To compile this driver as a module, choose M here: the module
          will be called ptp.
 
+config PTP_1588_CLOCK_OPTIONAL
+       tristate
+       default y if PTP_1588_CLOCK=n
+       default PTP_1588_CLOCK
+       help
+         Drivers that can optionally use the PTP_1588_CLOCK framework
+         should depend on this symbol to prevent them from being built
+         into vmlinux while the PTP support itself is in a loadable
+         module.
+         If PTP support is disabled, this dependency will still be
+         met, and drivers refer to dummy helpers.
+
 config PTP_1588_CLOCK_DTE
        tristate "Broadcom DTE as PTP clock"
        depends on PTP_1588_CLOCK
@@ -92,7 +105,7 @@ config PTP_1588_CLOCK_PCH
        depends on X86_32 || COMPILE_TEST
        depends on HAS_IOMEM && PCI
        depends on NET
-       imply PTP_1588_CLOCK
+       depends on PTP_1588_CLOCK
        help
          This driver adds support for using the PCH EG20T as a PTP
          clock. The hardware supports time stamping of PTP packets
@@ -158,6 +171,15 @@ config PTP_1588_CLOCK_OCP
        tristate "OpenCompute TimeCard as PTP clock"
        depends on PTP_1588_CLOCK
        depends on HAS_IOMEM && PCI
+       depends on SPI && I2C && MTD
+       depends on !S390
+       imply SPI_MEM
+       imply SPI_XILINX
+       imply MTD_SPI_NOR
+       imply I2C_XILINX
+       select SERIAL_8250
+       select NET_DEVLINK
+
        default n
        help
          This driver adds support for an OpenCompute time card.