| From 3198103a756821b310008b12b8b12c637854aef0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 14 Jul 2021 11:58:12 +0200 |
| Subject: net: dsa: mv88e6xxx: NET_DSA_MV88E6XXX_PTP should depend on |
| NET_DSA_MV88E6XXX |
| |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| |
| [ Upstream commit 99bb2ebab953435852340cdb198c5abbf0bb5dd3 ] |
| |
| Making global2 support mandatory removed the Kconfig symbol |
| NET_DSA_MV88E6XXX_GLOBAL2. This symbol also served as an intermediate |
| symbol to make NET_DSA_MV88E6XXX_PTP depend on NET_DSA_MV88E6XXX. With |
| the symbol removed, the user is always asked about PTP support for |
| Marvell 88E6xxx switches, even if the latter support is not enabled. |
| |
| Fix this by reinstating the dependency. |
| |
| Fixes: 63368a7416df144b ("net: dsa: mv88e6xxx: Make global2 support mandatory") |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Reviewed-by: Andrew Lunn <andrew@lunn.ch> |
| Reviewed-by: Vladimir Oltean <olteanv@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/dsa/mv88e6xxx/Kconfig | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/dsa/mv88e6xxx/Kconfig b/drivers/net/dsa/mv88e6xxx/Kconfig |
| index 05af632b0f59..634a48e6616b 100644 |
| --- a/drivers/net/dsa/mv88e6xxx/Kconfig |
| +++ b/drivers/net/dsa/mv88e6xxx/Kconfig |
| @@ -12,7 +12,7 @@ config NET_DSA_MV88E6XXX |
| config NET_DSA_MV88E6XXX_PTP |
| bool "PTP support for Marvell 88E6xxx" |
| default n |
| - depends on PTP_1588_CLOCK |
| + depends on NET_DSA_MV88E6XXX && PTP_1588_CLOCK |
| help |
| Say Y to enable PTP hardware timestamping on Marvell 88E6xxx switch |
| chips that support it. |
| -- |
| 2.30.2 |
| |