Commit f99f22e0 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jakub Kicinski

net: dsa: ocelot: add PTP dependency for NET_DSA_MSCC_OCELOT_EXT

A new user of MSCC_OCELOT_SWITCH_LIB was added, bringing back an old
link failure that was fixed with e5f31552 ("ethernet: fix
PTP_1588_CLOCK dependencies"):

x86_64-linux-ld: drivers/net/ethernet/mscc/ocelot_ptp.o: in function `ocelot_ptp_enable':
ocelot_ptp.c:(.text+0x8ee): undefined reference to `ptp_find_pin'
x86_64-linux-ld: drivers/net/ethernet/mscc/ocelot_ptp.o: in function `ocelot_get_ts_info':
ocelot_ptp.c:(.text+0xd5d): undefined reference to `ptp_clock_index'
x86_64-linux-ld: drivers/net/ethernet/mscc/ocelot_ptp.o: in function `ocelot_init_timestamp':
ocelot_ptp.c:(.text+0x15ca): undefined reference to `ptp_clock_register'
x86_64-linux-ld: drivers/net/ethernet/mscc/ocelot_ptp.o: in function `ocelot_deinit_timestamp':
ocelot_ptp.c:(.text+0x16b7): undefined reference to `ptp_clock_unregister'

Add the same PTP dependency here, as well as in the MSCC_OCELOT_SWITCH_LIB
symbol itself to make it more obvious what is going on when the next
driver selects it.

Fixes: 3d7316ac ("net: dsa: ocelot: add external ocelot switch control")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarColin Foster <colin.foster@in-advantage.com>
Link: https://lore.kernel.org/r/20230209124435.1317781-1-arnd@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1bc6cc4f
...@@ -12,6 +12,7 @@ config NET_DSA_MSCC_OCELOT_EXT ...@@ -12,6 +12,7 @@ config NET_DSA_MSCC_OCELOT_EXT
tristate "Ocelot External Ethernet switch support" tristate "Ocelot External Ethernet switch support"
depends on NET_DSA && SPI depends on NET_DSA && SPI
depends on NET_VENDOR_MICROSEMI depends on NET_VENDOR_MICROSEMI
depends on PTP_1588_CLOCK_OPTIONAL
select MDIO_MSCC_MIIM select MDIO_MSCC_MIIM
select MFD_OCELOT_CORE select MFD_OCELOT_CORE
select MSCC_OCELOT_SWITCH_LIB select MSCC_OCELOT_SWITCH_LIB
......
...@@ -13,6 +13,7 @@ if NET_VENDOR_MICROSEMI ...@@ -13,6 +13,7 @@ if NET_VENDOR_MICROSEMI
# Users should depend on NET_SWITCHDEV, HAS_IOMEM, BRIDGE # Users should depend on NET_SWITCHDEV, HAS_IOMEM, BRIDGE
config MSCC_OCELOT_SWITCH_LIB config MSCC_OCELOT_SWITCH_LIB
depends on PTP_1588_CLOCK_OPTIONAL
select NET_DEVLINK select NET_DEVLINK
select REGMAP_MMIO select REGMAP_MMIO
select PACKING select PACKING
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment