mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-07 13:43:51 +00:00
30e7255375
PTP hardware timestamping related objects are not linked when PTP
support for MV88E6xxx (NET_DSA_MV88E6XXX_PTP) is disabled, therefore
NET_DSA_MV88E6XXX should not depend on PTP_1588_CLOCK_OPTIONAL
regardless of NET_DSA_MV88E6XXX_PTP.
Instead, condition more strictly on how NET_DSA_MV88E6XXX_PTP's
dependencies are met, making sure that it cannot be enabled when
NET_DSA_MV88E6XXX=y and PTP_1588_CLOCK=m.
In other words, this commit allows NET_DSA_MV88E6XXX to be built-in
while PTP_1588_CLOCK is a module, as long as NET_DSA_MV88E6XXX_PTP is
prevented from being enabled.
Fixes: e5f3155267 ("ethernet: fix PTP_1588_CLOCK dependencies")
Signed-off-by: Johnny S. Lee <foss@jsl.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
20 lines
631 B
Plaintext
20 lines
631 B
Plaintext
# SPDX-License-Identifier: GPL-2.0-only
|
|
config NET_DSA_MV88E6XXX
|
|
tristate "Marvell 88E6xxx Ethernet switch fabric support"
|
|
depends on NET_DSA
|
|
select IRQ_DOMAIN
|
|
select NET_DSA_TAG_EDSA
|
|
select NET_DSA_TAG_DSA
|
|
help
|
|
This driver adds support for most of the Marvell 88E6xxx models of
|
|
Ethernet switch chips, except 88E6060.
|
|
|
|
config NET_DSA_MV88E6XXX_PTP
|
|
bool "PTP support for Marvell 88E6xxx"
|
|
default n
|
|
depends on (NET_DSA_MV88E6XXX = y && PTP_1588_CLOCK = y) || \
|
|
(NET_DSA_MV88E6XXX = m && PTP_1588_CLOCK)
|
|
help
|
|
Say Y to enable PTP hardware timestamping on Marvell 88E6xxx switch
|
|
chips that support it.
|