mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
net: broadcom: Add PTP_1588_CLOCK_OPTIONAL dependency for BCMGENET under ARCH_BCM2835
commit8d820bc9d1
("net: broadcom: Fix BCMGENET Kconfig") fixes the build that contain99addbe31f
("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:8d820bc9d1
("net: broadcom: Fix BCMGENET Kconfig") Fixes:99addbe31f
("net: broadcom: Select BROADCOM_PHY for BCMGENET") Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: YueHaibing <yuehaibing@huawei.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Link: https://lore.kernel.org/r/20221125115003.30308-1-yuehaibing@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
01f856ae6d
commit
421f8663b3
1 changed files with 2 additions and 1 deletions
|
@ -71,13 +71,14 @@ config BCM63XX_ENET
|
||||||
config BCMGENET
|
config BCMGENET
|
||||||
tristate "Broadcom GENET internal MAC support"
|
tristate "Broadcom GENET internal MAC support"
|
||||||
depends on HAS_IOMEM
|
depends on HAS_IOMEM
|
||||||
|
depends on PTP_1588_CLOCK_OPTIONAL || !ARCH_BCM2835
|
||||||
select MII
|
select MII
|
||||||
select PHYLIB
|
select PHYLIB
|
||||||
select FIXED_PHY
|
select FIXED_PHY
|
||||||
select BCM7XXX_PHY
|
select BCM7XXX_PHY
|
||||||
select MDIO_BCM_UNIMAC
|
select MDIO_BCM_UNIMAC
|
||||||
select DIMLIB
|
select DIMLIB
|
||||||
select BROADCOM_PHY if (ARCH_BCM2835 && PTP_1588_CLOCK_OPTIONAL)
|
select BROADCOM_PHY if ARCH_BCM2835
|
||||||
help
|
help
|
||||||
This driver supports the built-in Ethernet MACs found in the
|
This driver supports the built-in Ethernet MACs found in the
|
||||||
Broadcom BCM7xxx Set Top Box family chipset.
|
Broadcom BCM7xxx Set Top Box family chipset.
|
||||||
|
|
Loading…
Reference in a new issue