diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-01-23 13:21:39 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-23 13:23:38 -0800 |
| commit | 692347a93178a3635da13f41e29d40e3ee1b1808 (patch) | |
| tree | 7f3e5aa1401365fc9e8620d4a63c2b92d9fd6927 | |
| parent | e7b76db3624013c1e81c443ddd5b8e026ad236ef (diff) | |
| parent | 04cbb740ce1bbaca1c2681cf2de4d10fffded87f (diff) | |
| download | linux-692347a93178a3635da13f41e29d40e3ee1b1808.tar.gz linux-692347a93178a3635da13f41e29d40e3ee1b1808.tar.bz2 linux-692347a93178a3635da13f41e29d40e3ee1b1808.zip | |
Merge branch 'remove-unneeded-phy-time-stamping-option'
Richard Cochran says:
====================
Remove unneeded PHY time stamping option.
The NETWORK_PHY_TIMESTAMPING configuration option adds additional
checks into the networking hot path, and it is only needed by two
rather esoteric devices, namely the TI DP83640 PHYTER and the ZHAW
InES 1588 IP core. Very few end users have these devices, and those
that do have them are building specialized embedded systems.
Unfortunately two unrelated drivers depend on this option, and two
defconfigs enable it. It is probably my fault for not paying enough
attention in reviews.
This series corrects the gratuitous use of NETWORK_PHY_TIMESTAMPING.
====================
Link: https://lore.kernel.org/r/cover.1611198584.git.richardcochran@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/marvell/Kconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/Kconfig b/drivers/net/dsa/mv88e6xxx/Kconfig index 51185e4d7d15..b17540926c11 100644 --- a/drivers/net/dsa/mv88e6xxx/Kconfig +++ b/drivers/net/dsa/mv88e6xxx/Kconfig @@ -25,7 +25,6 @@ config NET_DSA_MV88E6XXX_PTP default n depends on NET_DSA_MV88E6XXX_GLOBAL2 depends on PTP_1588_CLOCK - imply NETWORK_PHY_TIMESTAMPING help Say Y to enable PTP hardware timestamping on Marvell 88E6xxx switch chips that support it. diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig index 41815b609569..7fe15a3286f4 100644 --- a/drivers/net/ethernet/marvell/Kconfig +++ b/drivers/net/ethernet/marvell/Kconfig @@ -94,7 +94,6 @@ config MVPP2 config MVPP2_PTP bool "Marvell Armada 8K Enable PTP support" - depends on NETWORK_PHY_TIMESTAMPING depends on (PTP_1588_CLOCK = y && MVPP2 = y) || \ (PTP_1588_CLOCK && MVPP2 = m) |