Skip to content

Commit 30e7255

Browse files
johnnysleedavem330
authored andcommitted
net: dsa: mv88e6xxx: depend on PTP conditionally
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: e5f3155 ("ethernet: fix PTP_1588_CLOCK dependencies") Signed-off-by: Johnny S. Lee <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 13a7c89 commit 30e7255

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/dsa/mv88e6xxx/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
config NET_DSA_MV88E6XXX
33
tristate "Marvell 88E6xxx Ethernet switch fabric support"
44
depends on NET_DSA
5-
depends on PTP_1588_CLOCK_OPTIONAL
65
select IRQ_DOMAIN
76
select NET_DSA_TAG_EDSA
87
select NET_DSA_TAG_DSA
@@ -13,7 +12,8 @@ config NET_DSA_MV88E6XXX
1312
config NET_DSA_MV88E6XXX_PTP
1413
bool "PTP support for Marvell 88E6xxx"
1514
default n
16-
depends on NET_DSA_MV88E6XXX && PTP_1588_CLOCK
15+
depends on (NET_DSA_MV88E6XXX = y && PTP_1588_CLOCK = y) || \
16+
(NET_DSA_MV88E6XXX = m && PTP_1588_CLOCK)
1717
help
1818
Say Y to enable PTP hardware timestamping on Marvell 88E6xxx switch
1919
chips that support it.

0 commit comments

Comments
 (0)