Commit 421f8663 authored by YueHaibing's avatar YueHaibing Committed by Jakub Kicinski
Browse files

net: broadcom: Add PTP_1588_CLOCK_OPTIONAL dependency for BCMGENET under ARCH_BCM2835 



commit 8d820bc9 ("net: broadcom: Fix BCMGENET Kconfig") fixes the build
that contain 99addbe3 ("net: broadcom: Select BROADCOM_PHY for BCMGENET")
and enable BCMGENET=y but PTP_1588_CLOCK_OPTIONAL=m, which otherwise
leads to a link failure. However this may trigger a runtime failure.

Fix the original issue by propagating the PTP_1588_CLOCK_OPTIONAL dependency
of BROADCOM_PHY down to BCMGENET.

Fixes: 8d820bc9 ("net: broadcom: Fix BCMGENET Kconfig")
Fixes: 99addbe3 ("net: broadcom: Select BROADCOM_PHY for BCMGENET")
Reported-by: default avatarNaresh Kamboju <naresh.kamboju@linaro.org>
Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20221125115003.30308-1-yuehaibing@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 01f856ae

drivers/net/ethernet/broadcom/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -71,13 +71,14 @@ config BCM63XX_ENET 
config BCMGENET

	tristate "Broadcom GENET internal MAC support"

	depends on HAS_IOMEM

	depends on PTP_1588_CLOCK_OPTIONAL || !ARCH_BCM2835

	select MII

	select PHYLIB

	select FIXED_PHY

	select BCM7XXX_PHY

	select MDIO_BCM_UNIMAC

	select DIMLIB

	select BROADCOM_PHY if (ARCH_BCM2835 && PTP_1588_CLOCK_OPTIONAL)

	select BROADCOM_PHY if ARCH_BCM2835

	help

	  This driver supports the built-in Ethernet MACs found in the

	  Broadcom BCM7xxx Set Top Box family chipset.